From 6ace42a0a4d836b309b70de78a3703cea651fa16 Mon Sep 17 00:00:00 2001
From: Adolfo Fitoria <adolfo.fitoria@gmail.com>
Date: Wed, 22 Aug 2012 11:57:25 -0600
Subject: Group menu displays on hover, small css issue with the aligments

---
 askbot/skins/default/media/style/style.css              | 10 +++++++---
 askbot/skins/default/media/style/style.less             | 13 ++++++++-----
 askbot/skins/default/templates/meta/bottom_scripts.html |  6 ------
 askbot/skins/default/templates/widgets/meta_nav.html    |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index a2b6f194..55f5806f 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -319,14 +319,18 @@ body.user-messages {
 #metaNav #navGroups {
   background: 3px -132px url(../images/sprites.png) no-repeat;
 }
-#metaNav #navBadges {
-  background: 0px -170px url(../images/sprites.png) no-repeat;
+#metaNav a.group-name {
+  padding: 0px;
+}
+#metaNav span.dropdown:hover ul.dropdown-menu {
+  display: block;
 }
 #metaNav .dropdown {
   float: left;
 }
 #metaNav .dropdown-menu {
-  top: 120%;
+  /*top: 120%;*/
+
   left: 7%;
 }
 #header.with-logo #userToolsNav {
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index 8a8bfbfb..90aef77e 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -323,8 +323,12 @@ body.user-messages {
         .sprites(3px,-132px)
     }
 
-    #navBadges{
-        .sprites(0px,-170px)
+    a.group-name {
+        padding: 0px;
+    }
+
+    span.dropdown:hover ul.dropdown-menu {
+        display: block;    
     }
 
     .dropdown {
@@ -332,9 +336,10 @@ body.user-messages {
     }
 
     .dropdown-menu{
-        top: 120%;
+        /*top: 120%;*/
         left: 7%;
     }
+
 }
 
 #header.with-logo #userToolsNav {
@@ -3811,5 +3816,3 @@ textarea.tipped-input {
     width: 515px;
     margin-bottom: 0px;
 }
-
-
diff --git a/askbot/skins/default/templates/meta/bottom_scripts.html b/askbot/skins/default/templates/meta/bottom_scripts.html
index de0df142..2a7c85a5 100644
--- a/askbot/skins/default/templates/meta/bottom_scripts.html
+++ b/askbot/skins/default/templates/meta/bottom_scripts.html
@@ -41,9 +41,6 @@
         });
     </script>
 {% endif %}
-{%if settings.GROUPS_ENABLED%}
-<script type="text/javascript" src="{{'/bootstrap/js/bootstrap.js'|media}}" /></script>
-{% endif %}
 <script type="text/javascript">
     $(document).ready(function(){
         {% if active_tab == 'questions' %}
@@ -77,9 +74,6 @@
         if (askbot['data']['userIsAdminOrMod']) {
             $('body').addClass('admin');
         }
-        {%if settings.GROUPS_ENABLED%}
-          $(".dropdown-toggle").dropdown();        
-        {% endif %}
     });
 {% if user_messages %}
     $('#validate_email_alert').click(function(){notify.close(true)})
diff --git a/askbot/skins/default/templates/widgets/meta_nav.html b/askbot/skins/default/templates/widgets/meta_nav.html
index 6cfd44a5..659780c4 100644
--- a/askbot/skins/default/templates/widgets/meta_nav.html
+++ b/askbot/skins/default/templates/widgets/meta_nav.html
@@ -7,7 +7,7 @@
 {% if settings.GROUPS_ENABLED %}
 <span class="dropdown">
 <a
-  id="navGroups" class='dropdown-toggle {% if active_tab == 'groups' %}"on"{% endif %}'
+  id="navGroups" class='{% if active_tab == 'groups' %}"on"{% endif %}'
   href="{% url groups %}" data-target="#" >
   {% trans %}people & groups{% endtrans %}
 </a>
-- 
cgit v1.2.3-1-g7c22