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

* Home page: Tag tooltip; CSS tweaks; news tweak

Browse Source
This commit is contained in:
zzz
2012-03-16 12:08:43 +00:00
parent f7dc55f087
commit 1de88909e9
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java
View File

@ -159,6 +159,7 @@ public class HomeHelper extends HelperBase {
buf.append("<div class=\"appgroup\">");
for (App app : apps) {
buf.append("<div class=\"app\">" +
"<div class=\"appimg\">" +
"<a href=\"").append(app.url).append("\">" +
"<img class=\"");
// toopie is 54x68, not 16x16, needs special alignment and sizing
@ -166,7 +167,8 @@ public class HomeHelper extends HelperBase {
buf.append("app2p");
else
buf.append("app");
buf.append("\" alt=\"\" title=\"").append(app.desc).append("\" src=\"").append(app.icon).append("\"></a><br>\n" +
buf.append("\" alt=\"\" title=\"").append(app.desc).append("\" src=\"").append(app.icon).append("\"></a>\n" +
"</div>" +
"<table class=\"app\"><tr class=\"app\"><td class=\"app\">" +
"<div class=\"applabel\">" +
"<a href=\"").append(app.url).append("\" title=\"").append(app.desc).append("\">").append(app.name).append("</a>" +

27
apps/routerconsole/jsp/home.jsp
View File

@ -18,6 +18,11 @@
System.setProperty("router.consoleNonce", consoleNonce);
}
%>
<jsp:useBean class="net.i2p.router.web.NewsHelper" id="newshelper" scope="request" />
<jsp:setProperty name="newshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
<jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" />
<jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
<div class="routersummaryouter" id="appsummary">
<div class="routersummary">
<div style="height: 36px;">
@ -29,13 +34,21 @@
<!-- for non-script -->
<%@include file="xhr1.jsi" %>
</div>
<%
if (!newshelper.shouldShowNews()) {
%>
<hr>
<jsp:getProperty name="updatehelper" property="newsStatus" />
<%
} // !shouldShowNews()
%>
</div>
</div>
<jsp:useBean class="net.i2p.router.web.HomeHelper" id="homehelper" scope="request" />
<jsp:setProperty name="homehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
<% if (homehelper.shouldShowWelcome()) { %>
<div class="welcome" title="Click a flag to select a language. Click 'configure language' below to change it later.">
<div class="welcome" title="<%=intl._("Click a flag to select a language. Click 'configure language' below to change it later.")%>">
<div class="langbox" id="langbox">
<a href="/home?lang=en&amp;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&amp;consoleNonce=<%=consoleNonce%>"><img height="11" width="16" style="padding: 0 2px;" src="/flags.jsp?c=lang_ar" title="عربية" alt="عربية"></a>
@ -60,24 +73,20 @@
</div>
<% } // shouldShowWelcome %>
<div class="news" id="news">
<jsp:useBean class="net.i2p.router.web.NewsHelper" id="newshelper" scope="request" />
<jsp:setProperty name="newshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
<%
if (newshelper.shouldShowNews()) {
java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml");
%>
<div class="news" id="news">
<jsp:setProperty name="newshelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
<jsp:setProperty name="newshelper" property="maxLines" value="300" />
<jsp:getProperty name="newshelper" property="content" />
<hr>
<jsp:getProperty name="updatehelper" property="newsStatus" /><br>
</div>
<%
} // shouldShowNews()
%>
<jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" />
<jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
<jsp:getProperty name="updatehelper" property="newsStatus" /><br>
</div>
<div class="home" id="home">
<div class="search">
@ -98,7 +107,7 @@
<jsp:getProperty name="homehelper" property="favorites" /><br>
</div>
<div class="ag2">
<h4 class="app"><%=intl._("Local Services")%></h4>
<h4 class="app2"><%=intl._("Local Services")%></h4>
<jsp:getProperty name="homehelper" property="services" /><br>
</div>
</div>

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

@ -610,11 +610,20 @@ h2.app {
}
h4.app {
clear: left;
margin: 0 4px 2px 0;
padding: 10px 0 8px 0;
}
h4.app2 {
clear: left;
margin: 0 4px 2px 0;
padding: 16px 0 8px 0;
}
div.ag2 {
margin: 0 0 0 207px;
}
div.app {
float: left;
padding: 2px;
@ -623,7 +632,6 @@ div.app {
}
div.appgroup {
clear: left;
margin: 0;
padding: 16px 8px;
width: auto;