Merge pull request #794 from CyberShadow/cssmenu2

Reorganize menu
dlang · Jan 24, 2015 · df4bb99 · df4bb99
2 parents 6a5c205 + c480617
commit df4bb99
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 25 deletions.
diff --git a/doc.ddoc b/doc.ddoc
@@ -88,6 +88,7 @@ NAVIGATION=
 $(DIVID cssmenu, $(UL
     $(MENU index.html, D $(LATEST))
     $(MENU download.html, $(B Download))
+    $(MENU changelog.html, Change Log)
     $(MENU_W_SUBMENU D Reference)
       $(SUBMENU
         intro.html, Introduction,
@@ -131,12 +132,22 @@ $(DIVID cssmenu, $(UL
       )
     $(MENU phobos/index.html, Standard library)
     $(MENU http://code.dlang.org, More libraries)
+    $(MENU_W_SUBMENU Community)
+      $(SUBMENU
+        http://forum.dlang.org, Forums,
+        http://github.com/D-Programming-Language, D on GitHub,
+        http://wiki.dlang.org, Wiki,
+        http://wiki.dlang.org/Review_Queue, Review Queue,
+        http://twitter.com/search?q=%23d_lang, Twitter,
+        http://digitalmars.com/d/dlinks.html, More Links
+      )
     $(MENU_W_SUBMENU Books $(AMP) Articles)
       $(SUBMENU
         http://ddili.org/ders/d.en/index.html, Online Book (free),
         http://wiki.dlang.org/Books, More Books,
-        library/index.html, $(NBSP)NEW Library Reference Preview,
         howtos.html, How-tos,
+        faq.html, FAQ,
+        comparison.html, Feature Overview,
         d-floating-point.html, Floating Point,
         wc.html, Example: wc,
         warnings.html, Warnings,
@@ -145,23 +156,15 @@ $(DIVID cssmenu, $(UL
         cpptod.html, C++ to D,
         pretod.html, C Preprocessor vs D
       )
-    $(MENU_W_SUBMENU Community)
+    $(MENU_W_SUBMENU Resources)
       $(SUBMENU
-        http://forum.dlang.org, Forums,
-        http://github.com/D-Programming-Language, D on GitHub,
-        http://wiki.dlang.org, Wiki,
-        http://wiki.dlang.org/Review_Queue, Review Queue,
-        http://twitter.com/#search?q=%23d_lang, Twitter,
-        http://digitalmars.com/d/dlinks.html, More Links
+        library/index.html, $(NBSP)NEW Library Reference Preview,
+        bugstats.php, Bug Tracker,
+        $(VISUALD), Visual D,
+        dstyle.html, The D Style,
+        acknowledgements.html, Acknowledgments,
+        sitemap.html, Sitemap
       )
-    $(MENU $(VISUALD), Visual D)
-    $(MENU changelog.html, Change Log)
-    $(MENU bugstats.php, Bug Tracker)
-    $(MENU faq.html, FAQ)
-    $(MENU comparison.html, Feature Overview)
-    $(MENU acknowledgements.html, Acknowledgments)
-    $(MENU appendices.html, Appendices)
-    $(MENU sitemap.html, Sitemap)
 ))
 _=
 

diff --git a/js/cssmenu.js b/js/cssmenu.js
@@ -3,15 +3,12 @@ $( document ).ready(function() {
 var menu_ul = $('#cssmenu > ul > li > ul');
 menu_ul.hide();
 
-$('#cssmenu > ul > li > ul > li > a').each(function(){
-  if ($(this)[0].href == window.location.href) {
-    var p = $(this).parent();
-    p.addClass('active');
-    p = p.parent();
-    p.addClass('active');
-    p.show();
-    p = p.parent();
-    p.addClass('active');
+$('#cssmenu a').each(function(){
+  if (this.href == window.location.href) {
+    $(this)
+      .parents('li,ul')
+      .addClass('active')
+      .show();
   }
 });