From cd6376e368b9559e12c57ed7fcad051cad1be212 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 6 May 2013 13:14:44 +0000 Subject: [PATCH] remove DOS line endings in jsps --- apps/routerconsole/jsp/configadvanced.jsp | 72 ++--- apps/routerconsole/jsp/configlogging.jsp | 106 ++++---- apps/routerconsole/jsp/configstats.jsp | 304 +++++++++++----------- apps/routerconsole/jsp/graphs.jsp | 66 ++--- 4 files changed, 274 insertions(+), 274 deletions(-) diff --git a/apps/routerconsole/jsp/configadvanced.jsp b/apps/routerconsole/jsp/configadvanced.jsp index d8a19e350..76a79c692 100644 --- a/apps/routerconsole/jsp/configadvanced.jsp +++ b/apps/routerconsole/jsp/configadvanced.jsp @@ -1,36 +1,36 @@ -<%@page contentType="text/html"%> -<%@page trimDirectiveWhitespaces="true"%> -<%@page pageEncoding="UTF-8"%> - - - -<%@include file="css.jsi" %> -<%=intl.title("config advanced")%> - -<%@include file="summaryajax.jsi" %> - - -<%@include file="summary.jsi" %> - - -" /> - -

<%=intl._("I2P Advanced Configuration")%>

-
- - <%@include file="confignav.jsi" %> - - -<%@include file="formhandler.jsi" %> -
-
-
- - -

<%=intl._("Advanced I2P Configuration")%>

-
-
- " > - " > -
<%=intl._("NOTE")%>: <%=intl._("Some changes may require a restart to take effect.")%> -
+<%@page contentType="text/html"%> +<%@page trimDirectiveWhitespaces="true"%> +<%@page pageEncoding="UTF-8"%> + + + +<%@include file="css.jsi" %> +<%=intl.title("config advanced")%> + +<%@include file="summaryajax.jsi" %> + + +<%@include file="summary.jsi" %> + + +" /> + +

<%=intl._("I2P Advanced Configuration")%>

+
+ + <%@include file="confignav.jsi" %> + + +<%@include file="formhandler.jsi" %> +
+
+
+ + +

<%=intl._("Advanced I2P Configuration")%>

+
+
+ " > + " > +
<%=intl._("NOTE")%>: <%=intl._("Some changes may require a restart to take effect.")%> +
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp index 837ed81b8..21cfb1750 100644 --- a/apps/routerconsole/jsp/configlogging.jsp +++ b/apps/routerconsole/jsp/configlogging.jsp @@ -1,53 +1,53 @@ -<%@page contentType="text/html"%> -<%@page trimDirectiveWhitespaces="true"%> -<%@page pageEncoding="UTF-8"%> - - - -<%@include file="css.jsi" %> -<%=intl.title("config logging")%> - -<%@include file="summaryajax.jsi" %> - - -" /> - -<%@include file="summary.jsi" %> -

<%=intl._("I2P Logging Configuration")%>

-
- <%@include file="confignav.jsi" %> - - -<%@include file="formhandler.jsi" %> -
-
- - -

<%=intl._("Configure I2P Logging Options")%>

-
- - - - - - - - - - - - - - - - -
<%=intl._("Log file")%>:" > -
<%=intl._("(the symbol '@' will be replaced during log rotation)")%>
<%=intl._("Log record format")%>:" > -
<%=intl._("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%> -
<%=intl._("Log date format")%>:" > -
<%=intl._("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%> -
<%=intl._("Max log file size")%>:" >
<%=intl._("Default log level")%>:
<%=intl._("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%> -
<%=intl._("Log level overrides")%>:
<%=intl._("New override")%>:
- " > - " > -
+<%@page contentType="text/html"%> +<%@page trimDirectiveWhitespaces="true"%> +<%@page pageEncoding="UTF-8"%> + + + +<%@include file="css.jsi" %> +<%=intl.title("config logging")%> + +<%@include file="summaryajax.jsi" %> + + +" /> + +<%@include file="summary.jsi" %> +

<%=intl._("I2P Logging Configuration")%>

+
+ <%@include file="confignav.jsi" %> + + +<%@include file="formhandler.jsi" %> +
+
+ + +

<%=intl._("Configure I2P Logging Options")%>

+
+ + + + + + + + + + + + + + + + +
<%=intl._("Log file")%>:" > +
<%=intl._("(the symbol '@' will be replaced during log rotation)")%>
<%=intl._("Log record format")%>:" > +
<%=intl._("(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)")%> +
<%=intl._("Log date format")%>:" > +
<%=intl._("('MM' = month, 'dd' = day, 'HH' = hour, 'mm' = minute, 'ss' = second, 'SSS' = millisecond)")%> +
<%=intl._("Max log file size")%>:" >
<%=intl._("Default log level")%>:
<%=intl._("(DEBUG and INFO are not recommended defaults, as they will drastically slow down your router)")%> +
<%=intl._("Log level overrides")%>:
<%=intl._("New override")%>:
+ " > + " > +
diff --git a/apps/routerconsole/jsp/configstats.jsp b/apps/routerconsole/jsp/configstats.jsp index c57479b46..4100a4b1e 100644 --- a/apps/routerconsole/jsp/configstats.jsp +++ b/apps/routerconsole/jsp/configstats.jsp @@ -1,152 +1,152 @@ -<%@page contentType="text/html"%> -<%@page trimDirectiveWhitespaces="true"%> -<%@page pageEncoding="UTF-8"%> - - - -<%@include file="css.jsi" %> -<%=intl.title("config stats")%> - -<%@include file="summaryajax.jsi" %> - - -<%@include file="summary.jsi" %> -

<%=intl._("I2P Stats Configuration")%>

-
- <%@include file="confignav.jsi" %> - - -<%@include file="formhandler.jsi" %> - - " /> -
-
- - -

<%=intl._("Configure I2P Stat Collection")%>

-

<%=intl._("Enable full stats?")%> - checked="checked" <% } %> > - (<%=intl._("change requires restart to take effect")%>)
-<% - - // stats.log for devs only and grows without bounds, not recommended - boolean shouldShowLog = statshelper.shouldShowLog(); - if (shouldShowLog) { - -%><%=intl._("Stat file")%>:
-Warning - Log with care, stat file grows without limit.
-<% - - } // shouldShowLog - -%><%=intl._("Filter")%>: (<%=intl._("toggle all")%>)

-
- - <% while (statshelper.hasMoreStats()) { - while (statshelper.groupRequired()) { %> - - - -<% - - if (shouldShowLog) { - -%> -<% - - } // shouldShowLog - -%> - - <% - } // end iterating over required groups for the current stat %> - -<% - - if (shouldShowLog) { - -%> -<% - - } // shouldShowLog - -%> - <% - } // end iterating over all stats - - if (shouldShowLog) { - -%> - - -<% - - } // shouldShowLog - -%> -
> - <%=intl._(statshelper.getCurrentGroupName())%> - (<%=intl._("toggle all")%>) -
<%=intl._("Log")%><%=intl._("Graph")%>
- - checked="checked" <% } %> > - <% if (statshelper.getCurrentCanBeGraphed()) { %> - checked="checked" <% } %> ><% } %><%=statshelper.getCurrentStatName()%>:
- <%=statshelper.getCurrentStatDescription()%>
<%=intl._("Advanced filter")%>: -
-" > -" > -
+<%@page contentType="text/html"%> +<%@page trimDirectiveWhitespaces="true"%> +<%@page pageEncoding="UTF-8"%> + + + +<%@include file="css.jsi" %> +<%=intl.title("config stats")%> + +<%@include file="summaryajax.jsi" %> + + +<%@include file="summary.jsi" %> +

<%=intl._("I2P Stats Configuration")%>

+
+ <%@include file="confignav.jsi" %> + + +<%@include file="formhandler.jsi" %> + + " /> +
+
+ + +

<%=intl._("Configure I2P Stat Collection")%>

+

<%=intl._("Enable full stats?")%> + checked="checked" <% } %> > + (<%=intl._("change requires restart to take effect")%>)
+<% + + // stats.log for devs only and grows without bounds, not recommended + boolean shouldShowLog = statshelper.shouldShowLog(); + if (shouldShowLog) { + +%><%=intl._("Stat file")%>:
+Warning - Log with care, stat file grows without limit.
+<% + + } // shouldShowLog + +%><%=intl._("Filter")%>: (<%=intl._("toggle all")%>)

+
+ + <% while (statshelper.hasMoreStats()) { + while (statshelper.groupRequired()) { %> + + + +<% + + if (shouldShowLog) { + +%> +<% + + } // shouldShowLog + +%> + + <% + } // end iterating over required groups for the current stat %> + +<% + + if (shouldShowLog) { + +%> +<% + + } // shouldShowLog + +%> + <% + } // end iterating over all stats + + if (shouldShowLog) { + +%> + + +<% + + } // shouldShowLog + +%> +
> + <%=intl._(statshelper.getCurrentGroupName())%> + (<%=intl._("toggle all")%>) +
<%=intl._("Log")%><%=intl._("Graph")%>
+ + checked="checked" <% } %> > + <% if (statshelper.getCurrentCanBeGraphed()) { %> + checked="checked" <% } %> ><% } %><%=statshelper.getCurrentStatName()%>:
+ <%=statshelper.getCurrentStatDescription()%>
<%=intl._("Advanced filter")%>: +
+" > +" > +
diff --git a/apps/routerconsole/jsp/graphs.jsp b/apps/routerconsole/jsp/graphs.jsp index 77ca23278..8d4aff752 100644 --- a/apps/routerconsole/jsp/graphs.jsp +++ b/apps/routerconsole/jsp/graphs.jsp @@ -1,33 +1,33 @@ -<%@page contentType="text/html"%> -<%@page trimDirectiveWhitespaces="true"%> -<%@page pageEncoding="UTF-8"%> - - - -<%@include file="css.jsi" %> -<%=intl.title("graphs")%> - - " /> -<% /* GraphHelper sets the defaults in setContextId, so setting the properties must be after the context */ %> - -<% - graphHelper.storeWriter(out); - graphHelper.storeMethod(request.getMethod()); - // meta must be inside the head - boolean allowRefresh = intl.allowIFrame(request.getHeader("User-Agent")); - if (allowRefresh) { - out.print(graphHelper.getRefreshMeta()); - } -%> - -<%@include file="summaryajax.jsi" %> - -<%@include file="summary.jsi" %> -

<%=intl._("I2P Performance Graphs")%>

-
-
-
- - - -
+<%@page contentType="text/html"%> +<%@page trimDirectiveWhitespaces="true"%> +<%@page pageEncoding="UTF-8"%> + + + +<%@include file="css.jsi" %> +<%=intl.title("graphs")%> + + " /> +<% /* GraphHelper sets the defaults in setContextId, so setting the properties must be after the context */ %> + +<% + graphHelper.storeWriter(out); + graphHelper.storeMethod(request.getMethod()); + // meta must be inside the head + boolean allowRefresh = intl.allowIFrame(request.getHeader("User-Agent")); + if (allowRefresh) { + out.print(graphHelper.getRefreshMeta()); + } +%> + +<%@include file="summaryajax.jsi" %> + +<%@include file="summary.jsi" %> +

<%=intl._("I2P Performance Graphs")%>

+
+
+
+ + + +