Merge pull request #46 from MarkLark86/SDAN-515

[SDAN-515] Show hyperlinks bar in all relevant sections
superdesk · Aug 15, 2019 · 0c43d7c · 0c43d7c
2 parents 353d4c7 + fefac0a
commit 0c43d7c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/theme/header_nav_links.html b/theme/header_nav_links.html
@@ -0,0 +1,16 @@
+<div class="mr-3 d-none d-sm-block">
+    <div class="navbar-header_nav_links">
+    {% for group in range(0, 10) %}
+        {% for nav in sidenavs(request.blueprint)|selectattr("group", "equalto", group) %}
+            {% if request.endpoint != nav.endpoint and nav.group != 1 %}
+            <div>
+                <a href="{{ url_for(nav.endpoint) if nav.endpoint else nav.url }}"
+                    {% if nav.url %}target="_blank"{% endif %}
+                >{{  gettext(nav.name) }}
+                </a>
+            </div>
+            {% endif %}
+        {% endfor %}
+    {% endfor %}
+    </div>
+</div>
diff --git a/theme/home.html b/theme/home.html
@@ -10,21 +10,6 @@
         <nav class="navbar-header_1 navbar-header_1--small divider mr-3 d-none d-sm-block">
             {{ gettext(' aap newsroom ') }}
         </nav>
-        <div class="mr-3 d-none d-sm-block">
-            <div class="navbar-header_nav_links">
-            {% for group in range(0, 10) %}
-                {% for nav in sidenavs(request.blueprint)|selectattr("group", "equalto", group) %}
-                    {% if request.endpoint != nav.endpoint and nav.group != 1 %}
-                    <div>
-                        <a href="{{ url_for(nav.endpoint) if nav.endpoint else nav.url }}"
-                            {% if nav.url %}target="_blank"{% endif %}
-                        >{{  gettext(nav.name) }}
-                        </a>
-                    </div>
-                    {% endif %}
-                {% endfor %}
-            {% endfor %}
-            </div>
-        </div>
+        {% include 'header_nav_links.html' %}
     </div>
 {% endblock %}
diff --git a/theme/products_layout.html b/theme/products_layout.html
@@ -23,9 +23,10 @@
             {% include "topnav_controls.html" %}
         </nav>
         {% if ns.currentNav %}
-        <nav class="navbar-header_1 navbar-header_1--small d-none d-sm-block">
+        <nav class="navbar-header_1 navbar-header_1--small divider mr-3 d-none d-sm-block">
             {{  gettext(ns.currentNav.get('name').lower()) if ns.currentNav.get('name') not in ['aapX', 'AM'] else ns.currentNav.name }}
         </nav>
+        {% include 'header_nav_links.html' %}
         {% endif %}
     </div>
 {% endblock %}