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

* Console:

Browse Source 
- Summary bar tweaks
    - Config nav CSS tabs
    - CSS cleanups from last checkin
This commit is contained in:
zzz
2011-12-02 17:21:04 +00:00
parent 0a76a0db22
commit c9cccd7581
26 changed files with 197 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
View File

@ -935,15 +935,15 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
ahelperKey + "</textarea></td></tr></table>\n" +
"<hr><div class=\"formaction\">"+
"<form method=\"GET\" action=\"" + targetRequest + "\">" +
"<button type=\"submit\">" + _("Continue to {0} without saving", destination) + "</button>" +
"<button type=\"submit\" class=\"go\">" + _("Continue to {0} without saving", destination) + "</button>" +
"</form>\n<form method=\"GET\" action=\"http://" + LOCAL_SERVER + "/add\">" +
"<input type=\"hidden\" name=\"host\" value=\"" + destination + "\">\n" +
"<input type=\"hidden\" name=\"dest\" value=\"" + ahelperKey + "\">\n" +
"<input type=\"hidden\" name=\"nonce\" value=\"" + _proxyNonce + "\">\n" +
"<button type=\"submit\" name=\"router\" value=\"router\">" + _("Save {0} to router address book and continue to eepsite", destination) + "</button><br>\n").getBytes("UTF-8"));
"<button type=\"submit\" class=\"accept\" name=\"router\" value=\"router\">" + _("Save {0} to router address book and continue to eepsite", destination) + "</button><br>\n").getBytes("UTF-8"));
if (_context.namingService().getName().equals("BlockfileNamingService")) {
// only blockfile supports multiple books
out.write(("<button type=\"submit\" name=\"master\" value=\"master\">" + _("Save {0} to master address book and continue to eepsite", destination) + "</button><br>\n").getBytes("UTF-8"));
out.write(("<br><button type=\"submit\" name=\"master\" value=\"master\">" + _("Save {0} to master address book and continue to eepsite", destination) + "</button><br>\n").getBytes("UTF-8"));
out.write(("<button type=\"submit\" name=\"private\" value=\"private\">" + _("Save {0} to private address book and continue to eepsite", destination) + "</button>\n").getBytes("UTF-8"));
}
out.write(("<input type=\"hidden\" name=\"url\" value=\"" + targetRequest + "\">\n" +

21
apps/routerconsole/java/src/net/i2p/router/web/ConfigNavHelper.java
View File

@ -3,6 +3,7 @@ package net.i2p.router.web;
import java.io.IOException;
/**
* Render the configuration menu at the top of all the config pages.
* refactored from confignav.jsp to reduce size and make translation easier
* @author zzz
*/
@ -19,20 +20,36 @@ public class ConfigNavHelper extends HelperBase {
_x("Clients"), _x("Peers"), _x("Keyring"), _x("Logging"), _x("Stats"),
_x("Reseeding"), _x("Advanced") };
public void renderNavBar(String requestURI) throws IOException {
/**
* @param graphical false for text-mode browsers
*/
public void renderNavBar(String requestURI, boolean graphical) throws IOException {
StringBuilder buf = new StringBuilder(1024);
// TODO fix up the non-light themes
String theme = _context.getProperty(CSSHelper.PROP_THEME_NAME);
boolean span = graphical && (theme == null || theme.equals(CSSHelper.DEFAULT_THEME));
if (!span)
buf.append("<center>");
for (int i = 0; i < pages.length; i++) {
String page = "config" + pages[i];
if (requestURI.endsWith(page) || requestURI.endsWith(page + ".jsp")) {
// we are there
if (span)
buf.append("<span class=\"tab2\">");
buf.append(_(titles[i]));
} else {
// we are not there, make a link
if (span)
buf.append("<span class=\"tab\">");
buf.append("<a href=\"").append(page).append("\">").append(_(titles[i])).append("</a>");
}
if (i != pages.length - 1)
if (span)
buf.append(" </span>\n");
else if (i != pages.length - 1)
buf.append(" |\n");
}
if (!span)
buf.append("</center>");
_out.write(buf.toString());
}
}

40
apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java
View File

@ -61,31 +61,25 @@ public class SummaryBarRenderer {
.append(_("I2P Services"))
.append("</a></h3>\n" +
"<hr><table>" +
"<hr class=\"b\"><table><tr><td>" +
"<tr><td><a href=\"/susidns/index\" target=\"_blank\" title=\"")
.append(_("Manage your I2P hosts file here (I2P domain name resolution)"))
"<a href=\"/susimail/susimail\" target=\"blank\" title=\"")
.append(_("Anonymous webmail client"))
.append("\">")
.append(_("Addressbook"))
.append(_("Email"))
.append("</a>\n" +
"<a href=\"/i2psnark/\" target=\"_blank\" title=\"")
.append(_("Built-in anonymous BitTorrent Client"))
.append("\">")
.append(_("Torrents"))
.append("</a>\n" +
"<a href=\"/susimail/susimail\" target=\"blank\" title=\"")
.append(_("Anonymous webmail client"))
.append("\">")
.append(_("Webmail"))
.append("</a>\n" +
"<a href=\"http://127.0.0.1:7658/\" target=\"_blank\" title=\"")
.append(_("Anonymous resident webserver"))
.append(_("Local web server"))
.append("\">")
.append(_("Webserver"))
.append("</a>")
.append(_("Website"))
.append("</a>\n")
.append(NavHelper.getClientAppLinks(_context))
@ -95,7 +89,7 @@ public class SummaryBarRenderer {
.append(_("Configure I2P Router"))
.append("\">")
.append(_("I2P Internals"))
.append("</a></h3><hr>\n" +
.append("</a></h3><hr class=\"b\">\n" +
"<table><tr><td>\n" +
@ -153,6 +147,12 @@ public class SummaryBarRenderer {
.append(_("Local Destinations"))
.append("\">")
.append(_("I2PTunnel"))
.append("</a>\n" +
"<a href=\"/susidns/index\" target=\"_blank\" title=\"")
.append(_("Manage your I2P hosts file here (I2P domain name resolution)"))
.append("\">")
.append(_("Addressbook"))
.append("</a>\n");
File javadoc = new File(_context.getBaseDir(), "docs/javadoc/index.html");
@ -170,7 +170,7 @@ public class SummaryBarRenderer {
.append(_("I2P Router Help"))
.append("\">")
.append(_("General"))
.append("</a></h3><hr>\n" +
.append("</a></h3><hr class=\"b\">\n" +
"<table><tr>" +
"<td align=\"left\"><b>")
@ -262,7 +262,7 @@ public class SummaryBarRenderer {
.append(_("Show all current peer connections"))
.append("\">")
.append(_("Peers"))
.append("</a></h3><hr>\n" +
.append("</a></h3><hr class=\"b\">\n" +
"<table>\n" +
@ -311,7 +311,7 @@ public class SummaryBarRenderer {
buf.append("<h4><a href=\"/confignet\" target=\"_top\" title=\"")
.append(_("Help with firewall configuration"))
.append("\">")
.append(_("Check NAT/firewall"))
.append(_("Check network connection and NAT/firewall"))
.append("</a></h4>");
anotherLine = true;
}
@ -351,7 +351,7 @@ public class SummaryBarRenderer {
.append(_("Configure router bandwidth allocation"))
.append("\" target=\"_top\">")
.append(_("Bandwidth in/out"))
.append("</a></h3><hr>" +
.append("</a></h3><hr class=\"b\">" +
"<table>\n" +
"<tr><td align=\"left\"><b>")
@ -388,7 +388,7 @@ public class SummaryBarRenderer {
.append(_("View existing tunnels and tunnel build status"))
.append("\">")
.append(_("Tunnels"))
.append("</a></h3><hr>" +
.append("</a></h3><hr class=\"b\">" +
"<table>\n" +
"<tr><td align=\"left\"><b>")
@ -419,7 +419,7 @@ public class SummaryBarRenderer {
.append(_("What's in the router's job queue?"))
.append("\">")
.append(_("Congestion"))
.append("</a></h3><hr>" +
.append("</a></h3><hr class=\"b\">" +
"<table>\n" +
"<tr><td align=\"left\"><b>")

2
apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
View File

@ -367,7 +367,7 @@ public class SummaryHelper extends HelperBase {
List<Destination> clients = new ArrayList(_context.clientManager().listClients());
StringBuilder buf = new StringBuilder(512);
buf.append("<h3><a href=\"/i2ptunnel/\" target=\"_blank\" title=\"").append(_("Add/remove/edit &amp; control your client and server tunnels")).append("\">").append(_("Local Destinations")).append("</a></h3><hr><div class=\"tunnels\">");
buf.append("<h3><a href=\"/i2ptunnel/\" target=\"_blank\" title=\"").append(_("Add/remove/edit &amp; control your client and server tunnels")).append("\">").append(_("Local Destinations")).append("</a></h3><hr class=\"b\"><div class=\"tunnels\">");
if (!clients.isEmpty()) {
Collections.sort(clients, new AlphaComparator());
buf.append("<table>");

2
apps/routerconsole/jsp/configlogging.jsp
View File

@ -26,7 +26,7 @@
<h3><%=intl._("Configure I2P Logging Options")%></h3>
<div class="wideload">
<table border="0" cellspacing="5">
<tr><td class="mediumtags" align="right"><b><%=intl._("Logging filename")%>:</b></td>
<tr><td class="mediumtags" align="right"><b><%=intl._("Log file")%>:</b></td>
<td><input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" >
<br> <i><%=intl._("(the symbol '@' will be replaced during log rotation)")%></i></td>
</tr><tr><td class="mediumtags" align="right"><b><%=intl._("Log record format")%>:</b></td>

6
apps/routerconsole/jsp/confignav.jsi
View File

@ -7,9 +7,9 @@
<jsp:setProperty name="navHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" />
<% navHelper.storeWriter(out); %>
<div class="confignav" id="confignav">
<center>
<%
// moved to java for ease of translation and to avoid 10 copies
navHelper.renderNavBar(request.getRequestURI());
// allowIFrame variable from summary.jsi
navHelper.renderNavBar(request.getRequestURI(), allowIFrame);
%>
</center></div>
</div>

12
apps/routerconsole/jsp/summary.jsi
View File

@ -38,16 +38,16 @@
} else if (allowIFrame) {
// since we don't have an iframe this will reload the base page, and
// the new delay will be passed to the iframe above
out.print("<div class=\"refresh\"><form action=\"" + request.getRequestURI() + "\" method=\"POST\">\n");
out.print("<b>");
out.print("<div class=\"refresh\"><form action=\"" + request.getRequestURI() + "\" method=\"POST\">\n" +
"<b>");
// We have intl defined when this is included, but not when compiled standalone.
out.print(intl._("Refresh (s)"));
out.print(":</b> <input size=\"3\" type=\"text\" name=\"refresh\" value=\"60\" >\n");
out.print("<button type=\"submit\" value=\"Enable\" >");
out.print(":</b> <input size=\"3\" type=\"text\" name=\"refresh\" value=\"60\" >\n" +
"<button type=\"submit\" value=\"Enable\" >");
// ditto
out.print(intl._("Enable"));
out.print("</button>\n");
out.print("</form></div></div>\n");
out.print("</button>\n" +
"</form></div></div>\n");
} else {
out.print("</div>\n");
}

6
apps/routerconsole/locale/messages_ar.po
View File

@ -3279,7 +3279,7 @@ msgid "Anonymous webmail client"
msgstr "بريد الكتروني مجهول"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgid "Email"
msgstr "بريد الكتروني"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
@ -3419,7 +3419,7 @@ msgid "Help with firewall configuration"
msgstr "مساعدة خول اعدادات الجدار الناري"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:310
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr "تأكد من NAT/جدار ناري"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:330
@ -4794,7 +4794,7 @@ msgid "Configure I2P Logging Options"
msgstr "اعدادت السجلات I2P"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:303
msgid "Logging filename"
msgid "Log file"
msgstr "ملف السجل"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:307

8
apps/routerconsole/locale/messages_da.po
View File

@ -3559,8 +3559,8 @@ msgid "Anonymous webmail client"
msgstr "Anonym webmail klient"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgstr "Webmail"
msgid "Email"
msgstr "Email"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
msgid "Anonymous resident webserver"
@ -3708,7 +3708,7 @@ msgid "Help with firewall configuration"
msgstr "Hjælp med konfiguration af firewall"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr "Tjek NAT/firewall"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5319,7 +5319,7 @@ msgid "Configure I2P Logging Options"
msgstr "Konfigurer I2P logging indstillinger"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
msgid "Logging filename"
msgid "Log file"
msgstr "Logging filnavn"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:325

10
apps/routerconsole/locale/messages_de.po
View File

@ -3612,11 +3612,11 @@ msgstr "BitTorrent"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:75
msgid "Anonymous webmail client"
msgstr "Webmail-Klient für anonyme E-Mail"
msgstr "Email-Klient für anonyme E-Mail"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgstr "Webmail"
msgid "Email"
msgstr "Email"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
msgid "Anonymous resident webserver"
@ -3764,7 +3764,7 @@ msgid "Help with firewall configuration"
msgstr "Hilfe bei der Firewalleinstellung"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr "Überprüfe NAT/Firewall!"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5394,7 +5394,7 @@ msgid "Configure I2P Logging Options"
msgstr "Richte I2P-Berichte ein"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:328
msgid "Logging filename"
msgid "Log file"
msgstr "Dateiname für Berichte"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:332

6
apps/routerconsole/locale/messages_en.po
View File

@ -3570,7 +3570,7 @@ msgid "Anonymous webmail client"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgid "Email"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
@ -3717,7 +3717,7 @@ msgid "Help with firewall configuration"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5201,7 +5201,7 @@ msgid "Configure I2P Logging Options"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:328
msgid "Logging filename"
msgid "Log file"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:332

8
apps/routerconsole/locale/messages_es.po
View File

@ -3613,8 +3613,8 @@ msgid "Anonymous webmail client"
msgstr "Cliente webmail anónimo"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgstr "Webmail"
msgid "Email"
msgstr "Email"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
msgid "Anonymous resident webserver"
@ -3762,7 +3762,7 @@ msgid "Help with firewall configuration"
msgstr "Ayuda con la configuración del cortafuegos"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr "Comprobar NAT/cortafuegos"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5374,7 +5374,7 @@ msgid "Configure I2P Logging Options"
msgstr "Configurar las opciones de registro I2P"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:328
msgid "Logging filename"
msgid "Log file"
msgstr "Nombre de archivo del registro"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:332

6
apps/routerconsole/locale/messages_fi.po
View File

@ -3585,7 +3585,7 @@ msgid "Anonymous webmail client"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgid "Email"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
@ -3732,7 +3732,7 @@ msgid "Help with firewall configuration"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5255,7 +5255,7 @@ msgid "Configure I2P Logging Options"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:328
msgid "Logging filename"
msgid "Log file"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:332

6
apps/routerconsole/locale/messages_fr.po
View File

@ -3546,7 +3546,7 @@ msgid "Anonymous webmail client"
msgstr "Client webmail anonyme"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgid "Email"
msgstr "Messagerie web"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
@ -3695,7 +3695,7 @@ msgid "Help with firewall configuration"
msgstr "Aide à la configuration du pare-feu"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr "Vérifier NAT/pare-feu"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5310,7 +5310,7 @@ msgid "Configure I2P Logging Options"
msgstr "Configuration des options d'historiques"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:328
msgid "Logging filename"
msgid "Log file"
msgstr "Nom du fichier des historiques"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:332

6
apps/routerconsole/locale/messages_it.po
View File

@ -3638,7 +3638,7 @@ msgid "Anonymous webmail client"
msgstr "Client di posta elettronica anonimo"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgid "Email"
msgstr "Posta elettronica"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
@ -3787,7 +3787,7 @@ msgid "Help with firewall configuration"
msgstr "Aiuto con la configurazione del firewall"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr "Controlla NAT/firewall"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5394,7 +5394,7 @@ msgid "Configure I2P Logging Options"
msgstr "Configura le Opzioni di Logging I2P"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:328
msgid "Logging filename"
msgid "Log file"
msgstr "Nome del file di logging"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:332

8
apps/routerconsole/locale/messages_nl.po
View File

@ -3338,8 +3338,8 @@ msgid "Anonymous webmail client"
msgstr "Anonieme webmail client"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgstr "Webmail"
msgid "Email"
msgstr "Email"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
msgid "Anonymous resident webserver"
@ -3487,7 +3487,7 @@ msgid "Help with firewall configuration"
msgstr "Hulp met firewall configuratie"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:305
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr "Controlleer NAT/firewall"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:325
@ -5101,7 +5101,7 @@ msgid "Configure I2P Logging Options"
msgstr "Configureer I2P Logging Opties"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
msgid "Logging filename"
msgid "Log file"
msgstr "Logging bestandsnaam"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:325

6
apps/routerconsole/locale/messages_pl.po
View File

@ -3532,7 +3532,7 @@ msgid "Anonymous webmail client"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgid "Email"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
@ -3680,7 +3680,7 @@ msgid "Help with firewall configuration"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5172,7 +5172,7 @@ msgid "Configure I2P Logging Options"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
msgid "Logging filename"
msgid "Log file"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:325

6
apps/routerconsole/locale/messages_ru.po
View File

@ -3567,7 +3567,7 @@ msgid "Anonymous webmail client"
msgstr "Анонимный почтовый клиент с веб-интерфейсом"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgid "Email"
msgstr "Веб-почта"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
@ -3714,7 +3714,7 @@ msgid "Help with firewall configuration"
msgstr "Помощь в настройке брандмауэра"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr "Проверьте настройки NAT/брандмауэров."
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5131,7 +5131,7 @@ msgid "Configure I2P Logging Options"
msgstr "Настройка опций логирования I2P"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:328
msgid "Logging filename"
msgid "Log file"
msgstr "Лог-файл"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:332

6
apps/routerconsole/locale/messages_sv.po
View File

@ -3577,7 +3577,7 @@ msgid "Anonymous webmail client"
msgstr "Anonym webbmailklient"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgid "Email"
msgstr "Webbmail"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
@ -3726,7 +3726,7 @@ msgid "Help with firewall configuration"
msgstr "Hjälp med brandväggskonfigurationen"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr "Kontrollera NAT/brandvägg"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5312,7 +5312,7 @@ msgid "Configure I2P Logging Options"
msgstr "Konfigurera I2P Loggningsval"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:328
msgid "Logging filename"
msgid "Log file"
msgstr "Loggningsfilnamn"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:332

6
apps/routerconsole/locale/messages_uk.po
View File

@ -3601,7 +3601,7 @@ msgid "Anonymous webmail client"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgid "Email"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
@ -3748,7 +3748,7 @@ msgid "Help with firewall configuration"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5232,7 +5232,7 @@ msgid "Configure I2P Logging Options"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:328
msgid "Logging filename"
msgid "Log file"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:332

6
apps/routerconsole/locale/messages_vi.po
View File

@ -3485,7 +3485,7 @@ msgid "Anonymous webmail client"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgid "Email"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
@ -3633,7 +3633,7 @@ msgid "Help with firewall configuration"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr ""
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5125,7 +5125,7 @@ msgid "Configure I2P Logging Options"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
msgid "Logging filename"
msgid "Log file"
msgstr ""
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:325

6
apps/routerconsole/locale/messages_zh.po
View File

@ -3490,7 +3490,7 @@ msgid "Anonymous webmail client"
msgstr "匿名Web邮件客户端"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:77
msgid "Webmail"
msgid "Email"
msgstr "匿名邮箱"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:81
@ -3638,7 +3638,7 @@ msgid "Help with firewall configuration"
msgstr "如何配置防火墙"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:307
msgid "Check NAT/firewall"
msgid "Check network connection and NAT/firewall"
msgstr "检查NAT/防火墙"
#: ../java/src/net/i2p/router/web/SummaryBarRenderer.java:327
@ -5137,7 +5137,7 @@ msgid "Configure I2P Logging Options"
msgstr "设置 I2P 记录选项"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:321
msgid "Logging filename"
msgid "Log file"
msgstr "日志文件名称"
#: ../jsp/WEB-INF/classes/net/i2p/router/web/jsp/configlogging_jsp.java:325

9
history.txt
View File

@ -1,3 +1,12 @@
2011-12-02 zzz
* Console:
- Summary bar tweaks
- Config nav CSS tabs
- CSS cleanups from last checkin
* Susimail:
- Login screen tweaks
- Cleanups, generics, static
2011-12-01 zzz
* Console:
- Split up config network page

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 349 B

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

@ -120,6 +120,12 @@ div.routersummary hr {
box-shadow: inset 0px 1px 1px 1px #fff;
}
div.routersummary hr.b {
color: #f0f0f0;
background: #f0f0f0;
border-bottom: 1px solid #f0f0f0;
}
div routersummary hr:last-child {
}
@ -161,8 +167,8 @@ div.routersummary h4 {
letter-spacing: 0.02em;
margin: -6px -6px -7px !important;
padding: 6px 3px 6px 27px;
background: #e0e0f5 url('../images/itoopie_xsm.png') no-repeat left center;
min-height: 26px;
background: #e0e0f5 url('../images/itoopie_xsm.png') no-repeat 1px center;
min-height: 16px;
text-decoration: none !important;
color: #359;
line-height: 105%;
@ -174,7 +180,7 @@ div.routersummary h4 {
div.routersummary table {
border: 0;
text-align: center !important;
margin: -7px -5px -6px -5px;
margin: -6px -5px -4px -5px;
width: 190px !important;
overflow: hidden;
font-size: 8pt;
@ -426,23 +432,44 @@ div.news h4 {
}
div.confignav {
padding: 15px 10px !important;
margin: 15px 0 15px 0;
background: url('images/header.png') center center repeat-x;
-moz-border-radius: 4px;
-khtml-border-radius: 4px;
border-radius: 4px;
border: 1px solid #115;
padding: 16px 10px !important;
margin: 10px 0 0 0;
font-size: 9.5pt !important;
font-weight: bold !important;
line-height: 160% !important;
-moz-box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
-khtml-box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
box-shadow: 0 2px 1px 1px rgba(176, 176, 216, 0.4);
opacity: 1;
min-width: 400px;
}
span.tab {
padding: 2px 18px 4px 6px;
margin: -5px -3px 0 0;
background: #d8d8ff;
-moz-border-radius: 6px 32px 2px 0;
-khtml-border-radius: 6px 32px 2px 0;
border-radius: 6px 32px 2px 0;
border: 1px solid #111;
border-left: 2px solid #115;
min-width: 40px;
display: inline-block;
word-wrap: break-word;
vertical-align: bottom;
}
span.tab2 {
padding: 6px 18px 6px 6px;
margin: -11px -3px 0 0;
background: #e8e8ff;
-moz-border-radius: 6px 32px 2px 0;
-khtml-border-radius: 6px 32px 2px 0;
border-radius: 6px 32px 2px 0;
border: 2px solid #111;
min-width: 40px;
display: inline-block;
word-wrap: break-word;
vertical-align: bottom;
}
div.configure {
min-width: 400px;
margin-bottom: 0px;
@ -714,7 +741,6 @@ h2 {
letter-spacing: 0.07em;
background: url('images/header.png') center center repeat-x;
padding: 10px;
wordwrap: none;
border: 1px solid #115;
border-radius: 4px;
-moz-border-radius: 4px;
@ -798,50 +824,56 @@ button, button:visited {
}
button.accept {
background: #ffe url('../images/accept.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/accept.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
button.add {
background: #ffe url('../images/add.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/add.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
button.cancel {
background: #ffe url('../images/cancel.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/cancel.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
button.check {
background: #ffe url('../images/tick.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/tick.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
button.delete {
background: #ffe url('../images/delete.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/delete.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
button.download {
background: #ffe url('../images/arrow_down.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/arrow_down.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
button.go {
background: #ffe url('../images/arrow_right.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
button.reload {
background: #ffe url('../images/arrow_refresh.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/arrow_refresh.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
button.stop {
background: #ffe url('../images/stop.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/stop.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
@ -906,50 +938,56 @@ input, input:visited {
}
input.accept {
background: #ffe url('../images/accept.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/accept.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
input.add {
background: #ffe url('../images/add.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/add.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
input.cancel {
background: #ffe url('../images/cancel.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/cancel.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
input.check {
background: #ffe url('../images/tick.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/tick.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
input.delete {
background: #ffe url('../images/delete.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/delete.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
input.download {
background: #ffe url('../images/arrow_down.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/arrow_down.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
input.go {
background: #ffe url('../images/arrow_right.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
input.reload {
background: #ffe url('../images/arrow_refresh.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/arrow_refresh.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}
input.stop {
background: #ffe url('../images/stop.png') no-repeat left center;
padding: 1px 3px 1px 18px;
background: #ffe url('../images/stop.png') no-repeat 2px center;
padding: 1px 3px 1px 20px;
min-height: 22px;
}

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 = 13;
public final static long BUILD = 14;
/** for example "-test" */
public final static String EXTRA = "";