Merge pull request #788 from CyberShadow/cssmenu

CSS menu stuff
dlang · Jan 20, 2015 · e63e39e · e63e39e
2 parents dcdc4ce + ae4ca0d
commit e63e39e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ dlangspec.d
 /web
 /2.*.ddoc
 Makefile
+css/cssmenu.css
 
 deleteme.*
 docs-prerelease.json

diff --git a/css/cssmenu.css.dd b/css/cssmenu.css.dd
@@ -111,11 +111,13 @@ Ddoc
 }
 /* Sub menu */
 #cssmenu ul ul {
-  /*display: none;*/
   background: $(submenu_bg);
   border-right: 1px solid $(submenu_border);
   border-left: 1px solid $(submenu_border);
 }
+body.have-javascript #cssmenu ul ul {
+  display: none;
+}
 #cssmenu ul ul li {
   padding: 0;
   border-bottom: 1px solid $(bottom_submenu_li);

diff --git a/dlang.org.ddoc b/dlang.org.ddoc
@@ -134,7 +134,7 @@ _=
 
 MDASH=$(T nobr, &#x200A;&mdash;&#x200A;)
 METACODE=$(SPANC metacode, $0)
-MENU = <li class='active'><a href='$1'><span>$+</span></a></li>
+MENU = <li><a href='$1'><span>$+</span></a></li>
 MENU_W_SUBMENU = <li class='has-sub'><a href='#'><span>$0</span></a>
 META_KEYWORDS=D programming language
 META_DESCRIPTION=D Programming Language

diff --git a/doc.ddoc b/doc.ddoc
@@ -39,6 +39,7 @@ function bodyLoad()
 )
 </head>
 <body id='$(TITLE)' onLoad='bodyLoad()'>
+$(SCRIPT document.body.className += ' have-javascript';)
 $(DIVID top,
     $(DIVID search-box,
         <form method="get" action="http://google.com/search">

diff --git a/js/cssmenu.js b/js/cssmenu.js
@@ -10,6 +10,8 @@ $('#cssmenu > ul > li > ul > li > a').each(function(){
     p = p.parent();
     p.addClass('active');
     p.show();
+    p = p.parent();
+    p.addClass('active');
   }
 });
 

diff --git a/std.ddoc b/std.ddoc
@@ -20,6 +20,7 @@ $(SCRIPTLOAD ../js/cssmenu.js)
 $(SCRIPT jQuery(document).ready(listanchors);)
 </head>
 <body id="$(TITLE)" class='hyphenate'>
+$(SCRIPT document.body.className += ' have-javascript';)
 $(DIVID top,
 	$(divid search-box,
 		<form method="get" action="http://google.com/search">

diff --git a/win32.mak b/win32.mak
@@ -14,7 +14,7 @@ SRC= $(SPECSRC) cpptod.dd ctod.dd pretod.dd cppcontracts.dd index.dd overview.dd
 	tuple.dd template-comparison.dd COM.dd hijack.dd features2.dd safed.dd	\
 	const-faq.dd concepts.dd d-floating-point.dd migrate-to-shared.dd	\
 	D1toD2.dd intro-to-datetime.dd simd.dd deprecate.dd download.dd		\
-	32-64-portability.dd dll-linux.dd bugstats.php.dd
+	32-64-portability.dd dll-linux.dd bugstats.php.dd css\cssmenu.css.dd
 
 SPECSRC=spec.dd intro.dd lex.dd grammar.dd module.dd declaration.dd type.dd property.dd	\
 	attribute.dd pragma.dd expression.dd statement.dd arrays.dd			\
@@ -51,7 +51,7 @@ TARGETS=cpptod.html ctod.html pretod.html cppcontracts.html index.html overview.
 	memory-safe-d.html d-floating-point.html migrate-to-shared.html		\
 	D1toD2.html unittest.html hash-map.html intro-to-datetime.html		\
 	simd.html deprecate.html download.html 32-64-portability.html		\
-	d-array-article.html dll-linux.html bugstats.php.html
+	d-array-article.html dll-linux.html bugstats.php.html css/cssmenu.css
 
 
 CHMTARGETS=d.hhp d.hhc d.hhk d.chm
@@ -254,6 +254,9 @@ windbg.html : $(DDOC) windows.ddoc windbg.dd
 
 windows.html : $(DDOC) windows.ddoc windows.dd
 
+css/cssmenu.css : $(DDOC) css/cssmenu.css.dd
+	$(DMD) -o- -c -Df$@ $(DDOC) css/cssmenu.css.dd
+
 ################ Ebook ########################
 
 dlangspec.d : $(SPECSRC) win32.mak