move the navbar to all pages

Signed-off-by: Martin Zobel-Helas <zobel@debian.org>

diff --git a/html/searchform.wml b/html/searchform.wml
index 9874bc1..33f030c 100644 (file)
--- a/html/searchform.wml
+++ b/html/searchform.wml
@@ -1,34 +1,5 @@
 #use wml::db.d.o title="debian.org Developers LDAP Search"
 
 #use wml::db.d.o title="debian.org Developers LDAP Search"
 

-<div id="second-nav">
- <p>
-  <ul class="cdmenu">
-   <li>General Documenation
-    <ul>
-     <li><a href="machines.cgi">Development machines</a><li>
-     <li><a href="http://www.debian.org/devel/dmup">Machine Usage Policies</a><li>
-     <li><a href="http://dsa.debian.org">DSA Wiki</a><li>
-    </ul>
-   </li>
-   <li>LDAP Documentation
-    <ul>
-     <li><a href="doc-general.html">General LDAP Documentation</a></li>
-     <li><a href="doc-direct.html">Direct LDAP Access</a></li>
-     <li><a href="doc-mail.html">LDAP Mail Gateway</a></li>
-     <li><a href="password.html">Lost or forgotten password instructions</a></li>
-     <li><a href="forward.html">Debian.org Email Forwarding</a></li>
-    </ul>
-   </li>
-   <li>Certificate Authorities
-    <ul>
-     <li><a href="http://ca.debian.org/">Debian Certificate Authority</a></li>
-     <li><a href="http://www.spi-inc.org/ca/">SPI Certificate Authority</a></li>
-    </ul>
-   </li>
-  </ul>
- </p>
-</div>
-

 <br><br><center>
 <form method=post action="search.cgi">
 <input type=hidden name=id value="~id~" >
 <br><br><center>
 <form method=post action="search.cgi">
 <input type=hidden name=id value="~id~" >

diff --git a/html/template/db.d.o.wml b/html/template/db.d.o.wml
index 9b30066..cf05841 100644 (file)
--- a/html/template/db.d.o.wml
+++ b/html/template/db.d.o.wml
@@ -1,10 +1,12 @@
 #use wml::basic NOMIRRORS=true NOCOMMENTS=true
 #use wml::basic NOMIRRORS=true NOCOMMENTS=true

-
+#use wml::vbar

 <div id="content">
 <ifeq "$(NOHEADER)" "" "
 <h1 class="h1class">$(title)</h1>
 "/>
 
 <div id="content">
 <ifeq "$(NOHEADER)" "" "
 <h1 class="h1class">$(title)</h1>
 "/>
 

+<dsatoc/>
+

 {#mainbody#}
 
 <ifeq "$(NOHOMELINK)" "" "
 {#mainbody#}
 
 <ifeq "$(NOHOMELINK)" "" "

diff --git a/html/template/vbar.wml b/html/template/vbar.wml
new file mode 100644 (file)
index 0000000..5e2a8b7
--- /dev/null
+++ b/html/template/vbar.wml
@@ -0,0 +1,31 @@
+#use wml::common_translation
+
+<define-tag dsatoc>
+<div id="second-nav">
+ <p>
+  <ul class="cdmenu">
+   <li>General Documenation
+    <ul>
+     <li><a href="machines.cgi">Development machines</a><li>
+     <li><a href="http://www.debian.org/devel/dmup">Machine Usage Policies</a><li>
+     <li><a href="http://dsa.debian.org">DSA Wiki</a><li>
+    </ul>
+   </li>
+   <li>Documentation
+    <ul>
+     <li><a href="doc-general.html">General LDAP Documentation</a></li>
+     <li><a href="password.html">Lost or forgotten password instructions</a></li>
+     <li><a href="forward.html">Debian.org Email Forwarding</a></li>
+    </ul>
+   </li>
+   <li>Certificate Authorities
+    <ul>
+     <li><a href="http://ca.debian.org/">Debian Certificate Authority</a></li>
+     <li><a href="http://www.spi-inc.org/ca/">SPI Certificate Authority</a></li>
+    </ul>
+   </li>
+  </ul>
+ </p>
+</div>
+
+</define-tag>