Merge login_nav template with base template

LICENSES

@@ -68,7 +68,6 @@ specified and linked otherwise.
 - sudoers/plinth :: -
 - templates/base.html :: [[file:templates/base.tmpl::the%20<a%20href%3D"http:/www.gnu.org/licenses/agpl.html"%20target%3D"_blank">GNU%20Affero%20General%20Public][GNU Affero General Public License, Version 3 or later]]
 - templates/err.html :: -
-- templates/login_nav.html :: -
 - templates/two_col.html :: -
 - tests/actions_test.py :: -
 - tests/auth_test.py :: -

modules/apps/templates/apps.html

@@ -1,4 +1,4 @@
-{% extends 'login_nav.html' %}
+{% extends 'base.html' %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/config/templates/config.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/diagnostics/templates/diagnostics.html

@@ -1,4 +1,4 @@
-{% extends 'login_nav.html' %}
+{% extends 'base.html' %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/diagnostics/templates/diagnostics_test.html

@@ -1,4 +1,4 @@
-{% extends 'login_nav.html' %}
+{% extends 'base.html' %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/expert_mode/templates/expert_mode.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/firewall/templates/firewall.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/help/help.py

@@ -36,5 +36,5 @@ def default(request, page=''):
         main = input_file.read()
 
     title = _('%s Documentation') % cfg.product_name
-    return TemplateResponse(request, 'login_nav.html',
+    return TemplateResponse(request, 'base.html',
                             {'title': title, 'main': main})

modules/help/templates/about.html

@@ -1,4 +1,4 @@
-{% extends 'login_nav.html' %}
+{% extends 'base.html' %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/help/templates/help.html

@@ -1,4 +1,4 @@
-{% extends 'login_nav.html' %}
+{% extends 'base.html' %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/owncloud/templates/owncloud.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/packages/templates/packages.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/pagekite/templates/pagekite_configure.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/pagekite/templates/pagekite_introduction.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/system/templates/system.html

@@ -1,4 +1,4 @@
-{% extends 'login_nav.html' %}
+{% extends 'base.html' %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/tor/templates/tor.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/users/templates/users_add.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/users/templates/users_edit.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/users/users.py

@@ -29,7 +29,7 @@ def index(request):
     sidebar_right = render_to_string('menu_block.html', {'menu': menu},
                                      RequestContext(request))
 
-    return TemplateResponse(request, 'login_nav.html',
+    return TemplateResponse(request, 'base.html',
                             {'title': _('Manage Users and Groups'),
                              'sidebar_right': sidebar_right})
 

modules/xmpp/templates/xmpp_configure.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/xmpp/templates/xmpp_register.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

modules/xmpp/xmpp.py

@@ -43,7 +43,7 @@ def index(request):
     sidebar_right = render_to_string('menu_block.html', {'menu': SIDE_MENU},
                                      RequestContext(request))
 
-    return TemplateResponse(request, 'login_nav.html',
+    return TemplateResponse(request, 'base.html',
                             {'title': _('XMPP Server'),
                              'main': main,
                              'sidebar_right': sidebar_right})

templates/404.html

@@ -1,4 +1,4 @@
-{% extends 'login_nav.html' %}
+{% extends 'base.html' %}
 {% comment %}
 #
 # This file is part of Plinth.

templates/500.html

@@ -1,4 +1,4 @@
-{% extends 'login_nav.html' %}
+{% extends 'base.html' %}
 {% comment %}
 #
 # This file is part of Plinth.

templates/base.html

@@ -53,16 +53,50 @@
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container-fluid">
-          <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
+          <a class="btn btn-navbar" data-toggle="collapse"
+             data-target=".nav-collapse">
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
           </a>
           <a href="{{ basehref }}/" class="logo-top">
-            <img src="{% static 'theme/img/freedombox-logo-32px.png' %}" alt="FreedomBox" />
+            <img src="{% static 'theme/img/freedombox-logo-32px.png' %}"
+                 alt="FreedomBox" />
           </a>
           <a class="brand" href="{{ basehref }}/">FreedomBox</a>
 	  {% block add_nav_and_login %}
+            <div class="nav-collapse">
+              <ul class="nav">
+                {% for item in main_menu.items %}
+                  {% if item.url in active_menu_urls %}
+                    <li class="active">
+                      <a href="{{ item.url }}" class="active">
+                  {% else %}
+                    <li>
+                      <a href="{{ item.url }}">
+                  {% endif %}
+                      <span class="{{ item.icon }} icon-white nav-icon"></span>
+                      {{ item.label }}
+                      </a>
+                    </li>
+                {% endfor %}
+              </ul>
+
+              {% if username %}
+                <p class="navbar-text pull-right">
+                  <i class="icon-user icon-white nav-icon"></i>
+                  Logged in as <a href="{{ username }}">{{ username }}</a>.
+                  <a href="{{ basehref }}/auth/logout" title="Log out">
+                    Log out</a>.
+                </p>
+              {% else %}
+                <p class="navbar-text pull-right">
+                  Not logged in.
+                  <i class="icon-user icon-white nav-icon"></i>
+                  <a href="{{ basehref }}/auth/login" title="Log in">
+                    Log in</a>.
+                </p>
+              {% endif %}
 	  {% endblock %}
           </div><!--/.nav-collapse -->
         </div>

templates/err.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 
 {% block title_block %}
 <span class="label label-important error-large">Error: {{ title }}</span>

templates/form.html

@@ -1,4 +1,4 @@
-{% extends "login_nav.html" %}
+{% extends "base.html" %}
 {% comment %}
 #
 # This file is part of Plinth.

templates/login_nav.html

@@ -1,27 +0,0 @@
-{% extends "base.html" %}
-
-{% block add_nav_and_login %}
-  <div class="nav-collapse">
-
-    <ul class="nav">
-      {% for item in main_menu.items %}
-        {% if item.url in active_menu_urls %}
-          <li class="active">
-            <a href="{{ item.url }}" class="active">
-        {% else %}
-          <li>
-            <a href="{{ item.url }}">
-        {% endif %}
-            <span class="{{ item.icon }} icon-white nav-icon"></span>
-            {{ item.label }}
-          </a>
-        </li>
-      {% endfor %}
-    </ul>
-
-    {% if username %}
-      <p class="navbar-text pull-right"><i class="icon-user icon-white nav-icon"></i>Logged in as <a href="{{ username }}">{{ username }}</a>. <a href="{{ basehref }}/auth/logout" title="Log out">Log out</a>.</p>
-    {% else %}
-      <p class="navbar-text pull-right">Not logged in. <i class="icon-user icon-white nav-icon"></i><a href="{{ basehref }}/auth/login" title="Log in">Log in</a>.</p>
-    {% endif %}
-{% endblock %}