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 6ec79bea80aed645d03bece69d9e4511b5012ba8..db2ba21df5f24f71221cac21aab1447b843c665d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryBarRenderer.java @@ -28,14 +28,18 @@ public class SummaryBarRenderer { StringBuilder buf = new StringBuilder(8*1024); String theme = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME); - buf.append("<a href=\"/\" target=\"_top\"><img src=\"") + // TODO - the bar would render more cleanly if we specified the img height and width here, + // but unfortunately the images in the different themes are different sizes. + // They range in height from 37 to 43 px. But there's a -2 bottom margin... + // So put it in a div. + buf.append("<div style=\"height: 36px;\"><a href=\"/\" target=\"_top\"><img src=\"") .append(CSSHelper.BASE_THEME_PATH) .append(theme) .append("/images/i2plogo.png\" alt=\"") .append(_("I2P Router Console")) .append("\" title=\"") .append(_("I2P Router Console")) - .append("\"></a><hr>") + .append("\"></a></div><hr>") .append("<h3><a href=\"/help\" target=\"_top\" title=\"") .append(_("I2P Router Help & FAQ")) diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp index 59cfc7dddc7d79ad06de493172f5c899cb34c365..33db27fa700c178f82e429059a6cb9a1368b0d07 100644 --- a/apps/routerconsole/jsp/index.jsp +++ b/apps/routerconsole/jsp/index.jsp @@ -36,22 +36,22 @@ <jsp:useBean class="net.i2p.router.web.ContentHelper" id="contenthelper" scope="request" /> <div class="welcome"> <div class="langbox"> - <a href="/?lang=en&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=us" title="English" alt="English"></a> - <a href="/?lang=ar&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=lang_ar" title="عربية" alt="عربية"></a> - <a href="/?lang=zh&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=cn" title="ä¸æ–‡" alt="ä¸æ–‡"></a> - <a href="/?lang=da&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=dk" title="Danish" alt="Danish"></a> - <a href="/?lang=de&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=de" title="Deutsch" alt="Deutsch"></a> - <a href="/?lang=es&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=es" title="Español" alt="Español"></a> - <a href="/?lang=fi&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=fi" title="Suomi" alt="Suomi"></a> - <a href="/?lang=fr&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=fr" title="Français" alt="Français"></a><br> - <a href="/?lang=it&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=it" title="Italiano" alt="Italiano"></a> - <a href="/?lang=nl&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=nl" title="Nederlands" alt="Nederlands"></a> - <a href="/?lang=pl&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=pl" title="Polski" alt="Polski"></a> - <a href="/?lang=pt&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=pt" title="Português" alt="Português"></a> - <a href="/?lang=ru&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> - <a href="/?lang=sv&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a> - <a href="/?lang=uk&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=ua" title="Ukrainian" alt="Ukrainian"></a> - <a href="/?lang=vi&consoleNonce=<%=consoleNonce%>"><img style="padding: 0 2px;" src="/flags.jsp?c=vn" title="Tiếng Việt" alt="Tiếng Việt"></a> + <a href="/?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="/?lang=ar&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_ar" title="عربية" alt="عربية"></a> + <a href="/?lang=zh&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=cn" title="ä¸æ–‡" alt="ä¸æ–‡"></a> + <a href="/?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="/?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="/?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="/?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="/?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="/?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="/?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="/?lang=pl&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=pl" title="Polski" alt="Polski"></a> + <a href="/?lang=pt&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=pt" title="Português" alt="Português"></a> + <a href="/?lang=ru&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ru" title="РуÑÑкий" alt="РуÑÑкий"></a> + <a href="/?lang=sv&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=se" title="Svenska" alt="Svenska"></a> + <a href="/?lang=uk&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=ua" title="Ukrainian" alt="Ukrainian"></a> + <a href="/?lang=vi&consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=vn" title="Tiếng Việt" alt="Tiếng Việt"></a> </div> <a name="top"></a> <h2><%=intl._("Welcome to I2P")%></h2> diff --git a/installer/resources/themes/console/light/console.css b/installer/resources/themes/console/light/console.css index 73e57a9e19ca219de1fbfda9c6b17a2dd2870096..2e9b0500b2d73b0e2f57ff432699e53d67e4f1c8 100644 --- a/installer/resources/themes/console/light/console.css +++ b/installer/resources/themes/console/light/console.css @@ -5,10 +5,9 @@ body { margin: 10px 0px -10px 10px; text-align: center; - background: #ffe url('images/snowcamo.png'); color: #000; font: 10pt/130% "Lucida Sans Unicode", "Bitstream Vera Sans", Verdana, Tahoma, Helvetica, sans-serif; - background: #99f url('images/magic.png') center bottom; + background: #9696ff url('images/snowcamo.png'); } .hide { @@ -97,10 +96,10 @@ div.routersummary { color: #000; font-size: 8pt; clear: left;/* fixes a bug in Opera */ - -moz-border-radius: 4px; - -khtml-border-radius: 4px; - border-radius: 4px; - background: #ffe url('images/magic.png') center bottom; + -moz-border-radius: 8px; + -khtml-border-radius: 8px; + border-radius: 8px; + background: #f0f0f0; -moz-box-shadow: inset 0px 0px 1px 1px #bbf; -khtml-box-shadow: inset 0px 0px 1px 1px #bbf; box-shadow: inset 0px 0px 1px 1px #bbf; @@ -162,7 +161,7 @@ div.routersummary h4 { letter-spacing: 0.02em; margin: -6px -6px -7px !important; padding: 3px 3px 5px 3px; - background: #ddf url(images/magic.png); + background: #dbdbf5; text-transform: capitalize; text-decoration: none !important; color: #2b2; @@ -312,7 +311,6 @@ div.sorry hr { div.main { margin: 10px 10px 20px 207px; padding: 0 15px 15px 15px; - background: #ffe; text-align: left; color: #001; width: auto; @@ -324,7 +322,8 @@ div.main { -moz-box-shadow: inset 0px 0px 1px 1px #bbf; -khtml-box-shadow: inset 0px 0px 1px 1px #bbf; box-shadow: inset 0px 0px 1px 1px #bbf; - background: #ffe url('images/magic.png') center bottom;} + background: #f0f0f0; +} div.main hr, hr { color: #113; @@ -358,7 +357,7 @@ div.news { -moz-box-shadow: inset 0px 0px 1px 1px #bbf; -khtml-box-shadow: inset 0px 0px 1px 1px #bbf; box-shadow: inset 0px 0px 1px 1px #bbf; - background: #ffe url('images/magic.png') center bottom; + background: #f0f0f0; min-width: 490px; } @@ -716,11 +715,11 @@ h1 { -khtml-box-shadow: inset 0px 0px 1px 1px #bbf; box-shadow: inset 0px 0px 1px 1px #bbf; white-space: normal; - background: #ffe url('images/magic.png') center center repeat; + background: #f0f0f0; border: 1px solid #447; - border-radius: 4px; - -moz-border-radius: 4px; - -khtml-border-radius: 4px; + border-radius: 8px 8px 4px 4px; + -moz-border-radius: 8px 8px 4px 4px; + -khtml-border-radius: 8px 8px 4px 4px; min-width: 500px; } diff --git a/installer/resources/themes/console/light/images/snowcamo.png b/installer/resources/themes/console/light/images/snowcamo.png index 4c645d52e207b79f5f89b8666f2ff25317894caa..a536c222542846f4df3949f666f745c9c3aad927 100644 Binary files a/installer/resources/themes/console/light/images/snowcamo.png and b/installer/resources/themes/console/light/images/snowcamo.png differ