From 8f04aa70cb65fe64f755e9d40b086a13f5ce2d62 Mon Sep 17 00:00:00 2001 From: str4d Date: Sun, 14 May 2017 05:36:40 +0000 Subject: [PATCH] /home changes: - Update some app icons - Rationalise the markup - Add tabindex ="-1" to icon links - This means they are skipped when using tab to navigate in the browser --- .../src/net/i2p/router/web/HomeHelper.java | 33 ++++++++---------- .../i2p/router/web/SummaryBarRenderer.java | 2 +- .../themes/console/images/info/console.png | Bin 0 -> 1507 bytes .../themes/console/images/info/ui.png | Bin 0 -> 1751 bytes 4 files changed, 15 insertions(+), 20 deletions(-) create mode 100644 installer/resources/themes/console/images/info/console.png create mode 100644 installer/resources/themes/console/images/info/ui.png diff --git a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java index 150448074..9a1aae4a9 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java @@ -28,15 +28,15 @@ public class HomeHelper extends HelperBase { // No commas allowed in text strings! static final String DEFAULT_SERVICES = _x("Addressbook") + S + _x("Manage your I2P hosts file here (I2P domain name resolution)") + S + "/dns" + S + I + "book_addresses.png" + S + - _x("Configure Bandwidth") + S + _x("I2P Bandwidth Configuration") + S + "/config" + S + I + "action_log.png" + S + - _x("Configure Plugins") + S + _x("Install and configure plugins") + S + "/configplugins" + S + I + "plugin.png" + S + - _x("Configure UI") + S + _x("Select console theme & language & set optional console password") + S + "/configui" + S + I + "wrench_orange.png" + S + + _x("Configure Bandwidth") + S + _x("I2P Bandwidth Configuration") + S + "/config" + S + I + "info/bandwidth.png" + S + + _x("Configure UI") + S + _x("Select console theme & language & set optional console password") + S + "/configui" + S + I + "info/ui.png" + S + _x("Customize Home Page") + S + _x("I2P Home Page Configuration") + S + "/confighome" + S + I + "home_page.png" + S + _x("Email") + S + _x("Anonymous webmail client") + S + "/susimail/susimail" + S + I + "email.png" + S + _x("Help") + S + _x("I2P Router Help") + S + "/help" + S + I + "support.png" + S + - _x("Router Console") + S + _x("I2P Router Console") + S + "/console" + S + I + "toolbox.png" + S + + _x("Manage Plugins") + S + _x("Install and configure I2P plugins") + S + "/configplugins" + S + I + "plugin.png" + S + + _x("Router Console") + S + _x("I2P Router Console") + S + "/console" + S + I + "info/console.png" + S + _x("Torrents") + S + _x("Built-in anonymous BitTorrent Client") + S + "/i2psnark/" + S + I + "magnet.png" + S + - _x("Website") + S + _x("Local web server for hosting your own content on I2P") + S + "http://127.0.0.1:7658/" + S + I + "server_32x32.png" + S + + _x("Web Server") + S + _x("Local web server for hosting your own content on I2P") + S + "http://127.0.0.1:7658/" + S + I + "server_32x32.png" + S + ""; // No commas allowed in text strings! @@ -176,7 +176,7 @@ public class HomeHelper extends HelperBase { } private String renderApps(Collection apps) { - String website = _t("Website"); + String website = _t("Web Server"); StringBuilder buf = new StringBuilder(1024); buf.append("
"); for (App app : apps) { @@ -188,23 +188,18 @@ public class HomeHelper extends HelperBase { } else { url = app.url; } - buf.append("
" + + buf.append("\n
\n" + "
" + - "" + - "\"\"\n" + - "
" + - "
" + + // usability: add tabindex -1 so we avoid 2 tabs per app + "" + + "\"\"" + + "\n" + + "
" + "
" + "").append(app.name).append("" + "
" + - "
" + - "\n"); + "
\n" + + "
"); } buf.append("
\n"); return buf.toString(); diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java index 2e629c3b7..1eddd3259 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -163,7 +163,7 @@ class SummaryBarRenderer { .append("/\" target=\"_blank\" title=\"") .append(_t("Local web server")) .append("\">") - .append(nbsp(_t("Website"))) + .append(nbsp(_t("Web Server"))) .append("\n") .append(NavHelper.getClientAppLinks(_context)) diff --git a/installer/resources/themes/console/images/info/console.png b/installer/resources/themes/console/images/info/console.png new file mode 100644 index 0000000000000000000000000000000000000000..305109c4ac61e27f3bcb91504e7f50dc1888645b GIT binary patch literal 1507 zcmV<91swW`P)&Sri_IA88 zGJ-Tg2uf=$T-Sx0N+B)1m7a4XM?hL3BLa+ZbnN>+-aB{@nRH66%e4ehi!|;@0F8my z03d`b8>iE0tX{o379<;_L@0@yS?eYMVu93@;m<((a=EOaTzQZC@$kL9J=m~*gUYxz za}C#LX7$-}07S@BC8v&slhO$Qk_dOKo|quiREcoz;8d;75nRL_1=+fFy%_!Uh|1Xa z#_PC#{jVlNx{c1kg*BB^8x&5BC;*)kmCA46g>|@e;wBtxc$Ux}TJ z`Pz+7n98J8U8$6fJ>QL=*AkBUk+q3a8|3pj96CIzM7}XEEYkpmF~pb^=_rkjc;=!wW+E=8ncopqE zalnetv8TP~)!r+s#)yMXOt93%)YKHZbKOehIS1Us2biG_e=-^u$wHE!3-JM?-AT6E zoj|RP3(4Ywq}hPAAkZ+5&EcS@rw7GiQOD%f3GW49a&qFnt07mnNli(75V>4-SvADH zGU4FhW4PaH%ma*H9FNPcoVKH*L)4$sXT@8$Fh4)vx)`zDxpPNm#D1>TvzUN!=*IvV zW{CqCQL_;T6n}=L%@eJP1whxeu3d7-uFg(;eCV)_-+pU978e$q%DUSC9Zn{Nw(n0O zbM%M;@LqilUSW@hWPbbv)?PfWuin^Hz}&ztq~PP!xPxzgi$U%gbg^Tz)Bs7z&~onJ z(xuBwQ9!=4vjdH4b{cJGC9g+ceSzwQ38m=sqi`hb97#HB#=nGLJflRObIb+bo-3jF z_q-DMv>Rtq)sFNtQiAi6j7a3;XDz}|FCe1+vER>Q^6m#P z2S18mu2ywU^!gL+q2U~x3SOr)I5YEjNzx(;8)6YJruQUp$Ov)w> z9&Mx0+Pi(?e{77~8%(|?5!#-7A3Uf}HQvcQp%PZQnU(%L{|EFSEDov145t79002ov JPDHLkV1j2b*w_F7 literal 0 HcmV?d00001 diff --git a/installer/resources/themes/console/images/info/ui.png b/installer/resources/themes/console/images/info/ui.png new file mode 100644 index 0000000000000000000000000000000000000000..14bed7fe700b2cd225c643555a4f856ae43a6b2e GIT binary patch literal 1751 zcmV;|1}OQ7P)aqT-&y7+qP|tZ5y%GX549IVms-b$;1;|-NE;&wv#oV^__EPg1@Tn?f+KQ z$rRvUs{b4KsZ0%zjJiBpq5Mdp(x_BgU4hPE#2gooMyp4q))pwm&tsITk0PR?E|!=gfTZtI=)abx>KC!wi|HA2;ahze z!L`Q_vhPgv1{+8gEe3}ZNlRB3$tfvl_4-OV{|_xbO*oyEm!F3uE`NwucQ*6b`esxb zEl7Iq5xRuZyicjBY$m63Gn>nQ#}3!QggZXMwZ9oMvl+hkenuX744!?CT$_~?heH}* z$F5!Xf8QrDEi5A96H|N~2D1^#vzr=ta&0XSud2f*GM?T(H+aOjfv6(Ei zw>P5C?B&k+RlK;qhS-#Bs$6^VQb}A=8lE9A)x3tSX%Wr>6M2Q@d_hJg^^2FFPD(VFt zGH1^emZbj?g-*w~O#jl$jICHnzesCHPG-b2ilt*OD_j=VRNG1GsY7D5*-@xeCK+BD zI8>w8;l=}*{q(8D>b#F-h! zgFCd5>d-=x>`Ays;oRragwin@)kx~f){vW5&LjzOPI`vN5POxOn{Od5Fp$q`>*yZ$ z&@(cGL{(eBlF|g0RVGtB*uuDH1dUFI3@;7*O6a6dX3bhY*#n6|t;aLc$3p+T+&3!^ zt0fMP7+6`JhpVcVoR$duZSUYn&w-v^=0K3JOb# zpk*ArLdVchAM@SjHONY*GKD+8F%yv5xYh4AB(vAk+w1x9t zYBY;-O-NGH((v*1bI7nV^f%9h858g1(kO+Zt+lO{x`sN6it;Jm+s_qGD#^>s#Aq@h zaXQm!7HxNrjbn(8W_%n1itIe4+evuI9waRTz068e(I@&)QdCSpP*8ykDZ_qs8-CNo z5l0_=^i8rPJ-xjmu>r{npFHukmb479a7P{H*f=C=@mxnoCz7W$+j&N}ix-SOEOu&` zL>@xXF^V=BZX)E2AG{BQj=AdUs~?iLpgfw3iVBgawQ8zF(Xw-LsBdT>*N4%<{9lyp49Fjr@5NJfdMg2iwq^heZKfl;Fm%t%$_r6d5YDFxRQ|sMaJQB zxiH1XlAWDRQ9&VH!vowOvX&Q>JLq>0Bl$QX48MFEjEo_VUl~S*@`n3q$a4Hf==ANo zb{TaB12wfZWM*e!NwFXkIVR5d=Oedrhwm~T2wu(O5t}G)sb>Zb7K=R3Prm#?KLmP{~eI!IYC@9`|Wo77bfxx3iv9W z9i5YB{FTzQck#a;f4ty=3vSrHb7!pF1=2)NaBxMk)r!RJb|XKbYp=cb5%KKNUekYH zX3A6(@AW#N8>H5*TNj;_oQx?hjyZGZuK8(=|Ld7Cafcr=aiSe5bhgm7Le~hLD)igG tw();$L4P}8=wP|syp8`4;{Sh~{srdr7ypKm5Pkpv002ovPDHLkV1jEKTR8v# literal 0 HcmV?d00001