From 7fa1d0444dd0726fd8711e47d971233a17c85845 Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Tue, 10 Apr 2012 15:52:27 +0200
Subject: [PATCH] Some css improvements.

see #204
---
 admin/views.py                          | 6 ++++--
 templates/admin/settings_header.html    | 2 +-
 templates/common/menulist.html          | 4 ++--
 templates/nlayout.html                  | 2 +-
 templates/userprefs/preferences.html    | 2 +-
 userprefs/templatetags/uprefs_extras.py | 4 ++--
 userprefs/views.py                      | 3 ++-
 7 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/admin/views.py b/admin/views.py
index 0c67fd4c4..5c54b1868 100644
--- a/admin/views.py
+++ b/admin/views.py
@@ -437,7 +437,8 @@ def viewparameters(request, tplname='admin/parameters.html'):
         gparams += [tmp]
 
     return _render(request, tplname, {
-            "selection" : "parameters",
+            "selection" : "settings",
+            "left_selection" : "parameters",
             "gparams" : gparams
             })
 
@@ -470,7 +471,8 @@ def viewextensions(request, tplname='admin/extensions.html'):
             
     tbl = ExtensionsTable(request, exts)
     return _render(request, tplname, {
-            "selection" : "extensions",
+            "selection" : "settings",
+            "left_selection" : "extensions",
             "extensions" : tbl
             })
 
diff --git a/templates/admin/settings_header.html b/templates/admin/settings_header.html
index 90fbbb47b..287812511 100644
--- a/templates/admin/settings_header.html
+++ b/templates/admin/settings_header.html
@@ -19,4 +19,4 @@ $(document).ready(function() {
 });
 </script>
 {% endblock %}
-{% block leftcol %}<div class="well sidebar-nav">{% settings_menu selection user %}</div>{% endblock %}
+{% block leftcol %}<div class="well sidebar-nav">{% settings_menu left_selection user %}</div>{% endblock %}
diff --git a/templates/common/menulist.html b/templates/common/menulist.html
index 2f85528c1..881a793fb 100644
--- a/templates/common/menulist.html
+++ b/templates/common/menulist.html
@@ -4,8 +4,8 @@
   <li class="divider">&nbsp;</li>
   {% else %}
     {% if entry.menu %}
-  <li class="dropdown {{ entry.class }}{% if selection == entry.name %} selected{% endif %}"> 
-    <a class="dropdown-toggle" data-toggle="dropdown" href="{{ entry.url }}">
+  <li class="dropdown {{ entry.class }}{% if selection == entry.name %} active{% endif %}"> 
+    <a class="dropdown-toggle" name="{{ entry.name }}" data-toggle="dropdown" href="{{ entry.url }}">
       {% if entry.img %}<i class="{{ entry.img }}"></i>{% endif %}
       {{ entry.label }}
     </a>
diff --git a/templates/nlayout.html b/templates/nlayout.html
index f3186de77..dbf415adc 100644
--- a/templates/nlayout.html
+++ b/templates/nlayout.html
@@ -36,7 +36,7 @@
               {% load_optionalmenu user %}
             </ul>
             <ul class="nav pull-right">
-              {% user_menu user %}
+              {% if selection %}{% user_menu user selection %}{% else %}{% user_menu user "" %}{% endif %}
             </ul>
             <div class="pull-right">{% load_notifications user %}</div>
           </div>
diff --git a/templates/userprefs/preferences.html b/templates/userprefs/preferences.html
index 623e25059..35bf1dc9e 100644
--- a/templates/userprefs/preferences.html
+++ b/templates/userprefs/preferences.html
@@ -16,7 +16,7 @@ $(document).ready(function() {
 });
 </script>
 {% endblock %}
-{% block leftcol %}<div class="well sidebar-nav">{% uprefs_menu selection user %}</div>{% endblock %}
+{% block leftcol %}<div class="well sidebar-nav">{% uprefs_menu left_selection user %}</div>{% endblock %}
 {% block apparea %}
   <form class="form-horizontal" method="POST" 
         action="{% url userprefs.views.savepreferences %}" 
diff --git a/userprefs/templatetags/uprefs_extras.py b/userprefs/templatetags/uprefs_extras.py
index 5540dd814..eec2339d1 100644
--- a/userprefs/templatetags/uprefs_extras.py
+++ b/userprefs/templatetags/uprefs_extras.py
@@ -27,7 +27,7 @@ def uprefs_menu(selection, user):
 
 
 @register.simple_tag
-def user_menu(user):
+def user_menu(user, selection):
     entries = [
         {"name" : "user",
          "img" : "icon-user icon-white",
@@ -63,7 +63,7 @@ def user_menu(user):
     #         }]
 
     return render_to_string("common/menulist.html",
-                            {"entries" : entries, "user" : user})
+                            {"selection" : selection, "entries" : entries, "user" : user})
 
 @register.simple_tag
 def loadextmenu(selection, user):
diff --git a/userprefs/views.py b/userprefs/views.py
index 82c3355b2..004aab8d2 100644
--- a/userprefs/views.py
+++ b/userprefs/views.py
@@ -116,7 +116,8 @@ def preferences(request):
         gparams += [tmp]
 
     return _render(request, 'userprefs/preferences.html', {
-            "selection" : "preferences",
+            "selection" : "user",
+            "left_selection" : "preferences",
             "gparams" : gparams
             })