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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

44
apps/routerconsole/jsp/summarynoframe.jsi
View File

@@ -1,35 +1,17 @@
<%@page import="net.i2p.router.web.SummaryHelper" %>
<%
/*
* Note:
* This is included almost 30 times, so keep whitespace etc. to a minimum.
* 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.
*/
%>
<jsp:useBean class="net.i2p.router.web.SummaryHelper" id="helper" scope="request" />
<jsp:setProperty name="helper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
<jsp:setProperty name="helper" property="action" value="<%=request.getParameter(\"action\")%>" />
<jsp:setProperty name="helper" property="updateNonce" value="<%=request.getParameter(\"updateNonce\")%>" />
<jsp:setProperty name="helper" property="consoleNonce" value="<%=request.getParameter(\"consoleNonce\")%>" />
<jsp:setProperty name="helper" property="requestURI" value="<%=request.getRequestURI()%>" />
<% helper.storeWriter(out); %>
<%
/*
* The following is required for the reseed button to work, although we probably
* only need the reseedNonce property.
*/
%>
<jsp:useBean class="net.i2p.router.web.ReseedHandler" id="reseed" scope="request" />
<jsp:setProperty name="reseed" property="*" />
<%
/*
* The following is required for the update buttons to work, although we probably
* only need the updateNonce property.
*/
%>
<jsp:useBean class="net.i2p.router.web.UpdateHandler" id="update" scope="request" />
<jsp:setProperty name="update" property="*" />
<jsp:setProperty name="update" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" />
<%
// moved to java for ease of translation and to avoid 30 copies
helper.renderSummaryBar();
%>
<div style="height: 36px;">
<a href="/" target="_top">
<img src="<%=intl.getTheme(request.getHeader("User-Agent"))%>images/i2plogo.png" alt="<%=intl._("I2P Router Console")%>" title="<%=intl._("I2P Router Console")%>">
</a>
</div>
<div id="xhr">
<!-- for non-script -->
<%@include file="xhr1.jsi" %>
</div>