From 30d8b7bd85adc5fb3d3ec4fe4bdbae9615e6bf68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89lie=20Bouttier?= <elie@bouttier.eu>
Date: Sat, 30 Aug 2014 18:27:26 -0700
Subject: [PATCH] templates: active tab + base_settings > base_admin

---
 templates/accounts/group_details.html             | 2 +-
 templates/accounts/group_edit.html                | 2 +-
 templates/accounts/group_list.html                | 2 +-
 templates/accounts/profile.html                   | 2 ++
 templates/accounts/team_details.html              | 2 +-
 templates/accounts/team_edit.html                 | 2 +-
 templates/accounts/team_list.html                 | 2 +-
 templates/accounts/user_edit.html                 | 2 +-
 templates/accounts/user_list.html                 | 2 +-
 templates/base.html                               | 4 ++--
 templates/{base_settings.html => base_admin.html} | 2 ++
 templates/permissions/global_perm_edit.html       | 2 +-
 templates/permissions/global_perm_list.html       | 2 +-
 templates/tracker/settings.html                   | 2 +-
 14 files changed, 17 insertions(+), 13 deletions(-)
 rename templates/{base_settings.html => base_admin.html} (94%)

diff --git a/templates/accounts/group_details.html b/templates/accounts/group_details.html
index 19faa30..01c0201 100644
--- a/templates/accounts/group_details.html
+++ b/templates/accounts/group_details.html
@@ -1,4 +1,4 @@
-{% extends 'base_settings.html' %}
+{% extends 'base_admin.html' %}
 
 {% load staticfiles %}
 {% load humanize %}
diff --git a/templates/accounts/group_edit.html b/templates/accounts/group_edit.html
index 53036ef..1655af1 100644
--- a/templates/accounts/group_edit.html
+++ b/templates/accounts/group_edit.html
@@ -1,4 +1,4 @@
-{% extends 'base_settings.html' %}
+{% extends 'base_admin.html' %}
 
 {% load staticfiles %}
 {% load humanize %}
diff --git a/templates/accounts/group_list.html b/templates/accounts/group_list.html
index e46c1d9..b6dbe77 100644
--- a/templates/accounts/group_list.html
+++ b/templates/accounts/group_list.html
@@ -1,4 +1,4 @@
-{% extends 'base_settings.html' %}
+{% extends 'base_admin.html' %}
 
 {% load staticfiles %}
 {% load humanize %}
diff --git a/templates/accounts/profile.html b/templates/accounts/profile.html
index 5a2a6d9..d387918 100644
--- a/templates/accounts/profile.html
+++ b/templates/accounts/profile.html
@@ -2,6 +2,8 @@
 
 {% load django_markdown %}
 
+{% block profiletab %} class="active"{% endblock %}
+
 {% block content %}
 
 <div class="page-header">
diff --git a/templates/accounts/team_details.html b/templates/accounts/team_details.html
index 4de2cb9..b600825 100644
--- a/templates/accounts/team_details.html
+++ b/templates/accounts/team_details.html
@@ -1,4 +1,4 @@
-{% extends 'base_settings.html' %}
+{% extends 'base_admin.html' %}
 
 {% load staticfiles %}
 {% load humanize %}
diff --git a/templates/accounts/team_edit.html b/templates/accounts/team_edit.html
index 819d2d8..df824ed 100644
--- a/templates/accounts/team_edit.html
+++ b/templates/accounts/team_edit.html
@@ -1,4 +1,4 @@
-{% extends 'base_settings.html' %}
+{% extends 'base_admin.html' %}
 
 {% load staticfiles %}
 {% load humanize %}
diff --git a/templates/accounts/team_list.html b/templates/accounts/team_list.html
index 7226b0c..c2b7e76 100644
--- a/templates/accounts/team_list.html
+++ b/templates/accounts/team_list.html
@@ -1,4 +1,4 @@
-{% extends 'base_settings.html' %}
+{% extends 'base_admin.html' %}
 
 {% load staticfiles %}
 {% load humanize %}
diff --git a/templates/accounts/user_edit.html b/templates/accounts/user_edit.html
index 2bd4100..d015c56 100644
--- a/templates/accounts/user_edit.html
+++ b/templates/accounts/user_edit.html
@@ -1,4 +1,4 @@
-{% extends 'base_settings.html' %}
+{% extends 'base_admin.html' %}
 
 {% load staticfiles %}
 {% load humanize %}
diff --git a/templates/accounts/user_list.html b/templates/accounts/user_list.html
index 976ba9d..dd31bb8 100644
--- a/templates/accounts/user_list.html
+++ b/templates/accounts/user_list.html
@@ -1,4 +1,4 @@
-{% extends 'base_settings.html' %}
+{% extends 'base_admin.html' %}
 
 {% load staticfiles %}
 {% load humanize %}
diff --git a/templates/base.html b/templates/base.html
index 22ae301..95059b3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -72,9 +72,9 @@
             <ul class="nav navbar-nav navbar-right">
               {% if request.user.is_authenticated %}
               {% if perm.manage_settings or perm.manage_user or perm_manage_group or perm.manage_team or perm.manage_global_permission %}
-              <li><a href="{% url 'admin' %}" rel="tooltip" data-toggle="tooltip" data-placement="bottom" title="Administration"><span class="glyphicon glyphicon-cog"></span></a></li>
+              <li{% block admintab %}{% endblock %}><a href="{% url 'admin' %}" rel="tooltip" data-toggle="tooltip" data-placement="bottom" title="Administration"><span class="glyphicon glyphicon-cog"></span></a></li>
               {% endif %}
-              <li><a href="{% url 'profile' %}" rel="tooltip" data-toggle="tooltip" data-placement="bottom" title="Profile"><span class="glyphicon glyphicon-user"></span> {{ request.user }}</a></li>
+              <li{% block profiletab %}{% endblock %}><a href="{% url 'profile' %}" rel="tooltip" data-toggle="tooltip" data-placement="bottom" title="Profile"><span class="glyphicon glyphicon-user"></span> {{ request.user }}</a></li>
               <li><a href="{% url 'logout' %}" rel="tooltip" data-toggle="tooltip" data-placement="bottom" title="Logout"><span class="glyphicon glyphicon-log-out"></span></a></li>
               {% else %}
               <li><a href="{% url 'login' %}?next={{ request.path }}&prev={{ request.path }}"><span class="glyphicon glyphicon-log-in"></span>&nbsp;Login</a></li>
diff --git a/templates/base_settings.html b/templates/base_admin.html
similarity index 94%
rename from templates/base_settings.html
rename to templates/base_admin.html
index 8451c33..4f19419 100644
--- a/templates/base_settings.html
+++ b/templates/base_admin.html
@@ -2,6 +2,8 @@
 
 {% load django_markdown %}
 
+{% block admintab %} class="active"{% endblock %}
+
 {% block content %}
 
 <ul class="nav nav-tabs" role="tablist">
diff --git a/templates/permissions/global_perm_edit.html b/templates/permissions/global_perm_edit.html
index fed7ed9..c122f50 100644
--- a/templates/permissions/global_perm_edit.html
+++ b/templates/permissions/global_perm_edit.html
@@ -1,4 +1,4 @@
-{% extends 'base_settings.html' %}
+{% extends 'base_admin.html' %}
 
 {% load django_markdown %}
 {% load permissions_tags %}
diff --git a/templates/permissions/global_perm_list.html b/templates/permissions/global_perm_list.html
index be48acc..3751e26 100644
--- a/templates/permissions/global_perm_list.html
+++ b/templates/permissions/global_perm_list.html
@@ -1,4 +1,4 @@
-{% extends 'base_settings.html' %}
+{% extends 'base_admin.html' %}
 
 {% load django_markdown %}
 {% load accounts_tags %}
diff --git a/templates/tracker/settings.html b/templates/tracker/settings.html
index caca4cd..c8a5340 100644
--- a/templates/tracker/settings.html
+++ b/templates/tracker/settings.html
@@ -1,4 +1,4 @@
-{% extends 'base_settings.html' %}
+{% extends 'base_admin.html' %}
 
 {% block settingtab %} class="active"{% endblock %}