Merge pull request #789 from andralex/better-menus

Better menus
dlang · Jan 20, 2015 · dcdc4ce · dcdc4ce
2 parents 82f4348 + 42259dd
commit dcdc4ce
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 5 deletions.
diff --git a/css/cssmenu.css.dd b/css/cssmenu.css.dd
@@ -111,7 +111,7 @@ Ddoc
 }
 /* Sub menu */
 #cssmenu ul ul {
-  display: none;
+  /*display: none;*/
   background: $(submenu_bg);
   border-right: 1px solid $(submenu_border);
   border-left: 1px solid $(submenu_border);
@@ -126,6 +126,9 @@ Ddoc
   background: -webkit-linear-gradient($(submenu_bg_li) 0%, $(submenu_bg_li2) 100%);
   background: linear-gradient($(submenu_bg_li) 0%, $(submenu_bg_li2) 100%);
 }
+#cssmenu ul ul > li.active {
+  background: $(submenu_bg_li_active);
+}
 #cssmenu ul ul li:last-child {
   border-bottom: none;
 }
@@ -142,6 +145,12 @@ Ddoc
   left: 10px;
   color: $(submenu_highlight);
 }
+#cssmenu ul ul li.active a:after {
+  content: "►";
+  position: absolute;
+  right: 10px;
+  color: $(submenu_highlight);
+}
 #cssmenu ul ul a:hover {
   color: $(submenu_highlight);
 }
@@ -179,5 +188,6 @@ submenu_a=#676767
 submenu_bg=#fff
 submenu_bg_li=#f7f7f7
 submenu_bg_li2=#ececec
+submenu_bg_li_active=#d7b7b7
 submenu_border=#a2a194
 _=
diff --git a/js/cssmenu.js b/js/cssmenu.js
@@ -3,6 +3,16 @@ $( 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();
+  }
+});
+
 $('#cssmenu > ul > li > a').click(function() {
   $('#cssmenu li').removeClass('active');
   $(this).closest('li').addClass('active');

diff --git a/latex.ddoc b/latex.ddoc
@@ -2,6 +2,7 @@ _=*****************************************************************************
 _=Macros for LaTeX generation. The following section is ordered alphabeticaly.
 _=*****************************************************************************
 
+A=\ref{$1}{$+}
 AMP=\&
 ASMCODE=\lstinline{$0}
 _=

diff --git a/std_navbar-2.066.1.ddoc b/std_navbar-2.066.1.ddoc
@@ -69,9 +69,9 @@ $(DIVID cssmenu, $(UL
 		  $(LIBITEM std, zlib)
 	  )
 	$(MENU_W_SUBMENU $(T tt, etc))
-	  $(ITEMIZE 
+	  $(ITEMIZE
 	    $(LIBITEM etc, c, curl),
-	    $(LIBITEM etc, c, sqlite),
+	    $(LIBITEM etc, c, sqlite3),
 	    $(LIBITEM etc, c, zlib)
 	  )
 	$(MENU_W_SUBMENU $(T TT, core))

diff --git a/std_navbar-prerelease.ddoc b/std_navbar-prerelease.ddoc
@@ -77,9 +77,9 @@ $(DIVID cssmenu, $(UL
 		  $(LIBITEM std, zlib)
 	  )
 	$(MENU_W_SUBMENU $(T tt, etc))
-	  $(ITEMIZE 
+	  $(ITEMIZE
 	    $(LIBITEM etc, c, curl),
-	    $(LIBITEM etc, c, sqlite),
+	    $(LIBITEM etc, c, sqlite3),
 	    $(LIBITEM etc, c, zlib)
 	  )
 	$(MENU_W_SUBMENU $(T TT, core))