From 744930a090c102f67e3b99df40b0e30742b7c885 Mon Sep 17 00:00:00 2001 From: str4d <str4d@mail.i2p> Date: Tue, 17 Jul 2012 00:47:08 +0000 Subject: [PATCH] Consolidated Ajax calls for summary.jsi into a single summaryajax.jsi --- apps/routerconsole/jsp/config.jsp | 6 +----- apps/routerconsole/jsp/configadvanced.jsp | 6 +----- apps/routerconsole/jsp/configclients.jsp | 6 +----- apps/routerconsole/jsp/confighome.jsp | 6 +----- apps/routerconsole/jsp/configkeyring.jsp | 6 +----- apps/routerconsole/jsp/configlogging.jsp | 6 +----- apps/routerconsole/jsp/confignet.jsp | 6 +----- apps/routerconsole/jsp/configpeer.jsp | 6 +----- apps/routerconsole/jsp/configreseed.jsp | 6 +----- apps/routerconsole/jsp/configservice.jsp | 6 +----- apps/routerconsole/jsp/configsidebar.jsp | 6 +----- apps/routerconsole/jsp/configstats.jsp | 6 +----- apps/routerconsole/jsp/configtunnels.jsp | 6 +----- apps/routerconsole/jsp/configui.jsp | 6 +----- apps/routerconsole/jsp/configupdate.jsp | 6 +----- apps/routerconsole/jsp/console.jsp | 6 +----- apps/routerconsole/jsp/debug.jsp | 6 +----- apps/routerconsole/jsp/dns.jsp | 4 +--- apps/routerconsole/jsp/error.jsp | 6 +----- apps/routerconsole/jsp/graph.jsp | 6 +----- apps/routerconsole/jsp/graphs.jsp | 6 +----- apps/routerconsole/jsp/help.jsp | 6 +----- apps/routerconsole/jsp/help_ar.jsp | 6 +----- apps/routerconsole/jsp/help_fr.jsp | 6 +----- apps/routerconsole/jsp/help_nl.jsp | 6 +----- apps/routerconsole/jsp/help_ru.jsp | 6 +----- apps/routerconsole/jsp/home.jsp | 6 +----- apps/routerconsole/jsp/i2ptunnelmgr.jsp | 4 +--- apps/routerconsole/jsp/jars.jsp | 6 +----- apps/routerconsole/jsp/jobs.jsp | 6 +----- apps/routerconsole/jsp/logs.jsp | 6 +----- apps/routerconsole/jsp/netdb.jsp | 6 +----- apps/routerconsole/jsp/nowebapp.jsp | 6 +----- apps/routerconsole/jsp/oldconsole.jsp | 6 +----- apps/routerconsole/jsp/peers.jsp | 6 +----- apps/routerconsole/jsp/profiles.jsp | 6 +----- apps/routerconsole/jsp/stats.jsp | 6 +----- apps/routerconsole/jsp/summaryajax.jsi | 5 +++++ apps/routerconsole/jsp/torrents.jsp | 4 +--- apps/routerconsole/jsp/tunnels.jsp | 6 +----- apps/routerconsole/jsp/viewprofile.jsp | 6 +----- apps/routerconsole/jsp/webmail.jsp | 4 +--- 42 files changed, 46 insertions(+), 197 deletions(-) create mode 100644 apps/routerconsole/jsp/summaryajax.jsi diff --git a/apps/routerconsole/jsp/config.jsp b/apps/routerconsole/jsp/config.jsp index 7307dc355c..0d56b5f59d 100644 --- a/apps/routerconsole/jsp/config.jsp +++ b/apps/routerconsole/jsp/config.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("configure bandwidth")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index d684ddccc2..53a8b227f5 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("config advanced")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/configclients.jsp b/apps/routerconsole/jsp/configclients.jsp index 397773e4ba..e97b22968d 100644 --- a/apps/routerconsole/jsp/configclients.jsp +++ b/apps/routerconsole/jsp/configclients.jsp @@ -12,11 +12,7 @@ button span.hide{ input.default { width: 1px; height: 1px; visibility: hidden; } </style> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/confighome.jsp b/apps/routerconsole/jsp/confighome.jsp index 7a4379f475..b8296fcbbb 100644 --- a/apps/routerconsole/jsp/confighome.jsp +++ b/apps/routerconsole/jsp/confighome.jsp @@ -13,11 +13,7 @@ input.default { } </style> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/configkeyring.jsp b/apps/routerconsole/jsp/configkeyring.jsp index 612e6c5901..e8b4089371 100644 --- a/apps/routerconsole/jsp/configkeyring.jsp +++ b/apps/routerconsole/jsp/configkeyring.jsp @@ -6,11 +6,7 @@ <%@include file="css.jsi" %> <%=intl.title("config keyring")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index 77da61dc8b..c6f3ed945a 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("config logging")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <jsp:useBean class="net.i2p.router.web.ConfigLoggingHelper" id="logginghelper" scope="request" /> <jsp:setProperty name="logginghelper" property="contextId" value="<%=(String)session.getAttribute(\"i2p.contextId\")%>" /> diff --git a/apps/routerconsole/jsp/confignet.jsp b/apps/routerconsole/jsp/confignet.jsp index 134460eb41..7fb74500d9 100644 --- a/apps/routerconsole/jsp/confignet.jsp +++ b/apps/routerconsole/jsp/confignet.jsp @@ -6,11 +6,7 @@ <%@include file="css.jsi" %> <%=intl.title("config networking")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/configpeer.jsp b/apps/routerconsole/jsp/configpeer.jsp index 3e98487b8c..9952db5534 100644 --- a/apps/routerconsole/jsp/configpeer.jsp +++ b/apps/routerconsole/jsp/configpeer.jsp @@ -6,11 +6,7 @@ <%@include file="css.jsi" %> <%=intl.title("config peers")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/configreseed.jsp b/apps/routerconsole/jsp/configreseed.jsp index 88c8f46a13..39df228c69 100644 --- a/apps/routerconsole/jsp/configreseed.jsp +++ b/apps/routerconsole/jsp/configreseed.jsp @@ -6,11 +6,7 @@ <%@include file="css.jsi" %> <%=intl.title("config reseeding")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/configservice.jsp b/apps/routerconsole/jsp/configservice.jsp index 7a5ea2e330..628010685d 100644 --- a/apps/routerconsole/jsp/configservice.jsp +++ b/apps/routerconsole/jsp/configservice.jsp @@ -6,11 +6,7 @@ <%@include file="css.jsi" %> <%=intl.title("config service")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/configsidebar.jsp b/apps/routerconsole/jsp/configsidebar.jsp index 4fe7ef3ec5..7440d503cf 100644 --- a/apps/routerconsole/jsp/configsidebar.jsp +++ b/apps/routerconsole/jsp/configsidebar.jsp @@ -13,11 +13,7 @@ input.default { } </style> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index 9ba18c3d94..8a70c84bc4 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("config stats")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> <script type="text/javascript"> function init() { diff --git a/apps/routerconsole/jsp/configtunnels.jsp b/apps/routerconsole/jsp/configtunnels.jsp index 0c7c9e8226..e2eab6658f 100644 --- a/apps/routerconsole/jsp/configtunnels.jsp +++ b/apps/routerconsole/jsp/configtunnels.jsp @@ -6,11 +6,7 @@ <%@include file="css.jsi" %> <%=intl.title("config tunnels")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/configui.jsp b/apps/routerconsole/jsp/configui.jsp index 886151087c..a2f4397137 100644 --- a/apps/routerconsole/jsp/configui.jsp +++ b/apps/routerconsole/jsp/configui.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("config UI")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/configupdate.jsp b/apps/routerconsole/jsp/configupdate.jsp index 2cad3ec6a7..a792bb07b3 100644 --- a/apps/routerconsole/jsp/configupdate.jsp +++ b/apps/routerconsole/jsp/configupdate.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("config update")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/console.jsp b/apps/routerconsole/jsp/console.jsp index cc0156b13f..aa9168caf7 100644 --- a/apps/routerconsole/jsp/console.jsp +++ b/apps/routerconsole/jsp/console.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("home")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <% String consoleNonce = System.getProperty("router.consoleNonce"); diff --git a/apps/routerconsole/jsp/debug.jsp b/apps/routerconsole/jsp/debug.jsp index 609308fd56..6da4cce616 100644 --- a/apps/routerconsole/jsp/debug.jsp +++ b/apps/routerconsole/jsp/debug.jsp @@ -10,11 +10,7 @@ <html><head><title>I2P Router Console - Debug</title> <%@include file="css.jsi" %> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1>Router SKM</h1> diff --git a/apps/routerconsole/jsp/dns.jsp b/apps/routerconsole/jsp/dns.jsp index 63b1f643e4..51a5a7e800 100644 --- a/apps/routerconsole/jsp/dns.jsp +++ b/apps/routerconsole/jsp/dns.jsp @@ -18,10 +18,8 @@ <%=intl.title("addressbook")%> <script src="/js/ajax.js" type="text/javascript"></script> <script src="/js/iframed.js" type="text/javascript"></script> +<%@include file="summaryajax.jsi" %> <script type="text/javascript"> - var failMessage = "<hr><b><%=intl._("Router is down")%><\/b>"; - function requestAjax1() { ajax("/xhr1.jsp?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } function setupFrame() { f = document.getElementById("susidnsframe"); injectClass(f); diff --git a/apps/routerconsole/jsp/error.jsp b/apps/routerconsole/jsp/error.jsp index 630da0851d..7d5552fd58 100644 --- a/apps/routerconsole/jsp/error.jsp +++ b/apps/routerconsole/jsp/error.jsp @@ -17,11 +17,7 @@ <%@include file="css.jsi" %> <%=intl.title("Page Not Found")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1><%=ERROR_CODE%> <%=ERROR_MESSAGE%></h1> diff --git a/apps/routerconsole/jsp/graph.jsp b/apps/routerconsole/jsp/graph.jsp index 487f91fd67..92c6f508f8 100644 --- a/apps/routerconsole/jsp/graph.jsp +++ b/apps/routerconsole/jsp/graph.jsp @@ -13,11 +13,7 @@ graphHelper.storeWriter(out); %> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1><%=intl._("I2P Performance Graphs")%></h1> diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp index e787200127..77ca232788 100644 --- a/apps/routerconsole/jsp/graphs.jsp +++ b/apps/routerconsole/jsp/graphs.jsp @@ -20,11 +20,7 @@ } %> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1><%=intl._("I2P Performance Graphs")%></h1> diff --git a/apps/routerconsole/jsp/help.jsp b/apps/routerconsole/jsp/help.jsp index 49d138c277..29dbc5ce64 100644 --- a/apps/routerconsole/jsp/help.jsp +++ b/apps/routerconsole/jsp/help.jsp @@ -10,11 +10,7 @@ <html><head><title>I2P Router Console - help</title> <%@include file="css.jsi" %> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1>I2P Router Help & Support</h1> diff --git a/apps/routerconsole/jsp/help_ar.jsp b/apps/routerconsole/jsp/help_ar.jsp index b63f509ca1..99887edb39 100644 --- a/apps/routerconsole/jsp/help_ar.jsp +++ b/apps/routerconsole/jsp/help_ar.jsp @@ -10,11 +10,7 @@ <html><head><title>I2P مساعدة لوØØ© التØكم</title> <%@include file="css.jsi" %> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1>I2P مساعدة لوØØ© التØكم</h1> diff --git a/apps/routerconsole/jsp/help_fr.jsp b/apps/routerconsole/jsp/help_fr.jsp index 56167fe0ee..f8f235eaf8 100644 --- a/apps/routerconsole/jsp/help_fr.jsp +++ b/apps/routerconsole/jsp/help_fr.jsp @@ -10,11 +10,7 @@ <html><head><title>Console du routeur I2P - Aide</title> <%@include file="css.jsi" %> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> Traduction de mars 2011 (magma@mail.i2p) diff --git a/apps/routerconsole/jsp/help_nl.jsp b/apps/routerconsole/jsp/help_nl.jsp index 9db466eb1b..67587bca4e 100644 --- a/apps/routerconsole/jsp/help_nl.jsp +++ b/apps/routerconsole/jsp/help_nl.jsp @@ -10,11 +10,7 @@ <html><head><title>I2P Router Console - help</title> <%@include file="css.jsi" %> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1>I2P Router Help & Support</h1> diff --git a/apps/routerconsole/jsp/help_ru.jsp b/apps/routerconsole/jsp/help_ru.jsp index 7c49a5fb6e..9234c2c5b3 100644 --- a/apps/routerconsole/jsp/help_ru.jsp +++ b/apps/routerconsole/jsp/help_ru.jsp @@ -10,11 +10,7 @@ <html><head><title>КонÑоль маршрутизатора I2P - Ñправка</title> <%@include file="css.jsi" %> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> diff --git a/apps/routerconsole/jsp/home.jsp b/apps/routerconsole/jsp/home.jsp index e0f22453ff..0971ac8684 100644 --- a/apps/routerconsole/jsp/home.jsp +++ b/apps/routerconsole/jsp/home.jsp @@ -5,11 +5,7 @@ <%@include file="css.jsi" %> <%=intl.title("home")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <% String consoleNonce = System.getProperty("router.consoleNonce"); diff --git a/apps/routerconsole/jsp/i2ptunnelmgr.jsp b/apps/routerconsole/jsp/i2ptunnelmgr.jsp index 3e2802c3f7..562fffd74e 100644 --- a/apps/routerconsole/jsp/i2ptunnelmgr.jsp +++ b/apps/routerconsole/jsp/i2ptunnelmgr.jsp @@ -18,10 +18,8 @@ <%=intl.title("i2p tunnel manager")%> <script src="/js/ajax.js" type="text/javascript"></script> <script src="/js/iframed.js" type="text/javascript"></script> +<%@include file="summaryajax.jsi" %> <script type="text/javascript"> - var failMessage = "<hr><b><%=intl._("Router is down")%><\/b>"; - function requestAjax1() { ajax("/xhr1.jsp?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } function injectClassSpecific(f) { var doc = 'contentDocument' in f? f.contentDocument : f.contentWindow.document; if (doc.getElementsByClassName == undefined) { diff --git a/apps/routerconsole/jsp/jars.jsp b/apps/routerconsole/jsp/jars.jsp index 7da2e86900..527f06074b 100644 --- a/apps/routerconsole/jsp/jars.jsp +++ b/apps/routerconsole/jsp/jars.jsp @@ -6,11 +6,7 @@ <%@include file="css.jsi" %> <%=intl.title("Jar File Dump")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %><h1>Jar File Dump</h1> <div class="main" id="main"> diff --git a/apps/routerconsole/jsp/jobs.jsp b/apps/routerconsole/jsp/jobs.jsp index c668951b96..b9b8d21bf4 100644 --- a/apps/routerconsole/jsp/jobs.jsp +++ b/apps/routerconsole/jsp/jobs.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("job queue")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %><h1><%=intl._("I2P Router Job Queue")%></h1> <div class="main" id="main"> diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp index bd6d857221..266a4ffb8c 100644 --- a/apps/routerconsole/jsp/logs.jsp +++ b/apps/routerconsole/jsp/logs.jsp @@ -6,11 +6,7 @@ <%@include file="css.jsi" %> <%=intl.title("logs")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1><%=intl._("I2P Router Logs")%></h1> diff --git a/apps/routerconsole/jsp/netdb.jsp b/apps/routerconsole/jsp/netdb.jsp index ba2185062f..ccbbccfee7 100644 --- a/apps/routerconsole/jsp/netdb.jsp +++ b/apps/routerconsole/jsp/netdb.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("network database")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1><%=intl._("I2P Network Database")%></h1> diff --git a/apps/routerconsole/jsp/nowebapp.jsp b/apps/routerconsole/jsp/nowebapp.jsp index b61808a9de..66f43ed425 100644 --- a/apps/routerconsole/jsp/nowebapp.jsp +++ b/apps/routerconsole/jsp/nowebapp.jsp @@ -8,11 +8,7 @@ <%@include file="css.jsi" %> <%=intl.title("WebApp Not Found")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1><%=intl._("Web Application Not Running")%></h1> diff --git a/apps/routerconsole/jsp/oldconsole.jsp b/apps/routerconsole/jsp/oldconsole.jsp index 825388a7aa..125ea5e75e 100644 --- a/apps/routerconsole/jsp/oldconsole.jsp +++ b/apps/routerconsole/jsp/oldconsole.jsp @@ -10,11 +10,7 @@ <html><head><title>I2P Router Console - internals</title> <%@include file="css.jsi" %> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="conhelper" scope="request" /> diff --git a/apps/routerconsole/jsp/peers.jsp b/apps/routerconsole/jsp/peers.jsp index 934de432b8..0fd2fa9cb3 100644 --- a/apps/routerconsole/jsp/peers.jsp +++ b/apps/routerconsole/jsp/peers.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("peer connections")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1><%=intl._("I2P Network Peers")%></h1> diff --git a/apps/routerconsole/jsp/profiles.jsp b/apps/routerconsole/jsp/profiles.jsp index f5be72a832..725be7a43d 100644 --- a/apps/routerconsole/jsp/profiles.jsp +++ b/apps/routerconsole/jsp/profiles.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("peer profiles")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1><%=intl._("I2P Network Peer Profiles")%></h1> diff --git a/apps/routerconsole/jsp/stats.jsp b/apps/routerconsole/jsp/stats.jsp index b5255775bb..cf87ed3838 100644 --- a/apps/routerconsole/jsp/stats.jsp +++ b/apps/routerconsole/jsp/stats.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("statistics")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <jsp:useBean class="net.i2p.router.web.OldConsoleHelper" id="oldhelper" scope="request" /> diff --git a/apps/routerconsole/jsp/summaryajax.jsi b/apps/routerconsole/jsp/summaryajax.jsi new file mode 100644 index 0000000000..ebd1020c78 --- /dev/null +++ b/apps/routerconsole/jsp/summaryajax.jsi @@ -0,0 +1,5 @@ +<script type="text/javascript"> + var failMessage = "<hr><b><%=intl._("Router is down")%><\/b>"; + function requestAjax1() { ajax("/xhr1.jsp?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } + function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } +</script> diff --git a/apps/routerconsole/jsp/torrents.jsp b/apps/routerconsole/jsp/torrents.jsp index a76b0e78b1..f01e82ccef 100644 --- a/apps/routerconsole/jsp/torrents.jsp +++ b/apps/routerconsole/jsp/torrents.jsp @@ -18,10 +18,8 @@ <%=intl.title("torrents")%> <script src="/js/ajax.js" type="text/javascript"></script> <script src="/js/iframed.js" type="text/javascript"></script> +<%@include file="summaryajax.jsi" %> <script type="text/javascript"> - var failMessage = "<hr><b><%=intl._("Router is down")%><\/b>"; - function requestAjax1() { ajax("/xhr1.jsp?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } function setupFrame() { f = document.getElementById("i2psnarkframe"); injectClass(f); diff --git a/apps/routerconsole/jsp/tunnels.jsp b/apps/routerconsole/jsp/tunnels.jsp index 5ccfd0778e..02b6e471e2 100644 --- a/apps/routerconsole/jsp/tunnels.jsp +++ b/apps/routerconsole/jsp/tunnels.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("tunnel summary")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %><h1><%=intl._("I2P Tunnel Summary")%></h1> <div class="main" id="main"> diff --git a/apps/routerconsole/jsp/viewprofile.jsp b/apps/routerconsole/jsp/viewprofile.jsp index 96f2e1df45..ff621d92b6 100644 --- a/apps/routerconsole/jsp/viewprofile.jsp +++ b/apps/routerconsole/jsp/viewprofile.jsp @@ -7,11 +7,7 @@ <%@include file="css.jsi" %> <%=intl.title("Peer Profile")%> <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?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } -</script> +<%@include file="summaryajax.jsi" %> </head><body onload="initAjax()"> <%@include file="summary.jsi" %> <h1><%=intl._("Peer Profile")%></h1> diff --git a/apps/routerconsole/jsp/webmail.jsp b/apps/routerconsole/jsp/webmail.jsp index 1f7fc34c47..210d692958 100644 --- a/apps/routerconsole/jsp/webmail.jsp +++ b/apps/routerconsole/jsp/webmail.jsp @@ -18,10 +18,8 @@ <%=intl.title("webmail")%> <script src="/js/ajax.js" type="text/javascript"></script> <script src="/js/iframed.js" type="text/javascript"></script> +<%@include file="summaryajax.jsi" %> <script type="text/javascript"> - var failMessage = "<hr><b><%=intl._("Router is down")%><\/b>"; - function requestAjax1() { ajax("/xhr1.jsp?requestURI=<%=request.getRequestURI()%>", "xhr", <%=intl.getRefresh()%>000); } - function initAjax() { setTimeout(requestAjax1, <%=intl.getRefresh()%>000); } function setupFrame() { f = document.getElementById("susimailframe"); injectClass(f); -- GitLab