Changeset 140ffc5


Ignore:
Timestamp:
Mar 3, 2012 10:55:24 PM (8 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
2b81cee
Parents:
8cd9fb8
Message:
  • /confighome validation fixes
  • AJAX fixes
  • Translate 'router is down' message
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

    r8cd9fb8 r140ffc5  
    231231                out.write("<script src=\"/js/ajax.js\" type=\"text/javascript\"></script>\n" +
    232232                          "<script type=\"text/javascript\">\n"  +
     233                          "var failMessage = \"<b>" + _("Router is down") + "</b>\";\n" +
    233234                          "function requestAjax1() { ajax(\"/i2psnark/.ajax/xhr1.html" + peerString + "\", \"mainsection\", " + (delay*1000) + "); }\n" +
    234235                          "function initAjax(delayMs) { setTimeout(requestAjax1, " + (delay*1000) +");  }\n"  +
  • apps/routerconsole/java/src/net/i2p/router/web/HomeHelper.java

    r8cd9fb8 r140ffc5  
    4444        _x("Forum") + S + _x("Community forum") + S + "http://forum.i2p/" + S + I + "itoopie_sm.png" + S +
    4545        //"ident.i2p" + S + _x("Short message service") + S + "http://ident.i2p/" + S + I + "itoopie_sm.png" + S +
    46         _x("Javadocs") + S + _x("Technical documentation") + S + "http://docs.i2p-projekt.i2p/javadoc/" + S + I + "book.png" + S +
     46        _x("Javadocs") + S + _x("Technical documentation") + S + "http://update.killyourtv.i2p/javadoc/" + S + I + "book.png" + S +
    4747        _x("Key Server") + S + _x("OpenPGP Keyserver") + S + "http://keys.i2p/" + S + I + "book.png" + S +
    4848        _x("Pastebin") + S + _x("I2P Pastebin") + S + "http://pastethis.i2p/" + S + I + "itoopie_sm.png" + S +
     
    187187               .append("\"></td><td align=\"center\">");
    188188            if (app.icon != null) {
    189                 buf.append("<img height=\"16\" src=\"").append(app.icon).append("\">");
     189                buf.append("<img height=\"16\" alt=\"\" src=\"").append(app.icon).append("\">");
    190190            }
    191191            buf.append("</td><td align=\"left\">")
    192192               .append(app.name)
    193193               .append("</td><td align=\"left\"><a href=\"")
    194                .append(app.url)
     194               .append(app.url.replace("&", "&amp;"))
    195195               .append("\">")
    196                .append(app.url)
     196               .append(app.url.replace("&", "&amp;"))
    197197               .append("</a></td></tr>\n");
    198198        }
  • apps/routerconsole/jsp/confighome.jsp

    r8cd9fb8 r140ffc5  
    8282 </div>
    8383</form>
    84 </div></div></body></html>
     84</div></body></html>
  • apps/routerconsole/jsp/home.jsp

    r8cd9fb8 r140ffc5  
    77<script src="/js/ajax.js" type="text/javascript"></script>
    88<script type="text/javascript">
     9  var failMessage = "<b><%=intl._("Router is down")%></b>";
    910  function requestAjax1() { ajax("/xhr1.jsp", "xhr", 15000); }
    10   function initAjax() { setInterval(requestAjax1, 15000);  }
     11  function initAjax() { setTimeout(requestAjax1, 15000);  }
    1112</script>
    1213</head><body onload="initAjax()">
  • apps/routerconsole/jsp/js/ajax.js

    r8cd9fb8 r140ffc5  
    2626      //document.getElementsbyClassName("hideifdown").style.display="block";
    2727    } else {
    28       // TODO take from a translated variable
    29       document.getElementById(target).innerHTML="<b>Router is down</b>";
     28      document.getElementById(target).innerHTML = failMessage;
    3029      //document.getElementByClassName("hideifdown").style.display="none";
    3130    }
  • router/java/src/net/i2p/router/RouterVersion.java

    r8cd9fb8 r140ffc5  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 2;
     21    public final static long BUILD = 3;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.