Rearrange summary bar code to consolidate Ajax and IFrame, and /home and /console

Now, Ajax will be used first, and will fall back to IFrame if JS is disabled,
and a separate page if on a text or mobile browser.
Also, /home and /console (and everywhere) now all have the same summary bar
content, which currently defaults to the original full listing.
This commit is contained in:
str4d
2012-06-05 12:44:17 +00:00
parent 531c6c0f4c
commit 52a3860717
9 changed files with 79 additions and 96 deletions

View File

@@ -6,7 +6,13 @@
<html><head>
<%@include file="css.jsi" %>
<%=intl.title("home")%>
</head><body>
<script src="/js/ajax.js" type="text/javascript"></script>
<script type="text/javascript">
var failMessage = "<hr><b><%=intl._("Router is down")%><\/b>";
function requestAjax1() { ajax("/xhr1.jsp", "xhr", 15000); }
function initAjax() { setTimeout(requestAjax1, 15000); }
</script>
</head><body onload="initAjax()">
<%
String consoleNonce = System.getProperty("router.consoleNonce");
if (consoleNonce == null) {
@@ -15,16 +21,13 @@
}
%>
<%@include file="summary.jsi" %><h1><%=intl._("I2P Router Console")%></h1>
<%@include file="summary.jsi" %>
<h1><%=intl._("I2P Router Console")%></h1>
<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");
%>
<jsp:setProperty name="newshelper" property="page" value="<%=fpath.getAbsolutePath()%>" />
<jsp:setProperty name="newshelper" property="maxLines" value="300" />
<jsp:getProperty name="newshelper" property="content" />
<hr>
<%