Revert "Factorize the nav template code in a template of its own"

This reverts commit 832dbf6. Blocks that are inside included templates aren't overriden (see pallets/jinja#243)
mozilla · Aug 17, 2015 · eee4e35 · eee4e35
1 parent b69f669
commit eee4e35
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 23 deletions.
diff --git a/templates/base.html b/templates/base.html
@@ -70,7 +70,29 @@
         {% block site_header %}
           {% include "tabzilla.html" %}
           <div class="amo-header">
-            {% include "base_nav.html" %}
+            <nav id="aux-nav" role="navigation" class="menu-nav c">
+              <ul>
+                {% if not settings.READ_ONLY %}
+                  {% include "impala/user_login.html" %}
+                {% endif %}
+                {% block aux_nav %}
+                  <li>
+                    <a href="#" id="other-apps"
+                       title="{{ _('Find add-ons for other applications') }}">
+                      {{ _('Other Applications') }}</a>
+                    <ul class="other-apps">
+                      {% for app in amo.APP_USAGE %}
+                        {% if app != request.APP and app != amo.MOBILE %}
+                          <li id="app-{{ app.short }}" class="{{ app.short }}">
+                            <a href="{{ locale_url(app.short) }}">{{ app.pretty }}</a>
+                          </li>
+                        {% endif %}
+                      {% endfor %}
+                    </ul>
+                  </li>
+                {% endblock aux_nav %}
+              </ul>
+            </nav>
             {% block header_search %}
             <div class="header-search" role="search">
               {% block search_form %}

diff --git a/templates/base_nav.html b/templates/base_nav.html
diff --git a/templates/impala/base.html b/templates/impala/base.html
@@ -61,7 +61,27 @@
         {% block site_header %}
           {% include "tabzilla.html" %}
           <div class="amo-header">
-            {% include "base_nav.html" %}
+            <nav id="aux-nav" role="navigation" class="menu-nav c">
+              <ul>
+                {% if not settings.READ_ONLY %}
+                  {% include "impala/user_login.html" %}
+                {% endif %}
+                {% block aux_nav %}
+                  <li>
+                    <a href="#" id="other-apps" title="{{ _('Find add-ons for other applications') }}">{{ _('Other Applications') }}</a>
+                    <ul class="other-apps">
+                      {% for app in amo.APP_USAGE %}
+                        {% if app != request.APP and app != amo.MOBILE %}
+                          <li id="app-{{ app.short }}" class="{{ app.short }}">
+                            <a href="{{ locale_url(app.short) }}">{{ app.pretty }}</a>
+                          </li>
+                        {% endif %}
+                      {% endfor %}
+                    </ul>
+                  </li>
+                {% endblock aux_nav %}
+              </ul>
+            </nav>
             <div class="header-search" role="search">
               {% block search_form %}
                 {# Get this in scope. #}