Move to modern menu system

diff --git a/Styles/infocon.style b/Styles/infocon.style
index 43522e2..bae1745 100644 (file)
--- a/Styles/infocon.style
+++ b/Styles/infocon.style
@@ -143,11 +143,13 @@ printf "Letzte 
   <td width=90 valign=top bgcolor=#5dbbf9>
     <img src="<root_prefix>Pics/corner-upperleft.png" align="left" border="0" hspace="0" vspace="0" alt="" width="16" height="16">
     <img src="<root_prefix>Pics/corner-upperright.png" align="right" border="0" hspace="0" vspace="0" alt="" width="16" height="16">
-  <font size="-1" face="Helvetica"><get-var menu>
 
+&nbsp;
+<div class=vmenu>
+<ul>
 #include "submenu.inc"
-
-  </font>
+</ul>
+</div>
 
 </td>
   <td width=<page-horiz-space>></td>
@@ -201,3 +203,17 @@ printf "Letzte 
 </html>
 
 </define-tag>
+
+<define-tag menu-item>
+<preserve base text href current>
+<set-var %attributes>
+
+<if <not <get-var href>>
+  <set-var href="<get-var base>.html">>
+
+<ifeq <get-var WML_SRC_BASENAME> "<get-var base>" "<set-var current="id=\"current\"">">
+
+<li><a <get-var current> href="<get-var href>"><get-var text></a></li>
+
+<restore base text href current>
+</define-tag>

diff --git a/src/infocon.css b/src/infocon.css
index b3380a2..36e6696 100644 (file)
--- a/src/infocon.css
+++ b/src/infocon.css
@@ -58,6 +58,52 @@ div.date {
   margin-top: -1em;
 }
 
+/*
+ * Side menu
+ */
+div.vmenu {
+  font-size: 13px;
+  font-weight: bold;
+  padding: 0;
+  margin-top: 10px;
+}
+div.vmenu p {
+  height: 5px;
+  width: 100%;
+  background: #5dbbf9;
+  padding: 0;
+  margin: 0;
+}
+div.vmenu ul {
+  list-style: none;
+  padding: 0;
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+div.vmenu ul li a {
+  display: block;
+  width: 100%;
+  text-decoration: none;
+  text-align: center;
+  padding: 2px 2px 2px 0.5em;
+  background-color: #5dbbf9;
+}
+div.vmenu ul li a#current {
+  color: #000000;
+  background-color: #97c9ed;
+}
+div.vmenu ul li a:hover {
+  color: #000000;
+  background-color: #0092f8;
+}
+div.vmenu ul li a.topic {
+  background-color: #bfbfbf;
+  padding-top: 2px;
+}
+html>body div.vmenu ul li a {
+  width: auto;
+}
+
 /*
  * Local variables:
  * mode: indented-text

diff --git a/src/infos/submenu.inc b/src/infos/submenu.inc
index 609d5b5..123536e 100644 (file)
--- a/src/infos/submenu.inc
+++ b/src/infos/submenu.inc
@@ -1,31 +1,7 @@
-&nbsp;<b>Basics</b><br>
-
-&nbsp;<ifneq <get-var WML_SRC_BASENAME> "linux"
-  <a href="linux.html">Linux</a>
-  Linux
-><br>
-
-&nbsp;<ifneq <get-var WML_SRC_BASENAME> "debian"
-  <a href="debian.html">Debian</a>
-  Debian
-><br>
-
-&nbsp;<ifneq <get-var WML_SRC_BASENAME> "freesw"
-  <a href="freesw.html">"Freie Software"</a>
-  "Freie Software"
-><br>
-
-&nbsp;<ifneq <get-var WML_SRC_BASENAME> "webpages"
-  <a href="webpages.html">Webseiten</a>
-  Webseiten
-><br>
-
-&nbsp;<ifneq <get-var WML_SRC_BASENAME> "credits"
-  <a href="credits.html">Credits</a>
-  Credits
-><br>
-
-&nbsp;<ifneq <get-var WML_SRC_BASENAME> "spenden"
-  <a href="spenden.html">Spenden</a>
-  Spenden
-><br>
+<menu-item base="linux" text="Linux">
+<menu-item base="debian" text="Debian">
+<menu-item base="freesw" text="Freie&nbsp;Software">
+<menu-item base="webpages" text="Webseiten">
+<menu-item base="credits" text="Credits">
+<menu-item base="spenden" text="Spenden">
+<menu-item base="../kontakt" text="Kontakt">

diff --git a/src/service/submenu.inc b/src/service/submenu.inc
index 961ca8c..b35334e 100644 (file)
--- a/src/service/submenu.inc
+++ b/src/service/submenu.inc
@@ -1,23 +1,5 @@
-&nbsp;<b>Dienste</b><br>
-
-&nbsp;&nbsp;<ifneq <get-var WML_SRC_BASENAME> "internet"
-  <a href="internet.html">Internet</a>
-  Internet
-><br>
-
-&nbsp;&nbsp;<ifneq <get-var WML_SRC_BASENAME> "schulung"
-  <a href="schulung.html">Schulungen</a>
-  Schulungen
-><br>
-
-&nbsp;&nbsp;<ifneq <get-var WML_SRC_BASENAME> "devel"
-  <a href="devel.html">"Software"</a>
-  "Software"
-><br>
-
-&nbsp;&nbsp;<ifneq <get-var WML_SRC_BASENAME> "webdesign"
-  <a href="webdesign.html">Webdesign</a>
-  Webdesign
-><br>
-
-<div align=center><p><a href="<root_prefix>kontakt.html">Kontakt</a></p></div>
+<menu-item base="internet" text="Internet">
+<menu-item base="schulung" text="Schulung">
+<menu-item base="devel" text="Software">
+<menu-item base="webdesign" text="Webdesign">
+<menu-item base="../kontakt" text="Kontakt">

diff --git a/src/submenu.inc b/src/submenu.inc
index 5b11980..8aac89b 100644 (file)
--- a/src/submenu.inc
+++ b/src/submenu.inc
@@ -1,7 +1,4 @@
-&nbsp;<b><a href=infos/linux.html>Linux</a></b><br>
-&nbsp;<b><a href=infos/debian.html>Debian</a></b><br>
+<menu-item base="infos/linux" text="Linux">
+<menu-item base="infos/debian" text="Debian">
+<menu-item base="kontakt" text="Kontakt">
 
-&nbsp;<b><ifneq <get-var WML_SRC_BASENAME> "kontakt"
-  <a href="kontakt.html">Kontakt</a>
-  Kontakt
-></b><br>