From 1c2cd4dcb2a434f1c361c64f08d292e973ac2105 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Mon, 6 Jul 2009 13:29:35 +0000
Subject: [PATCH] Overhaul console layout. Add <h1> header to most pages. Etc.

---
 apps/i2ptunnel/jsp/index.jsp                       |  5 +++--
 apps/routerconsole/jsp/config.jsp                  |  2 +-
 apps/routerconsole/jsp/configadvanced.jsp          |  2 ++
 apps/routerconsole/jsp/configclients.jsp           |  2 +-
 apps/routerconsole/jsp/configkeyring.jsp           |  2 +-
 apps/routerconsole/jsp/configlogging.jsp           |  2 +-
 apps/routerconsole/jsp/configpeer.jsp              |  2 +-
 apps/routerconsole/jsp/configservice.jsp           |  2 +-
 apps/routerconsole/jsp/configstats.jsp             |  2 +-
 apps/routerconsole/jsp/configtunnels.jsp           |  2 +-
 apps/routerconsole/jsp/configupdate.jsp            |  2 +-
 apps/routerconsole/jsp/graphs.jsp                  |  2 +-
 apps/routerconsole/jsp/help.jsp                    | 14 ++++++++------
 apps/routerconsole/jsp/index.jsp                   |  1 +
 apps/routerconsole/jsp/jobs.jsp                    |  2 +-
 apps/routerconsole/jsp/logs.jsp                    |  2 +-
 apps/routerconsole/jsp/netdb.jsp                   |  2 +-
 apps/routerconsole/jsp/oldconsole.jsp              |  2 +-
 apps/routerconsole/jsp/oldstats.jsp                |  2 +-
 apps/routerconsole/jsp/peers.jsp                   |  2 +-
 apps/routerconsole/jsp/profiles.jsp                |  2 +-
 apps/routerconsole/jsp/summarynoframe.jsp          |  4 ++--
 apps/routerconsole/jsp/tunnels.jsp                 |  2 +-
 .../src/net/i2p/router/admin/StatsGenerator.java   |  1 -
 24 files changed, 34 insertions(+), 29 deletions(-)
diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp
index 6c89d5ff4..3454b7eec 100644
--- a/apps/i2ptunnel/jsp/index.jsp
+++ b/apps/i2ptunnel/jsp/index.jsp
@@ -6,7 +6,8 @@
 <head>
     <title>I2PTunnel Webmanager - List</title>
     
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta htt
+p-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
     
     <% if (indexBean.allowCSS()) {
@@ -17,7 +18,7 @@
   %>
 </head>
 <body id="tunnelListPage">
-    <div id="pageHeader">
+	    <div id="pageHeader">
     </div>
     
     <div id="statusMessagePanel" class="panel">
diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp
index 933401913..8568db62c 100644
--- a/apps/routerconsole/jsp/config.jsp
+++ b/apps/routerconsole/jsp/config.jsp
@@ -11,7 +11,7 @@
 
 <jsp:useBean class="net.i2p.router.web.ConfigNetHelper" id="nethelper" scope="request" />
 <jsp:setProperty name="nethelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-
+<h1>I2P Network Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
  
diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp
index d2097c252..a2f758fc2 100644
--- a/apps/routerconsole/jsp/configadvanced.jsp
+++ b/apps/routerconsole/jsp/configadvanced.jsp
@@ -13,7 +13,9 @@
 <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHelper" id="advancedhelper" scope="request" />
 <jsp:setProperty name="advancedhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 
+<h1>I2P Advanced Configuration</h1>
 <div class="main" id="main">
+
  <%@include file="confignav.jsp" %>
  
  <jsp:useBean class="net.i2p.router.web.ConfigAdvancedHandler" id="formhandler" scope="request" />
diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp
index 701e39aff..7699eb725 100644
--- a/apps/routerconsole/jsp/configclients.jsp
+++ b/apps/routerconsole/jsp/configclients.jsp
@@ -17,7 +17,7 @@ button span.hide{
 
 <jsp:useBean class="net.i2p.router.web.ConfigClientsHelper" id="clientshelper" scope="request" />
 <jsp:setProperty name="clientshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-
+<h1>I2P Client Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
   
diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp
index 1aa40408b..9df7ec357 100644
--- a/apps/routerconsole/jsp/configkeyring.jsp
+++ b/apps/routerconsole/jsp/configkeyring.jsp
@@ -9,7 +9,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+<h1>I2P Keyring Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
   
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp
index d76df86c9..a3f854c0e 100644
--- a/apps/routerconsole/jsp/configlogging.jsp
+++ b/apps/routerconsole/jsp/configlogging.jsp
@@ -11,7 +11,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+<h1>I2P Logging Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
  
diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp
index 62d2e209c..b465559cd 100644
--- a/apps/routerconsole/jsp/configpeer.jsp
+++ b/apps/routerconsole/jsp/configpeer.jsp
@@ -9,7 +9,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+<h1>I2P Peer Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
   
diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp
index 9c494d819..da4f7996f 100644
--- a/apps/routerconsole/jsp/configservice.jsp
+++ b/apps/routerconsole/jsp/configservice.jsp
@@ -9,7 +9,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+<h1>I2P Service Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
   
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp
index e84c5ca1f..e2dde4c44 100644
--- a/apps/routerconsole/jsp/configstats.jsp
+++ b/apps/routerconsole/jsp/configstats.jsp
@@ -54,7 +54,7 @@ function toggleAll(category)
 </head><body onLoad="init();">
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+<h1>I2P Stats Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
  
diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp
index d61d14d1c..cb195b5ca 100644
--- a/apps/routerconsole/jsp/configtunnels.jsp
+++ b/apps/routerconsole/jsp/configtunnels.jsp
@@ -12,7 +12,7 @@
 
 <jsp:useBean class="net.i2p.router.web.ConfigTunnelsHelper" id="tunnelshelper" scope="request" />
 <jsp:setProperty name="tunnelshelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
-
+<h1>I2P Tunnel Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
   
diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp
index 043541275..3b9a28668 100644
--- a/apps/routerconsole/jsp/configupdate.jsp
+++ b/apps/routerconsole/jsp/configupdate.jsp
@@ -9,7 +9,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+<h1>I2P Update Configuration</h1>
 <div class="main" id="main">
  <%@include file="confignav.jsp" %>
   
diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp
index 950610a75..e0a5f6cda 100644
--- a/apps/routerconsole/jsp/graphs.jsp
+++ b/apps/routerconsole/jsp/graphs.jsp
@@ -9,7 +9,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+<h1>I2P Performance Graphs</h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.GraphHelper" id="graphHelper" scope="request" />
  <jsp:setProperty name="graphHelper" property="*" />
diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp
index bad68ff5e..2be17b045 100644
--- a/apps/routerconsole/jsp/help.jsp
+++ b/apps/routerconsole/jsp/help.jsp
@@ -9,13 +9,15 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+<h1>I2P Router Help & Support</h1>
 <div class="main" id="main">
-<h2>Help</h2>
-Sorry, there's not much help text here yet, so also check out the
-<a href="http://www.i2p2.i2p/faq.html">FAQ on www.i2p2.i2p</a>
-or the
-<a href="http://www.i2p2.i2p/faq_de.html">Deutsch FAQ</a>.
+If you'd like to help improve the documentation, please 
+<a href="http://www.i2p2.i2p/getinvolved.html"get in touch</a> 
+with the project. For now, please see the following sites to augment
+the information available at the following sites:<br>
+<li><a href="http://www.i2p2.i2p/faq.html">FAQ on www.i2p2.i2p</a>
+<li><a href="http://www.i2p2.i2p/faq_de.html">Deutsch FAQ</a>.
+<br><br>
 You may also try the
 <a href="http://forum.i2p/">forum</a>
 or IRC.
diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp
index bc6c48a2f..7ff7bec32 100644
--- a/apps/routerconsole/jsp/index.jsp
+++ b/apps/routerconsole/jsp/index.jsp
@@ -17,6 +17,7 @@ if (System.getProperty("router.consoleNonce") == null) {
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
 
+<h1>I2P Router Console</h1>
 <div class="news" id="news">
  <jsp:useBean class="net.i2p.router.web.ContentHelper" id="newshelper" scope="request" />
  <% File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml"); %>
diff --git a/apps/routerconsole/jsp/jobs.jsp b/apps/routerconsole/jsp/jobs.jsp
index b7de2b717..12d1608f6 100644
--- a/apps/routerconsole/jsp/jobs.jsp
+++ b/apps/routerconsole/jsp/jobs.jsp
@@ -9,7 +9,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+ <h1>I2P Router Job Queue</h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.JobQueueHelper" id="jobQueueHelper" scope="request" />
  <jsp:setProperty name="jobQueueHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp
index a336d8d4f..b60d25288 100644
--- a/apps/routerconsole/jsp/logs.jsp
+++ b/apps/routerconsole/jsp/logs.jsp
@@ -9,7 +9,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+ <h1>I2P Router Logs</h1>
 <div class="main" id="main">
  <h4>Version:</h4><a name="version"> </a>
  Please include this information in bug reports.
diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp
index 6d029d7d2..27c1cd2dd 100644
--- a/apps/routerconsole/jsp/netdb.jsp
+++ b/apps/routerconsole/jsp/netdb.jsp
@@ -9,7 +9,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+ <h1>I2P Network Database Summary</h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.NetDbHelper" id="netdbHelper" scope="request" />
  <jsp:setProperty name="netdbHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/apps/routerconsole/jsp/oldconsole.jsp b/apps/routerconsole/jsp/oldconsole.jsp
index 7aa7bbcf4..18fc955cc 100644
--- a/apps/routerconsole/jsp/oldconsole.jsp
+++ b/apps/routerconsole/jsp/oldconsole.jsp
@@ -13,7 +13,7 @@
 <jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="conhelper" scope="request" />
 <jsp:setProperty name="conhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 <jsp:setProperty name="conhelper" property="writer" value="<%=out%>" />
-
+ <h1>I2P Router &raquo; Old Console</h1>
 <div class="main" id="main">
  <jsp:getProperty name="conhelper" property="console" />
 </div>
diff --git a/apps/routerconsole/jsp/oldstats.jsp b/apps/routerconsole/jsp/oldstats.jsp
index 9e150eeb4..43cf408fe 100644
--- a/apps/routerconsole/jsp/oldstats.jsp
+++ b/apps/routerconsole/jsp/oldstats.jsp
@@ -13,7 +13,7 @@
 <jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="oldhelper" scope="request" />
 <jsp:setProperty name="oldhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
 <jsp:setProperty name="oldhelper" property="writer" value="<%=out%>" />
-
+ <h1>I2P Router Statistics</h1>
 <div class="main" id="main">
  <jsp:getProperty name="oldhelper" property="stats" />
 </div>
diff --git a/apps/routerconsole/jsp/peers.jsp b/apps/routerconsole/jsp/peers.jsp
index 778a58e72..5131e3468 100644
--- a/apps/routerconsole/jsp/peers.jsp
+++ b/apps/routerconsole/jsp/peers.jsp
@@ -9,7 +9,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+ <h1>I2P Network Peers</h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.PeerHelper" id="peerHelper" scope="request" />
  <jsp:setProperty name="peerHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp
index 7dd40d6b8..ade3b9d64 100644
--- a/apps/routerconsole/jsp/profiles.jsp
+++ b/apps/routerconsole/jsp/profiles.jsp
@@ -9,7 +9,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+ <h1>I2P Network Peer Profiles</h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.ProfilesHelper" id="profilesHelper" scope="request" />
  <jsp:setProperty name="profilesHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp
index 9591c31f7..6e405566b 100644
--- a/apps/routerconsole/jsp/summarynoframe.jsp
+++ b/apps/routerconsole/jsp/summarynoframe.jsp
@@ -10,7 +10,7 @@
 <jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="uhelper" scope="request" />
 <jsp:setProperty name="uhelper" property="*" />
 <jsp:setProperty name="uhelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
- <centre><a href="index.jsp" target="_top"><img src="i2plogo.png" alt="Router Console" title="I2P Router Console"/></a></centre><hr />
+ <centre><a href="index.jsp" target="_top"><img src="/themes/i2plogo.png" alt="Router Console" title="I2P Router Console"/></a></centre><hr />
  <centre>
  <u><b>I2P Internals</b></u><br />
  <a href="i2ptunnel/index.jsp" target="_blank">I2PTunnel</a> 
@@ -26,7 +26,7 @@
  <a href="help.jsp" target="_top">Help</a></b><hr />
  <u><b>I2P Services</b></u><br />
  <a href="susimail/susimail" target="blank">Susimail</a> 
- <a href="susidns/index.jsp" target="_blaank">SusiDNS</a> 
+ <a href="susidns/index.jsp" target="_blank">SusiDNS</a> 
  <a href="i2psnark/" target="_blank">I2PSnark</a> 
  <a href="http://127.0.0.1:7658/" target="_blank">Eepsite</a> 
  </center>
diff --git a/apps/routerconsole/jsp/tunnels.jsp b/apps/routerconsole/jsp/tunnels.jsp
index 61fb4eb7b..d6852b72f 100644
--- a/apps/routerconsole/jsp/tunnels.jsp
+++ b/apps/routerconsole/jsp/tunnels.jsp
@@ -9,7 +9,7 @@
 
 <%@include file="nav.jsp" %>
 <%@include file="summary.jsp" %>
-
+ <h1>I2P Tunnel Summary</h1>
 <div class="main" id="main">
  <jsp:useBean class="net.i2p.router.web.TunnelHelper" id="tunnelHelper" scope="request" />
  <jsp:setProperty name="tunnelHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
diff --git a/router/java/src/net/i2p/router/admin/StatsGenerator.java b/router/java/src/net/i2p/router/admin/StatsGenerator.java
index cb2b49ac5..f1053a341 100644
--- a/router/java/src/net/i2p/router/admin/StatsGenerator.java
+++ b/router/java/src/net/i2p/router/admin/StatsGenerator.java
@@ -29,7 +29,6 @@ public class StatsGenerator {
     
     public void generateStatsPage(Writer out) throws IOException {
         StringBuffer buf = new StringBuffer(16*1024);
-        buf.append("<h1>Router statistics</h1><hr />");
         buf.append("<form action=\"/oldstats.jsp\">");
         buf.append("<select name=\"go\" onChange='location.href=this.value'>");
         out.write(buf.toString());
