From e9116caa57ca3a6372f0c651af30951e975f47a9 Mon Sep 17 00:00:00 2001
From: Martin Zobel-Helas <zobel@debian.org>
Date: Fri, 15 Jun 2012 19:38:56 +0200
Subject: [PATCH] fix layout problems Signed-off-by: Martin Zobel-Helas
 <zobel@debian.org>

---
 html/doc-direct.wml        | 2 ++
 html/doc-general.wml       | 2 ++
 html/doc-hosts.wml         | 2 ++
 html/doc-mail-handling.wml | 2 ++
 html/doc-mail.wml          | 2 ++
 html/forward.wml           | 2 ++
 html/password.wml          | 2 ++
 html/searchhelp.wml        | 2 ++
 html/template/db.d.o.wml   | 7 -------
 9 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/html/doc-direct.wml b/html/doc-direct.wml
index 7f9a630..ae02239 100644
--- a/html/doc-direct.wml
+++ b/html/doc-direct.wml
@@ -1,5 +1,7 @@
 #use wml::db.d.o title="Direct LDAP Access"
 
+<dsatoc/>
+
 <p>Since the
 <a href="http://lists.debian.org/debian-announce/debian-announce-2003/msg00001.html">compromise</a>,
 the information available to non-developers via the LDAP interface has been
diff --git a/html/doc-general.wml b/html/doc-general.wml
index ed90b74..c5e033d 100644
--- a/html/doc-general.wml
+++ b/html/doc-general.wml
@@ -1,5 +1,7 @@
 #use wml::db.d.o title="General LDAP Documentation"
 
+<dsatoc/>
+
 <p>
 debian.org uses a single LDAP driven directory for account management across
 all the project run <a href="/machines.cgi">machines</a>. This directory
diff --git a/html/doc-hosts.wml b/html/doc-hosts.wml
index 39c59d1..9d0dd99 100644
--- a/html/doc-hosts.wml
+++ b/html/doc-hosts.wml
@@ -1,5 +1,7 @@
 #use wml::db.d.o title="debian.org Developer Machines"
 
+<dsatoc/>
+
 <h3>SSH Host Keys</h3>
 
 <p>The SSH host keys for the machines in the debian.org domains are
diff --git a/html/doc-mail-handling.wml b/html/doc-mail-handling.wml
index 85620db..7bf7d4d 100644
--- a/html/doc-mail-handling.wml
+++ b/html/doc-mail-handling.wml
@@ -1,5 +1,7 @@
 #use wml::db.d.o title="User Settable Mail Configuration"
 
+<dsatoc/>
+
 <p>
 Debian developers have a wide variety of loud and conflicting opinions
 about what constitutes correct handling of their mail, making it impossible for
diff --git a/html/doc-mail.wml b/html/doc-mail.wml
index 99fcb04..0f307d5 100644
--- a/html/doc-mail.wml
+++ b/html/doc-mail.wml
@@ -1,5 +1,7 @@
 #use wml::db.d.o title="LDAP Gateway"
 
+<dsatoc/>
+
 <p>
 The LDAP directory has a PGP secured mail gateway that
 allows users to safely and conveniently effect changes to their entries. It
diff --git a/html/forward.wml b/html/forward.wml
index a2b6375..e62f90f 100644
--- a/html/forward.wml
+++ b/html/forward.wml
@@ -1,5 +1,7 @@
 #use wml::db.d.o title="Email Forwarding"
 
+<dsatoc/>
+
 <p>
 Emails to @debian.org addresses now go through a LDAP distributed email system. 
 This system uses the forwarding field in the LDAP directory to route mail 
diff --git a/html/password.wml b/html/password.wml
index d782155..f60e7a3 100644
--- a/html/password.wml
+++ b/html/password.wml
@@ -1,5 +1,7 @@
 #use wml::db.d.o title="Lost or Forgotten password"
 
+<dsatoc/>
+
 <p>
 If you have lost or forgotten your LDAP password, you can have it reset
 by sending a PGP signed message to the <a href="doc-mail.html">mail
diff --git a/html/searchhelp.wml b/html/searchhelp.wml
index 8d4eb68..dc00b4c 100644
--- a/html/searchhelp.wml
+++ b/html/searchhelp.wml
@@ -1,5 +1,7 @@
 #use wml::db.d.o title="debian.org Developers Online Database"
 
+<dsatoc/>
+
   <center>
   <table border=5 cellspacing=0 cellpadding=10 width="70%" bgcolor=#DDDDDD> 
   <tr><td align="left">
diff --git a/html/template/db.d.o.wml b/html/template/db.d.o.wml
index cf05841..6202748 100644
--- a/html/template/db.d.o.wml
+++ b/html/template/db.d.o.wml
@@ -5,15 +5,8 @@
 <h1 class="h1class">$(title)</h1>
 "/>
 
-<dsatoc/>
-
 {#mainbody#}
 
-<ifeq "$(NOHOMELINK)" "" "
-<hrline/>
-<returnline/>
-"/>
-
 <hrline/>
 
 <small>
-- 
2.20.1