From 091d03b9d89a652d495917e7a37a496284ea1240 Mon Sep 17 00:00:00 2001
From: z3d <z3d@mail.i2p>
Date: Mon, 13 Jul 2009 16:13:22 +0000
Subject: [PATCH] More theme spit 'n polish. Remove redundant themes from
configui.jsp
for now.
---
.../net/i2p/router/web/ConfigUIHelper.java | 2 +-
apps/routerconsole/jsp/configupdate.jsp | 18 +++++++-------
.../resources/themes/console/dark/console.css | 23 +++++++++++++-----
.../resources/themes/console/dark/default.css | 14 +++++++----
.../themes/console/dark/images/help_dark.png | Bin 0 -> 825 bytes
.../themes/console/dark/images/info_dark.png | Bin 0 -> 804 bytes
.../console/dark/images/tabletitlelight.png | Bin 0 -> 227 bytes
.../themes/console/light/console.css | 23 ++++++++++++++----
.../themes/console/light/default.css | 4 +--
.../themes/console/light/images/help.png | Bin 0 -> 852 bytes
.../themes/console/light/images/info.png | Bin 0 -> 780 bytes
11 files changed, 56 insertions(+), 28 deletions(-)
create mode 100644 installer/resources/themes/console/dark/images/help_dark.png
create mode 100644 installer/resources/themes/console/dark/images/info_dark.png
create mode 100644 installer/resources/themes/console/dark/images/tabletitlelight.png
create mode 100644 installer/resources/themes/console/light/images/help.png
create mode 100644 installer/resources/themes/console/light/images/info.png
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
index 1e7ffa3ea7..0e0b36a28a 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
@@ -4,7 +4,7 @@ public class ConfigUIHelper extends HelperBase {
public ConfigUIHelper() {}
public static final String PROP_THEME = "routerconsole.theme";
- private static final String themes[] = {"default", "classic", "dark", "defCon1", "light"};
+ private static final String themes[] = {"classic", "dark", "light"};
public String getSettings() {
StringBuilder buf = new StringBuilder(512);
diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp
index 3b9a28668e..16baad6e3a 100644
--- a/apps/routerconsole/jsp/configupdate.jsp
+++ b/apps/routerconsole/jsp/configupdate.jsp
@@ -27,28 +27,28 @@
if (prev != null) System.setProperty("net.i2p.router.web.ConfigUpdateHandler.noncePrev", prev);
System.setProperty("net.i2p.router.web.ConfigUpdateHandler.nonce", new java.util.Random().nextLong()+""); %>
<input type="hidden" name="nonce" value="<%=System.getProperty("net.i2p.router.web.ConfigUpdateHandler.nonce")%>" />
-<table border="0" cellspacing="5"><tr><td valign="top"><b>News:</b><td>
+<table border="0" cellspacing="5"><tr><td><b>News:</b><td>
<% if ("true".equals(System.getProperty("net.i2p.router.web.UpdateHandler.updateInProgress", "false"))) { %>
<i>Update In Progress</i><br /><br />
<% } else { %>
<input type="submit" name="action" value="Check for update now" /><br /><br />
<% } %>
<tr><td><td>
-<tr><td valign="top"><b>News URL:</b>
+<tr><td><b>News URL:</b>
<td><input type="text" size="60" name="newsURL" value="<jsp:getProperty name="updatehelper" property="newsURL" />">
-<tr><td valign="top"><b>Refresh frequency:</b>
+<tr><td><b>Refresh frequency:</b>
<td><jsp:getProperty name="updatehelper" property="refreshFrequencySelectBox" />
-<tr><td valign="top"><b>Update policy:</b>
+<tr><td><b>Update policy:</b>
<td><jsp:getProperty name="updatehelper" property="updatePolicySelectBox" />
-<tr><td valign="top"><b>Update through the eepProxy?</b>
+<tr><td><b>Update through the eepProxy?</b>
<td><jsp:getProperty name="updatehelper" property="updateThroughProxy" />
-<tr><td valign="top"><b>eepProxy host:</b>
+<tr><td><b>eepProxy host:</b>
<td><input type="text" size="10" name="proxyHost" value="<jsp:getProperty name="updatehelper" property="proxyHost" />" />
-<tr><td valign="top"><b>eepProxy port:</b>
+<tr><td><b>eepProxy port:</b>
<td><input type="text" size="4" name="proxyPort" value="<jsp:getProperty name="updatehelper" property="proxyPort" />" />
-<tr><td valign="top"><b>Update URLs:</b>
+<tr><td><b>Update URLs:</b>
<td><textarea name="updateURL" cols="90" rows="4" wrap="off"><jsp:getProperty name="updatehelper" property="updateURL" /></textarea>
-<tr><td valign="top"><b>Trusted keys:</b>
+<tr><td><b>Trusted keys:</b>
<td><textarea name="trustedKeys" cols="90" rows="4" wrap="off"><jsp:getProperty name="updatehelper" property="trustedKeys" /></textarea>
<tr><td><td>
<tr><td><td><input type="submit" name="action" value="Save" /> <input type="reset" value="Cancel" />
diff --git a/installer/resources/themes/console/dark/console.css b/installer/resources/themes/console/dark/console.css
index 1435977613..7ca94a30fc 100644
--- a/installer/resources/themes/console/dark/console.css
+++ b/installer/resources/themes/console/dark/console.css
@@ -151,10 +151,12 @@ div.news {
}
div.news li {
- text-align: left;
- list-style-type: square;
- margin: 2px 20px 0px 30px;
- padding: 10px 20px 1px 0px;
+ text-align: justify;
+ font-weight: bold;
+ list-style-image: url(images/info_dark.png);
+ margin: 0 10px 0 30px;
+ padding: 5px;
+ vertical-align: middle;
}
div.confignav {
@@ -201,6 +203,7 @@ div.messages li {
margin: 0 0 0 30px !important;
padding: 5px;
border: 0px !important;
+ text-align: justify !important;
}
table {
@@ -382,6 +385,7 @@ button {
font-weight: bold;
margin: 2px 3px;
text-align: center;
+ min-width: 76px;
}
button:hover{
@@ -390,6 +394,11 @@ button:hover{
color: #ff6600;
}
+button:active {
+ border: 1px inset #f60;
+ background-color: #f60;
+ color: #fff;
+}
.underline {
border-bottom: 1px solid #eeeeff;
padding: 5px 0px 5px 0px;
@@ -440,8 +449,10 @@ input:hover {
border: 1px solid #f60;
}
-input:btn {
- background-color: #f00 !important;
+input:active {
+ background-color: #002;
+ color: #fff;
+ border: 1px solid #f60;
}
select {
diff --git a/installer/resources/themes/console/dark/default.css b/installer/resources/themes/console/dark/default.css
index b3fd118a36..af1184c420 100644
--- a/installer/resources/themes/console/dark/default.css
+++ b/installer/resources/themes/console/dark/default.css
@@ -23,7 +23,7 @@ div {
h4, label {
margin: 0;
- padding: 4px 2px 2px 0px;
+ padding: 4px;
float: left;
width: 150px;
/* height : 24px; */
@@ -41,6 +41,7 @@ h4 {
border: 1px solid #99f;
margin: 5px 0 15px 0;
background: url(images/tabletitledark.png);
+ background-repeat: x;
background-color: #002;
text-transform: uppercase;
text-shadow: 0px 0px 2px rgba(255, 255, 255, 0.9);
@@ -162,12 +163,12 @@ hr {
}
.control {
- margin: 0 0 0 4px;
+ margin: 0 2px 0 2px;
padding: 0 0 2px 0;
overflow: hidden;
height: 20px;
- width: 60px;
- font-weight: normal;
+ min-width: 60px;
+ font-weight: bold;
background-color: #bbbbff;
color: black;
border: 1px outset #ddddc0;
@@ -175,6 +176,8 @@ hr {
white-space: nowrap;
-moz-border-radius: 4px;
margin-top: 8px;
+ background: url(images/tabletitlelight.png);
+ background-repeat: x;
}
.control:link {
@@ -185,6 +188,7 @@ hr {
border: 1px solid #eeeeff;
background-color: #003;
color: #ff6600;
+ background: none;
}
.control:active {
@@ -254,7 +258,7 @@ hr {
.header {
-moz-border-radius: 4px 4px 4px 4px;
- border: 1px solid #ff0000;
+ border: 0;
}
a:link{
diff --git a/installer/resources/themes/console/dark/images/help_dark.png b/installer/resources/themes/console/dark/images/help_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..d61716906115c5bfb79ca231448cd70d3df999b9
GIT binary patch
literal 825
zcmV-91IGM`P)<h;3K|Lk000e1NJLTq000pH000pP1^@s7Olo&*00009a7bBm000id
z000id0mpBsWB>pH>q$gGRCt_iR9#5ZQ4~M_>wj*3mRTk}Dd9_r4{o*8wQS(jaz5Go
zB&{Jq4<$HyETI=6giH*|hpabevPtOXx6Ew>Q4&5B*ke!#ex#!NKAn5FnPVNe|9kH_
z_x{eg=lA0eKsG;*XZbA6&f+yhT$W|&26w>fDn5eaCIP4sQcS6=#F3F7D9cwwl<`j>
z5P+hh^AHY)l26-gm?jp>%XrY!Gl3-~9k{fFK`1V6MxMcJevXBOCWM6rjK)%`ac&M{
zsi{m2jjDJ-F<V)Q{#jf5o;x*Vhl&b4=ybZn>S`%d1PT0fTidXJsjcn9tgPxdoEj~b
zH%Msb7?rDtMx)}w%*+R9Z?`~AjYjM@Hhu$Ra590WqMk*os;mM*t9>ZYrl&DCr8O=W
zp5p0``{Y=`Sm*bH(`I`I+uNJ;stBl5tVyqzCK$n&x!qo8LxT>~YAuwPYr$x|3?7f~
z{o*2C<gMH1xm7A1GIj}PW+GT$|5VgNu>cE&Ad9E*`wzivzAf@PoenWmES)J75KI)r
zm;{ZDdib}82%}aQJ3H?QM{Da{Fc@mZ+GJ`1y4)f*J|B(_4t~XqjH}31(BJ<NeZJ^)
z5;weIbfa04fNgETn8_p^BppZ?b@4=A9(4Qt(Ffr$D<l``5u~&<*hx=^S35iKvaU}0
zmC|KyZZ~#NrVtn6g$s8up_}7_i)vutGm@?%9uIaV0nl6Cj*oAOxA4Q2mA!&jr!yo5
zUr$c%$COF&oSf@ux9_6Y8=j&vB_L+B#9XAb)bii#U0tu^fI%!MxOwC+E9(}1E^3+H
z%VjPx#!{YWw=Y6=b}l#^V=z4YEGf3Pw<~74uVe-Te9FwkFIMXlkYz>E!C){*3JAjb
z`nQw>y}ge~gzz&zA6DXMDEWMmAzoff%g|BDYW028>8yhDgwJT~LzgSW`F9Wzatg%+
z#=Ks*Me~b5Ksv*zO~gnWNEGi8)mEhvMl~Ag=(q6~+ufVjdLjf>00000NkvXXu0mjf
D+naeA
literal 0
HcmV?d00001
diff --git a/installer/resources/themes/console/dark/images/info_dark.png b/installer/resources/themes/console/dark/images/info_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..678d2e6ba962a63ff0925e9b818dd8a1f7d290f8
GIT binary patch
literal 804
zcmV+<1Ka$GP)<h;3K|Lk000e1NJLTq000pH000pP1^@s7Olo&*00009a7bBm000id
z000id0mpBsWB>pH)=5M`RCt_?R9{GwQ4~M-+jNf4rLGCi9>%1BjTCE&|Hw8*f<^dZ
zC{a)^J&2h^K|Ki4L#*t<KWGnOk`Gcs4FrAJ+@>;z;=`C?J*>$PB%+py|L1nP_gXin
zJ#^sv?z#8;xxe!}=lcMt%+BH)wvs>~`Eg@|6#D(3U<cs!VkTEcMv$Kn01HBj%+F&Q
zJ9W7bmC6ckl}bxVT&YZh-Q8WVS}*<eo|(ai)U$$bhK5$qXlz6lJ~^3;DV)x!4y95F
zTU(ouo13qeT&{U>U48wP7w}J+n!<+R;V&r57kMtL^)Y%pxGx;$=CDta%J2Za1ud3l
zp)(L1b4CVyE-XCD1B}Mg;BfSb1bKP+@VkBhL{$5H@G}?;rbVL>u-ofEr&GPGtW-1$
zCnggUcwUyFg{sT6DhFdlq@>*L)zv-W7*wh%92kh8-;Z~>ae6u#`BM!ew!Hiv*L!+G
zI6jUi!0B8U6`0Mph0dNp0NqkJ{7GEZ-TfL&rZZw6kHa~sq@*l`M6LEDU$e4uK%s!=
z5RKxi_I5W<IXb$DCesapN0hm|jBmqXXdD~+0NL3&P*Y<|P$D%|Rb)FQJw>fL+Bb4|
z!^l#paBydb6wwRF>goyw8V7@+00;rf5k~g*$Q`?#c#cf~C9{GN+SxgW8jX$PRI4vw
zOUpZKYkQAcZLJ`>qr-#rvV_lvS49H18*Qwx>goq6T(ZF4-bL*1UqXZ7T8fSF&SGfS
zZt@9|Wppeq2Ep(5rl5<(zVnG<J&47=rP!91LUev7Aen?`bg+n&o=$$~^{0-N$P%bj
z2OOHs#mDSAT`uJbzY_YA=x29buh(s}&a?0Ef26hb5fl{_@6$g(gXj*0lpYS_Tr^6G
z7Z!q~tLrJSnLjMDoC!@$xA>!0qc<KWmu)t(Ba$4JPzVd?a({h2*^o#`8s<aWyGe&;
icx?>^YimjHXv{Alf?s^FeOX)p0000<MNUMnLSTZ}!g8Yk
literal 0
HcmV?d00001
diff --git a/installer/resources/themes/console/dark/images/tabletitlelight.png b/installer/resources/themes/console/dark/images/tabletitlelight.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c9092e7372739d8bd1deeabd0c125a81dc29c6e
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^Aht9I69WU|-n%=UfE>;OkH}&M2EM}}%y>M1MG8=G
zs;7%%NX4AwJ^y~&Gcz-v{>#my@alfNz|kWNj1HD+3s{5$L{yIKcz&$DgXMHTe}JmN
zQisSDp8oHfLjU~g$yCrfTJh;@J)6pbPyaZXx&EK$7qJs&W_GPv!7TW!{#QrV{paQt
zZ_|H%m+t*Pebu|gH|oXr|4To>8*y*{A!Y8K4eKkG{{MGGyH`x?#ijrMA5M1resaS^
aHinJTmXA74c0LC>kipZ{&t;ucLK6Urs$5Y3
literal 0
HcmV?d00001
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 10e5d8db85..d1c175177d 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -145,6 +145,15 @@ div.news {
line-height: 140%;
}
+div.news li {
+ text-align: justify;
+ font-weight: bold;
+ list-style-image: url(images/info.png);
+ margin: 0 10px 0 30px;
+ padding: 5px;
+ vertical-align: middle;
+}
+
div.confignav {
padding: 10px;
margin: 0 0px 25px 0;
@@ -209,6 +218,10 @@ th {
font-size: 8pt;
}
+tr {
+ vertical-align: middle !important;
+}
+
tr:nth-child ( even ) {
background-image: url('images/tabletile.png');
background-color: #99f;
@@ -355,8 +368,9 @@ button {
-webkit-border-radius: 4px;
font-size: 8pt;
font-weight: bold;
- margin: 2px 3px;
+ margin: 0 1px;
text-align: center;
+ min-width: 80px;
}
button:hover{
@@ -404,6 +418,7 @@ input {
border: 1px solid #001;
padding: 0px 2px 1px 2px;
text-decoration: none;
+ min-width: 110px;
}
input:hover {
@@ -426,9 +441,6 @@ submit {
border: 1px solid #001;
padding: 0px 2px 1px 2px;
text-decoration: none;
- border-radius: 4px;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
}
select {
@@ -437,11 +449,12 @@ select {
margin: 5px 10px 5px 10px;
font-family: "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif;
border: 1px solid #001;
+ min-width: 110px;
}
textarea {
padding: 5px;
- margin: 5px 0;
+ margin: 5px -20px;
background-color: #eef;
color: #003;
border-radius: 4px;
diff --git a/installer/resources/themes/console/light/default.css b/installer/resources/themes/console/light/default.css
index 2fd281198e..91413ff2f3 100644
--- a/installer/resources/themes/console/light/default.css
+++ b/installer/resources/themes/console/light/default.css
@@ -132,7 +132,7 @@ hr {
.freetext {
width: 150px;
height: 22px;
- border: 1px solid #9999ff;
+ border: 1px solid #003;
padding: 2px;
margin: 4px 0 2px 4px;
}
@@ -143,7 +143,7 @@ hr {
overflow: hidden;
height: 22px;
width: 60px;
- font-weight: normal;
+ font-weight: bold;
background-color: #bbbbff;
color: black;
border: 1px outset #ddddc0;
diff --git a/installer/resources/themes/console/light/images/help.png b/installer/resources/themes/console/light/images/help.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c5136f45383ee25cf0c0b49c39ddb884ae019c3
GIT binary patch
literal 852
zcmV-a1FQUrP)<h;3K|Lk000e1NJLTq000pH000pP1^@s7Olo&*00009a7bBm000id
z000id0mpBsWB>pI21!IgRCt_aR9{F_VH7|2-tFG0b4p_WL6?fAkebsCZ^VT4kQGLu
zLN6-wt<r}OAvDaFG#!BtiGO04l%ytVDl|ip(6E^az9fnWQ4x_zq~2|J`#Rs<uBiLq
z-tGH-=lh-C`JKZBP?jZ;zBz!Lg2+hzv(Fbl9|XX36ZS7=a*_}TTVrDqF_~@=6=ms5
z5Cm9WUJVOIFj;_LME<YR(gxDj_K|3{mVZoV=PEH8lVN6N2vSom02+-&qNMcUxI8&T
zasDhoUZx^QW!34#AIZsS$8EMkSXx?uxw)AwuXpYULR3<Ad_~1Gg{GxthK!Hz5QZ@+
zdwP!eNtDHERJN?Fi_p{41TL3b*+)kkXtKx<oWXOP*;i9DsxZ{ozauQ0>j$vv!@YrX
zM}tq;GFj1ZVz)a<Rn-7NGf+oPamb?VOtV>>9v+^8^>sIFY`D?nSrEm7ex>w?hzs9o
z?uiMBxLg5ZFo>kK_LZWC=fywl?(XghN~P5bFf`N-dc7WOwh|?=*DJ-cI-PD)RpRq`
zpsQ<mPnlNBdss=@x!Te3L^+t6dJEIjua*CUgD>cX>%nHSxphWkDe3L~M*8}GlJxWn
zT8ZO8Z?G&aw&5Cv<Js02z?$b!z@G83IEO`1QTke0mQQ&+l0gu3e;Ee0BuRRT1Oou>
z_5C;YXDQZbw9gY0&*-YF??YNzMi~9(=5J_ieF%$-^RnOXF9Z1Wa*v2*O^*2Z!ocY0
zw&G($!#LJrAqfeWNm9}k+8vUTQbe52H3g?}F)=puJKw3?$H6qSEO)oA?hz9a5gZm#
zEX2-zfbQ-Iuv%?6(Hy!bgNoDN#zqJB#8ZwVk&h$D1_A*;hxLcaud2EMD=S~2va%eC
zi*FymR6-P@K_v@ro)-q2n;(EI`wj$RCg6Dv;^K~lC7|(0G>ay`SB*tq%=ZBNk4s9*
z7`y#Wc+)~_WTYS3+a16#T$3!Ht^*kGA8s-3b1q?q2A|KHgC+7Rz;PNGzZhS3cDCyQ
e&b*<QRqQ`C;yO@q7&%t}0000<MNUMnLSTYZo{VS!
literal 0
HcmV?d00001
diff --git a/installer/resources/themes/console/light/images/info.png b/installer/resources/themes/console/light/images/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..13f25a9aefc55baaa710c82cf6158c38f890e8e4
GIT binary patch
literal 780
zcmV+n1M~ceP)<h;3K|Lk000e1NJLTq000pH000pP1^@s7Olo&*00009a7bBm000id
z000id0mpBsWB>pHzDYzuRCt_iQh!KOQ4~J!wddPf!=^GUl@Sz3LZNf4LIzqcrN~f9
z{|ZqUWQ0RZA@D~jriidV`bR=T0w<9mWRfnF0x6KGi~@;7LNGNlYHs8Gyxn_sug&?v
zdmQdL_q*Tu&H<n(tRnv-0C{Nux&T1d-@OFbGa(*~-;WR^VR~A@r#2MJvgFs-*PdJn
z;5dUTi)qO7mwu8f<m0#th^?uq&4|@aO??D*c6Mekc2HL4P~vzl8WM!z`;mr*QOecZ
z`-#fI@^fgCNOCwDmF{jYtzKXM4mmki8n3N=1Gl@noM={q!GK0tS68LQo0}ViV@Er%
zT5mrynTnCeGmgs39~1cz{3N&UV+^-&Y^cC~<^i0*6hDMG%>}g<%QfWlZ6V^H%hidD
zM(4Zz<oPVS{XXrczW%vp?!Z8R#ElHDT%4GApC982hj+nfJVxWv(n4S*Nj@D*&dj{V
zE!Jocn@p*|^1Oa56xy5f&dx8`-rj`&Y$25mg=XEAl_j96DxMS%2E$RB92ptJXG(=;
zJrPGdAYKqpaA)@*8F^UUIZMLOl8bB(o;S29igHDkMLs@*C2R?T*ny)_fcelNB(|G6
zo$h5(Q3==F+(9*OY^=l5(gN++>AXy<g26@T?0f*SEPseb!#4l|fA&cV+#HuOI6OQK
znVBawT4G;+|0BrAuz=4um7v$_?E%04&2LeZ&f*QSrRw#DC)L%p2?PY$*?a3|wVq09
z+T(c$2&rbgfY-?yMi_<_iS&aY(g{dQ2O$UoNRmVx5im(Wibf-@xw&c7)zwO8co2u3
zwY1y?+`(r6?p6GBnB3euZ&y~nxQK~OO>K17R#(4**_;k(Y3X$ThK8QP<m5PF7^YoS
z7kbDWhm4q@FyCxG-WrKSuVNJ`EX&IH(yl0qFH}_=16W>;ul@&24j~kq>*7HG0000<
KMNUMnLSTY>g=U%n
literal 0
HcmV?d00001
--
GitLab