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 9a6567e6f2a1dadbbfd784c7cd363948f8d931fc..189821cc2c3db922d6b34090495b870a9d438345 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
@@ -47,6 +47,7 @@ public class HomeHelper extends HelperBase {
_x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "book.png" + S +
_x("Pastebin") + S + _x("I2P Pastebin") + S + "http://pastethis.i2p/" + S + I + "itoopie_sm.png" + S +
"Planet I2P" + S + _x("I2P News") + S + "http://planet.i2p/" + S + I + "itoopie_sm.png" + S +
+ //_x("Plugins") + S + _x("Add-on directory") + S + "http://*TBD*.i2p/" + S + I + "plugin.png" + S +
_x("Postman's Tracker") + S + _x("Bittorrent tracker") + S + "http://tracker2.postman.i2p/" + S + I + "itoopie_sm.png" + S +
_x("Project Website") + S + _x("I2P home page") + S + "http://www.i2p2.i2p/" + S + I + "help.png" + S +
"stats.i2p" + S + _x("I2P Netowrk Statistics") + S + "http://stats.i2p/cgi-bin/dashboard.cgi" + S + I + "itoopie_sm.png" + S +
diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp
index 65cfef40e4a58f8170bd3e4e70f32a3d59af708f..be6073b66bf6963b96035ad6173f3882fa83dab5 100644
--- a/apps/routerconsole/jsp/home.jsp
+++ b/apps/routerconsole/jsp/home.jsp
@@ -1,59 +1,15 @@
<%@page contentType="text/html"%>
<%@page pageEncoding="UTF-8"%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-
<html><head>
<%@include file="css.jsi" %>
<%=intl.title("home")%>
-
+<script src="/js/ajax.js" type="text/javascript"></script>
<script type="text/javascript">
-var page = "home";
-function ajax(url,target) {
- // native XMLHttpRequest object
- if (window.XMLHttpRequest) {
- req = new XMLHttpRequest();
- req.onreadystatechange = function() {ajaxDone(target);};
- req.open("GET", url, true);
- req.send(null);
- // IE/Windows ActiveX version
- } else if (window.ActiveXObject) {
- req = new ActiveXObject("Microsoft.XMLDOM");
- if (req) {
- req.onreadystatechange = function() {ajaxDone(target);};
- req.open("GET", url, true);
- req.send(null);
- }
- }
- //setTimeout("ajax(page,'scriptoutput')", 5000);
-}
-
-function ajaxDone(target) {
- // only if req is "loaded"
- if (req.readyState == 4) {
- // only if "OK"
- if (req.status == 200) {
- results = req.responseText;
- document.getElementById(target).innerHTML = results;
- document.getElementById("langbox").style.display="block";
- document.getElementById("home").style.display="block";
- } else {
- document.getElementById(target).innerHTML="<b><%=intl._("Router is down")%></b>";
- document.getElementById("home").style.display="none";
- document.getElementById("langbox").style.display="none";
- }
- }
-}
-
-function requestAjax1() { ajax("/xhr1.jsp", "xhr"); }
-function initAjax() { setInterval(requestAjax1, 15000); }
-
+ function requestAjax1() { ajax("/xhr1.jsp", "xhr", 15000); }
+ function initAjax() { setInterval(requestAjax1, 15000); }
</script>
-
-
-
</head><body onload="initAjax()">
-
-
<%
String consoleNonce = System.getProperty("router.consoleNonce");
if (consoleNonce == null) {
@@ -61,7 +17,6 @@ function initAjax() { setInterval(requestAjax1, 15000); }
System.setProperty("router.consoleNonce", consoleNonce);
}
%>
-
<div class="routersummaryouter" id="appsummary">
<div class="routersummary">
<div style="height: 36px;">
@@ -81,12 +36,13 @@ function initAjax() { setInterval(requestAjax1, 15000); }
<a href="/home?lang=en&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=us" title="English" alt="English"></a>
<a href="/home?lang=ar&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_ar" title="عربية" alt="عربية"></a>
<a href="/home?lang=zh&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cn" title="ä¸æ–‡" alt="ä¸æ–‡"></a>
+ <a href="/home?lang=cs&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cz" title="Czech" alt="Czech"></a>
<a href="/home?lang=da&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=dk" title="Danish" alt="Danish"></a>
<a href="/home?lang=de&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a>
<a href="/home?lang=ee&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ee" title="Eesti" alt="Eesti"></a>
<a href="/home?lang=es&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=es" title="Español" alt="Español"></a>
- <a href="/home?lang=fi&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fi" title="Suomi" alt="Suomi"></a>
- <a href="/home?lang=fr&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fr" title="Français" alt="Français"></a><br>
+ <a href="/home?lang=fi&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fi" title="Suomi" alt="Suomi"></a><br>
+ <a href="/home?lang=fr&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=fr" title="Français" alt="Français"></a>
<a href="/home?lang=it&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=it" title="Italiano" alt="Italiano"></a>
<a href="/home?lang=nl&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a>
<a href="/home?lang=pl&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=pl" title="Polski" alt="Polski"></a>
@@ -122,7 +78,7 @@ function initAjax() { setInterval(requestAjax1, 15000); }
<div class="home" id="home">
<div class="search">
<form action="/search.jsp" method="POST">
- <table><tr><td align="right">
+ <table class="search"><tr><td align="right">
<input size="50" type="text" class="search" name="query" />
</td><td align="left">
<button type="submit" value="search" class="search"><%=intl._("Search I2P")%></button>
diff --git a/apps/routerconsole/jsp/js/ajax.js b/apps/routerconsole/jsp/js/ajax.js
index dab3164a098fd00dfcc3653fa9e4af40a5001dc8..8219dc4242ea96aff8cc6b5a40f373e0b6548c0d 100644
--- a/apps/routerconsole/jsp/js/ajax.js
+++ b/apps/routerconsole/jsp/js/ajax.js
@@ -23,10 +23,11 @@ function ajaxDone(url, target, refresh) {
if (req.status == 200) {
results = req.responseText;
document.getElementById(target).innerHTML = results;
- document.getElementById("lowersection").style.display="block";
+ //document.getElementsbyClassName("hideifdown").style.display="block";
} else {
+ // TODO take from a translated variable
document.getElementById(target).innerHTML="<b>Router is down</b>";
- document.getElementById("lowersection").style.display="none";
+ //document.getElementByClassName("hideifdown").style.display="none";
}
setTimeout(function() {ajax(url, target, refresh);}, refresh);
}
diff --git a/installer/resources/themes/console/images/book.png b/installer/resources/themes/console/images/book.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0f4dd7928cc5714e002fd2a6e8f2faac0073f00
Binary files /dev/null and b/installer/resources/themes/console/images/book.png differ
diff --git a/installer/resources/themes/console/images/book_addresses.png b/installer/resources/themes/console/images/book_addresses.png
new file mode 100644
index 0000000000000000000000000000000000000000..b73419ba82098bbdca1989d31fa798756c987524
Binary files /dev/null and b/installer/resources/themes/console/images/book_addresses.png differ
diff --git a/installer/resources/themes/console/images/bug.png b/installer/resources/themes/console/images/bug.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d5fb90ec6ee08f53947e0266a87b03f75893446
Binary files /dev/null and b/installer/resources/themes/console/images/bug.png differ
diff --git a/installer/resources/themes/console/images/film.png b/installer/resources/themes/console/images/film.png
new file mode 100644
index 0000000000000000000000000000000000000000..b0ce7bb198a3b268bd634d2b26e9b710f3797d37
Binary files /dev/null and b/installer/resources/themes/console/images/film.png differ
diff --git a/installer/resources/themes/console/images/help.png b/installer/resources/themes/console/images/help.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c870176d4dea68aab9e51166cc3d7a582f326d6
Binary files /dev/null and b/installer/resources/themes/console/images/help.png differ
diff --git a/installer/resources/themes/console/images/plugin.png b/installer/resources/themes/console/images/plugin.png
new file mode 100644
index 0000000000000000000000000000000000000000..6187b15aec001b7080b51a5f944f07591f26cc15
Binary files /dev/null and b/installer/resources/themes/console/images/plugin.png differ
diff --git a/installer/resources/themes/console/images/wrench_orange.png b/installer/resources/themes/console/images/wrench_orange.png
new file mode 100644
index 0000000000000000000000000000000000000000..565a9330e0a156dff5bed2c9fad8c95a44344ba4
Binary files /dev/null and b/installer/resources/themes/console/images/wrench_orange.png differ
diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css
index 6db7c481eaf864b84eea866bf43e3eefc9a134ee..e658539961a4d19a8d768f493872c6261f5ba215 100644
--- a/installer/resources/themes/console/light/console.css
+++ b/installer/resources/themes/console/light/console.css
@@ -630,12 +630,12 @@ div.appgroup {
}
div.search {
- margin: 20px;
+ margin: 20px 20px 20px 240px;
padding: 8px;
width: auto;
}
-div.search table {
+table.search {
background: none;
margin: 20px;
padding: 8px;