From a12ae6e399aee368854ceb141892db473999425b Mon Sep 17 00:00:00 2001 From: z3d Date: Tue, 11 Aug 2009 10:45:20 +0000 Subject: [PATCH] Ongoing overhaul of the sidepanel. --- .../net/i2p/router/web/ConfigUIHandler.java | 2 +- .../src/net/i2p/router/web/SummaryHelper.java | 6 +- apps/routerconsole/jsp/summarynoframe.jsp | 52 +++++++++--------- .../resources/themes/console/dark/console.css | 10 ++-- .../themes/console/images/local_down.png | Bin 0 -> 512 bytes .../console/images/local_inprogress.png | Bin 0 -> 514 bytes .../themes/console/images/local_up.png | Bin 0 -> 579 bytes 7 files changed, 35 insertions(+), 35 deletions(-) create mode 100644 installer/resources/themes/console/images/local_down.png create mode 100644 installer/resources/themes/console/images/local_inprogress.png create mode 100644 installer/resources/themes/console/images/local_up.png diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java index 79ea1d182..ad7c1622e 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java @@ -24,7 +24,7 @@ public class ConfigUIHandler extends FormHandler { else _context.router().setConfigSetting(CSSHelper.PROP_THEME_NAME, _config); if (_context.router().saveConfig()) - addFormNotice("Theme change successfully saved (refresh page to view)."); + addFormNotice("Theme change saved. Refresh the page to actuate phase change."); else addFormNotice("Error saving the configuration (applied but not saved) - please see the error logs."); } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index ac495dab4..fc50b34c2 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -341,20 +341,20 @@ public class SummaryHelper extends HelperBase { Collections.sort(clients, new AlphaComparator()); StringBuilder buf = new StringBuilder(512); - buf.append("

Local destinations

"); + buf.append("

Local destinations

"); for (Iterator iter = clients.iterator(); iter.hasNext(); ) { Destination client = (Destination)iter.next(); String name = getName(client); - buf.append(""); + buf.append(""); buf.append("\n"); + buf.append("\n"); LeaseSet ls = _context.netDb().lookupLeaseSetLocally(client.calculateHash()); if (ls != null) { long timeToExpire = ls.getEarliestLeaseDate() - _context.clock().now(); diff --git a/apps/routerconsole/jsp/summarynoframe.jsp b/apps/routerconsole/jsp/summarynoframe.jsp index bca587926..e983eda65 100644 --- a/apps/routerconsole/jsp/summarynoframe.jsp +++ b/apps/routerconsole/jsp/summarynoframe.jsp @@ -25,44 +25,42 @@ <% } else { %> -

I2P Services

+

I2P Services

\"Server\"
\"Server\""); if (name.length() < 16) buf.append(name); else buf.append(name.substring(0,15)).append("…"); - buf.append("
\"status\"
- +
Addressbook -Torrents -Webmail -WebserverAddressbook +Torrents +Webmail +Webserver
-

I2P Internals

+

I2P Internals

-I2PTunnel -Tunnels -Profiles -NetDB -Logs -Jobs -Graphs -Stats -Configuration -Help +Tunnels +Peers +Profiles +NetDB +Logs +Jobs +Graphs +Stats
<% } %>
-

General

+

General

-, never reveal it to anyone" href="netdb.jsp?r=." target="_top">Local Identity

+, never reveal it to anyone" href="netdb.jsp?r=." target="_top">Local Identity
- +
Version:
Uptime:
-

+

<% if (helper.updateAvailable()) { @@ -88,14 +86,14 @@ <%=net.i2p.router.web.ConfigRestartBean.renderStatus(request.getRequestURI(), request.getParameter("action"), request.getParameter("consoleNonce"))%>

-

Peers

+

Peers

Active:/
Fast:
High capacity:
Integrated:
Known:
<% if (helper.getActivePeers() <= 0) { - %>

check your NAT/firewall

<% + %>

Check NAT/firewall

<% } // If showing the reseed link is allowed if (helper.allowReseed()) { @@ -122,25 +120,25 @@ } } %>
-

Bandwidth in/out

+

Bandwidth in/out

1s:/K/s
5m:/K/s
Total:/K/s
Used:/
-
-

Tunnels in/out

+
+

Tunnels in/out

Exploratory:/
Client:/
Participating:
-

Congestion

+

Congestion

-
Job lag:
Message delay:
Tunnel lag:
Backlog:
+
Backlog:

diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css index 5e5e02602..fe902cb1e 100644 --- a/installer/resources/themes/console/dark/console.css +++ b/installer/resources/themes/console/dark/console.css @@ -123,21 +123,22 @@ div.routersummary hr { } div.routersummary h3 { - border: 0px solid #f00; -/* border-bottom: 1px solid #99f !important;*/ + border: 0; font-size: 10pt; letter-spacing: 0.05em; margin: -7px -9px -10px -9px; - padding: 5px 0px 5px 0px; + padding: 3px 0px 5px 0px; background: #007; text-transform: uppercase; -moz-border-radius: 0; -khtml-border-radius: 0; border-radius: 0; + background: #007; + background-image: -moz-linear-gradient(top, bottom, from(#007), to(#005), color-stop(7%, #007), color-stop(100%, #005)); } div.routersummary h4 { - border: 0px solid #f00; + border: 0; border-bottom: 0 !important; font-size: 9pt; letter-spacing: 0.05em; @@ -147,6 +148,7 @@ div.routersummary h4 { text-transform: capitalize; text-decoration: none !important; color: #2b2; + background-image: -moz-linear-gradient(top, bottom, from(#001), to(#005), color-stop(10%, #005), color-stop(100%, #004)); } div.routersummary table { diff --git a/installer/resources/themes/console/images/local_down.png b/installer/resources/themes/console/images/local_down.png new file mode 100644 index 0000000000000000000000000000000000000000..14c7d4b9294e4109af51437ba8ac18d45710f673 GIT binary patch literal 512 zcmV+b0{{JqP)pGvPnciRCt_~Q%y?(Q4~EkYU!e+MH19VxCkpGaZy4W7yf~ur9Yrw z61WmtME{`w&?3PoqVHg$piM+YP>wa3DZ=eMotYdOq8_}Nx$mBP&%Niq0s5B($hRfS z%UvrV6BA`L8qH7BTpfzVZd}9_Q2K@gx!y-ARh4{RMAJ6$3>2Su)^<|2JseJKKHrgS zR(I?H^>|}J5|1mihD73ak2p!Er(pnLm8N3nRqrad37mS;-UC}dxLnReBIoO90ys1K`%TQIlsp{DEhh5ZOSI#~uWpPnXZ09vq=}9{~d%ABJ z^Klw?Hh7Br9T;?@Zz*%dPc~;={?@0bi^<6?35EU!c7w*oN~$x}wnQQ&Ka6T5+%k-V z!Dw_InG7cscAfQ|9mK}Rc|Rz)WudmcjR)XtZe?YmpQUK_hA0iiluC&N0&;8*xYCoZ z=%GCarlnA@xaGwLS$zT2SvXGlB<~@y-BKTcb&fB`Y|UYc7X)e)dzE{HQv>Z+7Q4Zq zQDSB^Ai}dxo}AytXMF){8NqipGv`IukRCt_~Q_V^OVH7>n*qA{-6eL1f(LySSpq137MK2IUD<8mK zBybh9h~A*b2$WisNQ#osMxr99q$YI~;dHO#&qx;a!JYZ;eCM8f&v)+t-euch&m(tR zoIHK*%a+2I8X`bTc1+nL6u+eB!cQ@W8@Fuwt?)XFc z`1pWL1{G}r^QDUm!Er5ud>)q4oS(bA`c5Xnav7OE+J^_6eaqF$IUgN(P^%#3KdL4(B72X0K)6lACB+f`z{u-2NM#zFgP zS2LHF`SoBBxW9J~7Z-ugPx!mZOC=;!ncRse3?zO4 zty+$Q3^^*GO}Yc%nj09R4ive=*Ht?fAMCIogJchEq02N&uTapd4bpQYW07*qoM6N<$ Eg6OX3i~s-t literal 0 HcmV?d00001 diff --git a/installer/resources/themes/console/images/local_up.png b/installer/resources/themes/console/images/local_up.png new file mode 100644 index 0000000000000000000000000000000000000000..1b70292fe7d3942a6582b9d27d2f4448e0665e46 GIT binary patch literal 579 zcmV-J0=)f+P)pG^+`lQRCt_~QcY+RQ4s#tY!VZwsa0ZvF)0?Bnu@hlX@f!Vr#DXp z(H;Ut5NSbr)2k;D{S(V@%yOv1xs-u8*g7wtw&usYMumaE8dMRlmwZ(@7)> z8ecv{-&YiKtKbP|E49CAwwpXvyUu}hJ>KE6`2lm3`xH8G5SgXO3^>UnSzsO^l_v1Q z%d6JVG}yn6*==dNzhLUOT6Md`OupsCfQ7WAsx_Z!SJ?H|fnDxI=Y=O5rC2nITiu~_ z;S-k2xF)QGEky>0etM*Yt?5cJw7JUVwh>tJRTjN;9eXh0ZYJ3~t8`^PdNP!EElGz& zqF-DN40Z8GDT#%@=xnwz9+*1I;J<Bht1m@X5Tjtq=vZu!~P05WQkW{w!J~trJ7s8y{e78?ZArd!a`8TS}=_9a2T;y zGcs&Cz9*8nZ&%UbILPS%M06dcmd%Njke27JNwu09od4=