From d10d7227635df73e1dc529649158c9d6786ec8e9 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 2 Jan 2019 13:19:12 +0000 Subject: [PATCH] Wizard: Styling, fix links, change button icons back.png: Arrow flipped from go.png in Gimp, same license --- apps/routerconsole/jsp/welcome.jsp | 29 ++++++++++-------- history.txt | 13 +++++++- .../themes/console/classic/console.css | 12 ++++++++ .../themes/console/images/buttons/back.png | Bin 0 -> 1947 bytes .../themes/console/light/console.css | 10 ++++++ .../themes/console/midnight/console.css | 12 ++++++++ .../src/net/i2p/router/RouterVersion.java | 2 +- 7 files changed, 64 insertions(+), 14 deletions(-) create mode 100644 installer/resources/themes/console/images/buttons/back.png diff --git a/apps/routerconsole/jsp/welcome.jsp b/apps/routerconsole/jsp/welcome.jsp index 95ce8d84f..982d9a850 100644 --- a/apps/routerconsole/jsp/welcome.jsp +++ b/apps/routerconsole/jsp/welcome.jsp @@ -123,28 +123,29 @@ // license info? %>

<%=intl._t("Why I2P?")%>

-

+
<%=intl._t("I2P is a communication tool for people who value privacy and wish to remain anonymous online.")%> <%=intl._t("I2P is a peer to peer network where you can browse and create hidden services.")%> -

+
<% } else if (ipg == 3) { // Overview of bandwidth test %>

<%=intl._t("Bandwidth Test")%>

+

<%=intl._t("I2P will now test your internet connection to identify the optimal speed settings.")%> <%=intl._t("Bandwidth participation improves the anonymity level of all users on the network and maximizes your download speed.")%> <%=intl._t("This is done using the third-party M-Lab service.")%> +

<%=intl._t("Please review the M-Lab privacy policies linked below.")%> <%=intl._t("If you do not wish to run the M-Lab bandwidth test, you may skip it by clicking the button below.")%>

<%=intl._t("M-Lab Privacy Policy")%>
<%=intl._t("M-Lab Name Server Privacy Policy")%>

- - +
<% } else if (ipg == 4) { @@ -233,36 +234,40 @@ // Browser setup %>

<%=intl._t("Browser Setup")%>

-

+

<%=intl._t("Your browser needs to be configured to work with I2P.")%> -<%=intl._t("If you want to do this yourself, here are instructions.")%> (browser-config link) +<%=intl._t("If you want to do this yourself, here are instructions.")%> (browser-config link) <% if (net.i2p.util.SystemVersion.isWindows()) { %> +

<%=intl._t("Otherwise, the recommended way to browse I2P websites is with a separate profile in the Firefox browser.")%> -

  1. <%=intl._t("Install Firefox")%> -
  2. <%=intl._t("Install the I2P Firefox profile")%> +
    1. <%=intl._t("Install Firefox")%> +
    2. <%=intl._t("Install the I2P Firefox profile")%>
    <% } //isWindows() %> -

    +

<% } else if (ipg == LAST_PAGE) { // Done %>

<%=intl._t("Welcome to I2P!")%>

+

<%=intl._t("When you start I2P, it may take a few minutes to bootstrap (integrate) your router into the network and find additional peers, so please be patient.")%> +

<%=intl._t("When I2P starts up, and during normal operation, I2P's tunnel build readiness indicator in the side panel may indicate that I2P is \"Rejecting Tunnels\"; this is normal behavior.")%> <%=intl._t("Once green stars are indicated next to your Local Tunnels, there is a wide variety of things you can do with I2P.")%>

+
<% } else { %> -

unknown wizard page

+
unknown wizard page
<% } %> @@ -271,7 +276,7 @@ <% if (ipg != 1) { %> -" > +" > <% } if (ipg != LAST_PAGE) { @@ -292,7 +297,7 @@ <% } else { %> -" > +" > <% } %> diff --git a/history.txt b/history.txt index ce0f9c4af..6c15426a7 100644 --- a/history.txt +++ b/history.txt @@ -1,5 +1,16 @@ +2019-01-02 zzz + * Console: Wizard styling + * Data: Encrypted LS2 progress (proposal 123) + 2019-01-01 zzz - * Console: New light background (ticket #738) + * Console: + - New light background (ticket #738) + - Add warning for OpenJDK Zero VM + * Data: + - Add support for LS2 multiple encryption keys (proposal 123) + - Fix Meta LS2 bugs (proposal 123) + * Debian: Remove obsolete systray.config + * NBI: Add lookup tables for ARMv8 2018-12-24 zzz * Console: Update ARM warning (ticket #2368) diff --git a/installer/resources/themes/console/classic/console.css b/installer/resources/themes/console/classic/console.css index 4169bb41d..e4f8f3027 100644 --- a/installer/resources/themes/console/classic/console.css +++ b/installer/resources/themes/console/classic/console.css @@ -1797,6 +1797,18 @@ input.go[value^="Create"]:focus, button.go[value^="Create"]:focus { background: url(/themes/console/images/buttons/create-file.png) no-repeat 7px center, linear-gradient(to bottom, #ddd, #fff); } +input.back { + background: #eee url(/themes/console/images/buttons/back.png) no-repeat 7px center; + background: url(/themes/console/images/buttons/back.png) no-repeat 7px center, linear-gradient(to bottom, #fff, #ddd); + padding: 5px 7px 5px 23px; +} + +input.back:hover, +input.back:focus { + background: #fff url(/themes/console/images/buttons/back.png) no-repeat 7px center; + background: url(/themes/console/images/buttons/back.png) no-repeat 7px center, linear-gradient(to bottom, #ddd, #fff); +} + input.reload, button.reload { background: #eee url(/themes/console/images/buttons/restore.png) no-repeat 7px center; background: url(/themes/console/images/buttons/restore.png) no-repeat 7px center, linear-gradient(to bottom, #fff, #ddd); diff --git a/installer/resources/themes/console/images/buttons/back.png b/installer/resources/themes/console/images/buttons/back.png new file mode 100644 index 0000000000000000000000000000000000000000..b882c5b747cd57d677f0f19b1d7b7aa72b6e7f31 GIT binary patch literal 1947 zcmV;M2W0q(P) zaB^>EX>4U6ba`-PAZ2)IW&i+q+QnB{k|ie${O1%t0z!b`III!AfsgNGeM>JfJ>v)$ z(+`RgLdui`quM`zcl8$@LpCVuB>3pP#$%(6CSeftdR9-`&foo_&){WV-46y+jGou4 zZ(BZL-aQtG-Shc%UP;+{!d66A@qBpfJjPotY(;F=JneTC_qt@C+}VGoY_(hY`@0o@ zQ62QLQKm7m#;+f{Ff8E6Y4+pSKuEJ-yyhL#=h&$`d;{-}-mueY&+{u3O8YI~-!R(q z_JX2V{fbxnzF{3HI32&A{=|9N*IX(vaEH8AF%;3lpH&& zoO9lZ3og3k*<0_t_u@y5O2T5ri5HO|QBvSwg9|=L2qA_PO=OfX7kv~JLyR#cY?`1t zVReE;O4(%2HoNSzsX{am5!Yp~RA^sa%o%)mKq9)L2uahEQs@x#pX+&|*s+ zvDUfU?z->NLytXO);6oJtkD~D-?K)WwZWL3a`Ipe(;`O&jdJ1!XJE`&0^>3mKtP+p znGR&F8O#mNbTmi`XTTb{K~AN?7#OsTjO%o{docGcZ_3#p@n*haP7Uh*3+B|IZZr3h zw@+BBX`U!N2^v{AFxA{q*dUZlz(3UE-|y9*Di}S(2{p&LWmwKe=34}cX-Fh(ZMTjr zjxJ;OsyjGpXm%=%Lv}8@eJM+1wAU~8nh?^q!0MhVbgFCHk4<}ZP<`~+q_F~}XoTEc ztm&;cO9DxUC>%rAmC;gtxF1;d2Zun3I34DPVr@MJ`2&sLwn`dn6c#m()gvnBBG+*0 zgtN7i16OEoc)j)NI{<$XKfN%T#>M4Ovk@-1DVd6fqf13)5Q@f?Cm)e?kaDpa&&$w?GrO;02&Hq}cH+u(Lrt0Q zG5jnR^Jh>hU|FBBJgjP@{hBY0ar0QL=QIlMj<=1vE}55WqZUus%ngofhN%$ z(*8YZyh;x?%myU~gi!L!%N~hazT5RE%QxW6&DqO=$~$Zg$8r!Aeq?Z28)=-&OEU=H zz)|QIZl|VcHl`?R)4-lq#V{u16_4ICm#`dd9hbhA=!5{2rCVxY<4q^qBM!&2<&E*A z7ra(N^RDhV6+^P@EDBl8+ty5s8{`k`^$8dSSmTBdhi^;v3D)!s>q!QWQ}(UAHCV1@ zY~YfMvvC39a9EZVPOb#0OlQH(NcyB#&l7wKOkb7h2Ue2WI<`6H8DHL*dXx=nvLoAo z)LT$oI8{!`XI1LCZ#V6iF`M)FsGyT__27Jep?LFcQEr1j#|hJy)kf_>ULN5_a8m8V z=_og!m)eo%R;pb`kQyIO`9n38lCDMN>Iy4ZaLGQQ8tDxZ^%XXh7TIj>Gh$(oN8EW)9FV4@Nn*6Fw^nAVU0-}cg`o)7_2cIb-P$&PL41wHd?1oHZCWf zPL5FuXD!aT|1&tw)G%77k2kI*?e-DXs>CP-@NJ&Zd!GTDax7LVeR%Ii(rOK}I_J21 z>rx^F2r(21ArJzVmnE;>e4lJ!luFlcUr9cGZjt9X0EI$kLbnw0D{%B8D6fRnY7tQsp!@yF2HyLoQHn3y zpVABW*OMO|$JtWA&+QM{N$`Xa*}o8*Mr+!y-=?)k50d>HoKh5|yeUQyrr$pZX79jz z-?Un9?Z0SdkpQCVamuR%6T&Yk9!_y5$Cb_i$YolKG;DGw- h>MV;ze`COc^%rP>%mxDy@S6Yt002ovPDHLkV1i1|pU?mR literal 0 HcmV?d00001 diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 90923c7b3..3c045b447 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -3969,6 +3969,16 @@ input.go[value^="Create"]:focus, button.go[value^="Create"]:focus { background: url(/themes/console/images/buttons/create-file.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); } +input.back { + background: url(/themes/console/images/buttons/back.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); + padding: 5px 7px 5px 22px; +} + +input.back:hover, +input.back:focus { + background: url(/themes/console/images/buttons/back.png) no-repeat 6px center, linear-gradient(to bottom, #eee, #fff); +} + input.reload, button.reload { background: url(/themes/console/images/buttons/restore.png) no-repeat 6px center, linear-gradient(to bottom, #fff, #efefff); padding: 5px 7px 5px 22px; diff --git a/installer/resources/themes/console/midnight/console.css b/installer/resources/themes/console/midnight/console.css index ce99a4fac..6aa881232 100644 --- a/installer/resources/themes/console/midnight/console.css +++ b/installer/resources/themes/console/midnight/console.css @@ -659,6 +659,18 @@ input.go[value^="Create"]:active, button.go[value^="Create"]:active { background-size: 14px 14px !important; } +input.back { + background: url(/themes/console/images/buttons/back.png) 6px center no-repeat, linear-gradient(to bottom, #1f1e32, #090812 50%, #000 50%) !important; + background-size: 14px 14px, 100% 100% !important; + padding: 5px 7px 5px 23px !important; +} + +input.back:hover, +input.back:focus { + background: #652787 url(/themes/console/images/buttons/back.png) 6px center no-repeat !important; + background-size: 14px 14px !important; +} + input.reload, button.reload { background: url(/themes/console/images/buttons/restore.png) 6px center no-repeat, linear-gradient(to bottom, #1f1e32, #090812 50%, #000 50%) !important; background-size: 14px 14px, 100% 100% !important; diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index e36cd3b14..7f4edb975 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 12; + public final static long BUILD = 13; /** for example "-test" */ public final static String EXTRA = "";