lbt/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wizard: Styling, fix links, change button icons

Browse Source 
back.png: Arrow flipped from go.png in Gimp, same license
This commit is contained in:
zzz
2019-01-02 13:19:12 +00:00
parent 9951e3467e
commit d10d722763
7 changed files with 64 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
apps/routerconsole/jsp/welcome.jsp
View File

@ -123,28 +123,29 @@
// license info?
%>
<h3><%=intl._t("Why I2P?")%></h3>
<p>
<table class="configtable"><tr><td>
<%=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.")%>
</p>
</td></tr></table>
<%
} else if (ipg == 3) {
// Overview of bandwidth test
%>
<h3><%=intl._t("Bandwidth Test")%></h3>
<table class="configtable"><tr><td>
<p>
<%=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.")%>
</p><p>
<%=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.")%>
</p><p>
<a href="https://www.measurementlab.net/privacy/" target="_blank"><%=intl._t("M-Lab Privacy Policy")%></a>
<br><a href="https://github.com/m-lab/mlab-ns/blob/master/MLAB-NS_PRIVACY_POLICY.md" target="_blank"><%=intl._t("M-Lab Name Server Privacy Policy")%></a>
</p>
</td></tr></table>
<%
} else if (ipg == 4) {
@ -233,36 +234,40 @@
// Browser setup
%>
<h3><%=intl._t("Browser Setup")%></h3>
<p>
<table class="configtable"><tr><td><p>
<%=intl._t("Your browser needs to be configured to work with I2P.")%>
<a href="TODO" target="_blank"><%=intl._t("If you want to do this yourself, here are instructions.")%></a> (browser-config link)
<a href="https://geti2p.net/htproxyports#firefox" target="_blank"><%=intl._t("If you want to do this yourself, here are instructions.")%></a> (browser-config link)
<%
if (net.i2p.util.SystemVersion.isWindows()) {
%>
</p><p>
<%=intl._t("Otherwise, the recommended way to browse I2P websites is with a separate profile in the Firefox browser.")%>
<ol><li><a href="TODO" target="_blank"><%=intl._t("Install Firefox")%></a>
</li><li><a href="TODO" target="_blank"><%=intl._t("Install the I2P Firefox profile")%></a>
<ol><li><a href="https://www.mozilla.org/firefox/" target="_blank"><%=intl._t("Install Firefox")%></a>
</li><li><a href="https://geti2p.net/download#windows" target="_blank"><%=intl._t("Install the I2P Firefox profile")%></a>
</li></ol>
<%
} //isWindows()
%>
</p>
</p></td></tr></table>
<%
} else if (ipg == LAST_PAGE) {
// Done
%>
<h3><%=intl._t("Welcome to I2P!")%></h3>
<table class="configtable"><tr><td>
<p>
<%=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.")%>
</p><p>
<%=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.")%>
</p>
</td></tr></table>
<%
} else {
%>
<p>unknown wizard page</p>
<table class="configtable"><tr><td>unknown wizard page</td></tr></table>
<%
}
%>
@ -271,7 +276,7 @@
<%
if (ipg != 1) {
%>
<input type="submit" class="go" name="prev" value="<%=intl._t("Previous")%>" >
<input type="submit" class="back" name="prev" value="<%=intl._t("Previous")%>" >
<%
}
if (ipg != LAST_PAGE) {
@ -292,7 +297,7 @@
<%
} else {
%>
<input type="submit" class="go" name="done" value="<%=intl._t("Finished")%>" >
<input type="submit" class="accept" name="done" value="<%=intl._t("Finished")%>" >
<%
}
%>

13
history.txt
View File

@ -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)

12
installer/resources/themes/console/classic/console.css
View File

@ -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);

BIN
installer/resources/themes/console/images/buttons/back.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

10
installer/resources/themes/console/light/console.css
View File

@ -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;

12
installer/resources/themes/console/midnight/console.css
View File

@ -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;

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -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 = "";