Merge a few cleanups inspired by bpt's redesign

Regroup a few things, remove redundant language to avoid multi-line
list items in the side bar, update dead links, remove stuff like MRTG
that never worked.

diff --git a/header.mlt.in b/header.mlt.in
index fb86bd5..c6c0158 100644 (file)
--- a/header.mlt.in
+++ b/header.mlt.in
@@ -14,6 +14,7 @@ Admin<br />
 <li> <a href="balances">Balances</a></li>
 <li> <a href="kind">Contact kinds</a></li>
 <li> <a href="roll">Roll call!</a></li>
+<li> <a href="passgen">Generated passwords</a></li>
 </div>
 <% end %>
 
@@ -30,44 +31,45 @@ Your account<br />
 
 <div class="sbgroup">
 Support requests<br />
-<li> <a href="domain">Request control of a domain with domtool</a></li>
-<li> <a href="apt">Request Debian apt packages</a></li>
-<li> <a href="quota">Request a disk quota change</a></li>
-<li> <a href="list">Request a Mailman mailing list</a></li>
-<li> <a href="ip">Request an IP address</a></li>
-<li> <a href="cert">Request SSL certificate permissions</a></li>
-<li> <a href="support">Other support request</a></li>
+<li> <a href="domain">Domain control</a></li>
+<li> <a href="apt">Debian packages</a></li>
+<li> <a href="quota">Disk quota change</a></li>
+<li> <a href="list">Mailman mailing list</a></li>
+<li> <a href="ip">IP address</a></li>
+<li> <a href="cert">SSL certificate permissions</a></li>
+<li> <a href="sign">SSL certificate signing</a></li>
+<li> <a href="support">Other</a></li>
 </div>
 
 <div class="sbgroup">
-Statistics<br />
-<li> <a href="webbw">Apache bandwidth</a></li>
-<li> <a href="quotas">Disk usage</a></li>
-</div>
+Other services<br />
 
-<div class="sbgroup">
-Public pages<br />
-<li> <a href="http://hcoop.net/dyn/members.html">Member directory</a></li>
-<li> <a href="http://hcoop.net/dyn/locs.html">Member location summary</a></li>
-<li> <a href="http://hcoop.net/dyn/sites.html">URL directory</a></li>
+<li> <a href="https://mail.hcoop.net">Webmail</a></li>
+<li> <a href="/passwd">Change vmail passwords</a></li>
 </div>
 
 <div class="sbgroup">
-Miscellaneous<br />
-<li> <a href="apps">Review pending membership applications</a></li>
-<li> <a href="dir">Contact information directory</a></li>
+Interact<br />
+<li> <a href="apps">Membership applications</a></li>
+<li> <a href="dir">Contact directory</a></li>
 <li> <a href="poll">Polls</a></li>
-<li> <a href="qos">Support quality statistics</a></li>
+<li> <a href="http://wiki.hcoop.net/">Wiki</a></li>
+
 </div>
 
 <div class="sbgroup">
-Other services<br />
+Statistics<br />
+<li> <a href="webbw">Apache bandwidth</a></li>
+<li> <a href="quotas">Disk usage</a></li>
 <li> <a href="/webalizer/">Webalizer</a></li>
-<li> <a href="/mrtg/">MRTG statistics</a></li>
-<li> <a href="http://nms.interserver.net/cac/nms.php?server_name=bmV3Lmhjb29wLm5ldA==">InterServer bandwidth statistics</a></li>
-<!--li> <a href="/usermin/">Usermin</a></li-->
-<li> <a href="https://mail2.hcoop.net/src/login.php">SquirrelMail</a></li>
-<li> <a href="/passwd">Change vmail passwords</a></li>
+<li> <a href="qos">Support quality</a></li>
+</div>
+
+<div class="sbgroup">
+Public pages<br />
+<li> <a href="http://hcoop.net/members">Public member directory</a></li>
+<!-- <li> <a href="http://hcoop.net/dyn/locs.html">Member location summary</a></li> -->
+<li> <a href="http://hcoop.net/sites">URL directory</a></li>
 </div>
 
 </div>