Update main menu on home page

git-svn-id: https://svn.neo-layout.org@2337 b9310e46-f624-0410-8ea1-cfbb3a30dc96

2 files changed, 57 insertions, 75 deletions

diff --git a/www/index.html b/www/index.html
index ef18b94..b78d9e9 100644
--- a/www/index.html
+++ b/www/index.html
@@ -40,36 +40,27 @@
 	<!-- /Quicklinks -->
 </div> 
 
+<ul id="menu">
+	<li>Navigation
+	<ul>
+		<li><a href="http://wiki.neo-layout.org/wiki">Wiki</a></li>
+		<li><a href="http://wiki.neo-layout.org/wiki/Download">Download</a></li>
+		<li><a href="http://wiki.neo-layout.org/wiki/Benutzerhandbuch">Handbuch</a></li>
+		<li><a href="http://wiki.neo-layout.org/wiki/Neo%20einrichten">Installation</a></li>
+		<li><a href="http://wiki.neo-layout.org/wiki/Verweise%20auf%20andere%20Projekte">ähnliche Projekte</a></li>
+		<li><a href="http://wiki.neo-layout.org/wiki/Presseberichte">Presse</a></li>
+	</ul>
+	</li>
 
-<div id="Navigationsleiste" >
-	<div class="Navigationsthema">Wiki</div>
-		<div class="Navigationsunterpunkte">
-			<a class="Navigationseintrag" href="http://wiki.neo-layout.org/wiki">Wiki-Hauptseite</a>
-		</div>
-		<div class="Navigationsthema">Dokumentation und Hilfe</div>
-		<div class="Navigationsunterpunkte">
-			<a class="Navigationseintrag" href="http://wiki.neo-layout.org/wiki/Benutzerhandbuch">Handbuch</a>
-			<a class="Navigationseintrag" href="http://wiki.neo-layout.org/wiki/Mailingliste">Mailingliste</a>
-			<a class="Navigationseintrag" href="http://neo-layout.org/chat">Neo-Chat</a>
-		</div>
-		<div class="Navigationsthema">Installation</div>
-		<a class="Navigationseintrag" href="http://neo-layout.org/windows">Windows</a>
-		<a class="Navigationseintrag" href="http://neo-layout.org/linux">Linux</a>
-		<a class="Navigationseintrag" href="http://neo-layout.org/mac">Mac&nbsp;OS&nbsp;X</a>
-		<a class="Navigationseintrag" href="http://neo-layout.org/bsd">FreeBSD</a>
-		<a class="Navigationseintrag" href="http://neo-layout.org/portabel">… für unterwegs</a>
-		<a class="Navigationseintrag" href="http://neo-layout.org/installation">Weitere Systeme</a>
-		<div class="Navigationsthema">Grafiken</div>
-		<a class="Navigationseintrag" href="grafik/aufsteller/neo20-aufsteller.pdf">Aufsteller zum Lernen</a>
-		<a class="Navigationseintrag" href="grafik/druckvorlage/neo-druckvorlage.pdf">Druckvorlage</a>
-		<a class="Navigationseintrag" href="http://wiki.neo-layout.org/wiki/Grafiken">Noch viel mehr</a>
-	<div class="Navigationsthema">Sonstiges</div>
-	<div class="Navigationsunterpunkte">
-		<a class="Navigationseintrag" href="http://wiki.neo-layout.org/wiki/Verweise%20auf%20andere%20Projekte">Links</a>
-		<a class="Navigationseintrag" href="http://wiki.neo-layout.org/wiki/Presseberichte">Presseberichte</a>
-	</div>
-</div>
-
+	<li> Kontakt
+	<ul>
+		<li><a href"http://webchat.freenode.net?channels=neo">Neo-Chat</a></li>
+		<li><a href"http://wiki.neo-layout.org/wiki/Mailingliste">Mailingliste</a></li>
+		<li><a href"http://wiki.neo-layout.org/newticket">Fehler melden</a></li>
+		<li><a href"http://wiki.neo-layout.org/wiki/Impressum">Impressum</a></li>
+	</ul>
+	</li>
+</ul>
 
 <div class="Hauptfeld">
 
diff --git a/www/stylesheet.css b/www/stylesheet.css
index 7d51236..e06b0f9 100644
--- a/www/stylesheet.css
+++ b/www/stylesheet.css
@@ -24,52 +24,6 @@ div.Hauptfeld {
   margin-bottom:0em;
 }
 
-#Navigationsleiste {
-  background-color:#F8F8FA;
-  color:WindowText;
-  position:relative; 
-  width:11em; 
-  float:left;
-  text-align:center; 
-  margin:2em;
-  margin-left:0em;
-  margin-top:2em;
-  border-width:thin;  
-  border-style:solid;  
-  border-color:green; 
-  border-top-width:0px;
-
-}
-
-div.Navigationsthema {
-  border-bottom-width:1px;
-  border-bottom-style:solid;
-  border-color:black;
-  border-top-width:1px;
-  border-top-style:solid;
-  border-color:black;
-  text-align:center;
-  font-weight:bold;
-  background-color:#FAFBF8;
-  color:InfoText;
-  padding-top:.2em;
-  padding-bottom:.2em;
-}
-
-div.Navigationsunterpunkte {
-  padding-top:.5em;
-  padding-bottom:.75em;
-}
-
-a.Navigationseintrag {
-  display:block;
-  text-align:left;
-  padding-left:1em;
-  padding-right:1em;
-  padding-top:.25em;
-  padding-bottom:.25em;
-}
-
 #Bildcontainer_links {
   width:10em;
   border-width:thin;
@@ -210,3 +164,40 @@ p         {  /* text-indent:1em;
 	background-color:Highlight;
 }
 
+ul#menu, ul#menu ul {
+	list-style:none;
+	padding-left:0;
+	margin-left:0;
+}
+#menu {
+	position:relative;
+	float:left;
+	width:11em;
+
+	border:1px solid black;
+	color:WindowText;
+	background-color:#ccf;
+	font-family:Linux Biolinum O, Linux Biolinum, sans;
+	font-weight:bold;
+
+	margin:2em 1em;
+}
+
+/* section containers */
+#menu li { color:InfoText; }
+/* section list (items) */
+#menu li ul { font-weight:normal; }
+/* use css2 in browsers that support it */
+#menu > li, #menu li ul { margin-top:1ex; }
+#menu > li { padding-left:1em; }
+#menu > li ul { margin-left:-1em; }
+
+/* section list links */
+#menu li ul li a {
+	display:block;
+	padding:.4em 1em;
+
+	background-color:#f8f8fa;
+	font-weight:normal;
+}
+#menu li ul li a:hover { background-color:Highlight; }