Changeset 1de88909


Ignore:
Timestamp:
Mar 16, 2012 12:08:43 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
7474335
Parents:
f7dc55f
Message:
  • Home page: Tag tooltip; CSS tweaks; news tweak
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java

    rf7dc55f r1de88909  
    160160        for (App app : apps) {
    161161            buf.append("<div class=\"app\">" +
     162                       "<div class=\"appimg\">" +
    162163                       "<a href=\"").append(app.url).append("\">" +
    163164                       "<img class=\"");
     
    167168            else
    168169                buf.append("app");
    169             buf.append("\" alt=\"\" title=\"").append(app.desc).append("\" src=\"").append(app.icon).append("\"></a><br>\n" +
     170            buf.append("\" alt=\"\" title=\"").append(app.desc).append("\" src=\"").append(app.icon).append("\"></a>\n" +
     171                       "</div>" +
    170172                       "<table class=\"app\"><tr class=\"app\"><td class=\"app\">" +
    171173                       "<div class=\"applabel\">" +
  • apps/routerconsole/jsp/home.jsp

    rf7dc55f r1de88909  
    1919    }
    2020%>
     21<jsp:useBean class="net.i2p.router.web.NewsHelper" id="newshelper" scope="request" />
     22<jsp:setProperty name="newshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     23 <jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" />
     24 <jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
     25
    2126<div class="routersummaryouter" id="appsummary">
    2227 <div class="routersummary">
     
    3035<%@include file="xhr1.jsi" %>
    3136  </div>
     37<%
     38   if (!newshelper.shouldShowNews()) {
     39%>
     40<hr>
     41<jsp:getProperty name="updatehelper" property="newsStatus" />
     42<%
     43   }  // !shouldShowNews()
     44%>
    3245 </div>
    3346</div>
     
    3649<jsp:setProperty name="homehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
    3750<% if (homehelper.shouldShowWelcome()) { %>
    38 <div class="welcome" title="Click a flag to select a language. Click 'configure language' below to change it later.">
     51<div class="welcome" title="<%=intl._("Click a flag to select a language. Click 'configure language' below to change it later.")%>">
    3952  <div class="langbox" id="langbox">
    4053    <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>
     
    6174<% }  // shouldShowWelcome %>
    6275
    63 <div class="news" id="news">
    64  <jsp:useBean class="net.i2p.router.web.NewsHelper" id="newshelper" scope="request" />
    65  <jsp:setProperty name="newshelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
    6676<%
    6777   if (newshelper.shouldShowNews()) {
    6878       java.io.File fpath = new java.io.File(net.i2p.I2PAppContext.getGlobalContext().getRouterDir(), "docs/news.xml");
    6979%>
     80<div class="news" id="news">
    7081 <jsp:setProperty name="newshelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
    7182 <jsp:setProperty name="newshelper" property="maxLines" value="300" />
    7283 <jsp:getProperty name="newshelper" property="content" />
    7384 <hr>
     85 <jsp:getProperty name="updatehelper" property="newsStatus" /><br>
     86</div>
    7487<%
    7588   }  // shouldShowNews()
    7689%>
    77  <jsp:useBean class="net.i2p.router.web.ConfigUpdateHelper" id="updatehelper" scope="request" />
    78  <jsp:setProperty name="updatehelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
    79  <jsp:getProperty name="updatehelper" property="newsStatus" /><br>
    80 </div>
    8190
    8291<div class="home" id="home">
     
    99108  </div>
    100109  <div class="ag2">
    101     <h4 class="app"><%=intl._("Local Services")%></h4>
     110    <h4 class="app2"><%=intl._("Local Services")%></h4>
    102111    <jsp:getProperty name="homehelper" property="services" /><br>
    103112  </div>
  • installer/resources/themes/console/light/console.css

    rf7dc55f r1de88909  
    611611
    612612h4.app {
     613     margin: 0 4px 2px 0;
     614     padding: 10px 0 8px 0;
     615}
     616
     617h4.app2 {
    613618     clear: left;
    614619     margin: 0 4px 2px 0;
    615      padding: 10px 0 8px 0;
     620     padding: 16px 0 8px 0;
     621}
     622
     623div.ag2 {
     624     margin: 0 0 0 207px;
    616625}
    617626
     
    624633
    625634div.appgroup {
    626      clear: left;
    627635     margin: 0;
    628636     padding: 16px 8px;
Note: See TracChangeset for help on using the changeset viewer.