Changeset 1823

Timestamp:

May 9, 2011, 11:23:03 AM (12 years ago)

Author:

work@…

Message:

• fixed enhanced menu to make it work as expected

Location:

trunk

Files:

• application.properties (modified) (2 diffs)
• grails-app/views/common/_topnav.gsp (modified) (2 diffs)
• web-app/css/default.css (modified) (1 diff)
• web-app/js/topnav.js (modified) (3 diffs)
• web-app/js/topnav.min.js (modified) (1 diff)

trunk/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Fri May 06 17:27:11 CEST 2011
+#Mon May 09 11:19:34 CEST 2011
 app.build.display.info=0
 app.build.svn.revision=1079
@@ -13 +13 @@
 plugins.db-util=0.4
 plugins.famfamfam=1.0.1
-plugins.gdt=0.0.43
+plugins.gdt=0.0.44
 plugins.gdtimporter=0.3.4
 plugins.grom=0.2.2

trunk/grails-app/views/common/_topnav.gsp

@@ -3 +3 @@
     <!-- TOPNAV //-->
     <ul class="topnav">
-     <li><g:link controller="home" action="index">Home</g:link></li>
+    <li><g:link controller="home" action="index">Home</g:link></li>
     <li>
       <a href="#">Create</a>
@@ -36 +36 @@
                         <li><g:link controller="study" action="list">View studies</g:link></li>
                         </sec:ifNotLoggedIn>
-            <a href="#">Templates</a>
-                    <ul>
-                                <af:templateEditorMenu wrap="li" />
-                        </ul>
-                    <a href="#">Contacts</a>
-            <ul>
-                                <li><g:link controller="person" action="list">View persons</g:link></li>
-                                <li><g:link controller="personAffiliation" action="list">View affiliations</g:link></li>
-                                <li><g:link controller="personRole" action="list">View roles</g:link></li>
-                        </ul>
-                    <a href="#">Publications</a>
-                        <ul>
-                                <li><g:link controller="publication" action="list">View publications</g:link></li>
-                                <li><g:link controller="publication" action="create">Add publication</g:link></li>
-                        </ul>
+            <li><a href="#">Templates</a>
+                        <ul class="childnav">
+                                        <af:templateEditorMenu wrap="li" />
+                                </ul>
+                    </li>
+                        <li><a href="#">Contacts</a>
+                <ul class="childnav">
+                                        <li><g:link controller="person" action="list">View persons</g:link></li>
+                                        <li><g:link controller="personAffiliation" action="list">View affiliations</g:link></li>
+                                        <li><g:link controller="personRole" action="list">View roles</g:link></li>
+                                </ul>
+                    </li>
+                        <li><a href="#">Publications</a>
+                                <ul class="childnav">
+                                        <li><g:link controller="publication" action="list">View publications</g:link></li>
+                                        <li><g:link controller="publication" action="create">Add publication</g:link></li>
+                                </ul>
+                        </li>
                 </ul>
         </li>

trunk/web-app/css/default.css

@@ -170 +170 @@
 }
 
+ul.topnav ul.childnav {
+        list-style: none;
+        margin-left: 130px;
+        position: absolute;
+        margin-top: -1px;
+}
+
 /** END :: topnav **/
 /** START :: content **/

trunk/web-app/js/topnav.js

@@ -9 +9 @@
                         }, function() {
                                 $(this).find("ul.subnav").slideUp('slow');
+                                $(this).parent().find("ul.childnav").slideUp('slow');
                         });
                 }).hover(function() {
@@ -24 +25 @@
                         }, function() {
                                 $(this).parent().find("ul.subnav").slideUp('slow');
+                                $(this).parent().find("ul.childnav").slideUp('slow');
                         });
                 }).hover(function() {
@@ -34 +36 @@
         );
 
+        // child nav
+        $("ul.childnav").each(function() {
+                var childnav = $(this);
+                var childparent = childnav.parent();
+
+                childnav.hide();
+                childparent.bind("click",function() {
+                        // hide other childnav
+                        $("ul.childnav", childparent.parent()).each(function() {
+                                $(this).slideUp('slow').hide();
+                        });
+
+                        // show childnav
+                        childnav.slideDown('fast').show();
+                });
+        });
+
         // make sure navigation is on top of everything
         $("ul.subnav").css({ 'z-index': '1000' });

trunk/web-app/js/topnav.min.js

@@ -1 @@
-$(document).ready(function(){$("ul.subnav").parent().append("<span></span>");$("ul.topnav li span").parent().click(function(){$(this).find("ul.subnav").slideDown("fast").show();$(this).hover(function(){},function(){$(this).find("ul.subnav").slideUp("slow")})}).hover(function(){$("span",this).addClass("subhover")},function(){$("span",this).removeClass("subhover")});$("ul.topnav li span").click(function(){$(this).parent().find("ul.subnav").slideDown("fast").show();$(this).parent().hover(function(){},function(){$(this).parent().find("ul.subnav").slideUp("slow")})}).hover(function(){$("a",$(this).parent()).addClass("tophover");$(this).addClass("subhover")},function(){$("a",$(this).parent()).removeClass("tophover");$(this).removeClass("subhover")});$("ul.subnav").css({"z-index":"1000"})});
+$(document).ready(function(){$("ul.subnav").parent().append("<span></span>");$("ul.topnav li span").parent().click(function(){$(this).find("ul.subnav").slideDown("fast").show();$(this).hover(function(){},function(){$(this).find("ul.subnav").slideUp("slow");$(this).parent().find("ul.childnav").slideUp("slow")})}).hover(function(){$("span",this).addClass("subhover")},function(){$("span",this).removeClass("subhover")});$("ul.topnav li span").click(function(){$(this).parent().find("ul.subnav").slideDown("fast").show();$(this).parent().hover(function(){},function(){$(this).parent().find("ul.subnav").slideUp("slow");$(this).parent().find("ul.childnav").slideUp("slow")})}).hover(function(){$("a",$(this).parent()).addClass("tophover");$(this).addClass("subhover")},function(){$("a",$(this).parent()).removeClass("tophover");$(this).removeClass("subhover")});$("ul.childnav").each(function(){var a=$(this);var b=a.parent();a.hide();b.bind("click",function(){$("ul.childnav",b.parent()).each(function(){$(this).slideUp("slow").hide()});a.slideDown("fast").show()})});$("ul.subnav").css({"z-index":"1000"})});