I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Replace all <hr /> and <br /> with <hr> and <br> whilst we're in html4 transitional.

Browse Source
This commit is contained in:
z3d
2009-08-17 14:35:18 +00:00
parent 33a7f3351b
commit 1b63aa411b
21 changed files with 163 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
View File

@ -111,9 +111,9 @@ public class I2PSnarkServlet extends HttpServlet {
out.write(TABLE_HEADER);
if (_manager.util().connected() && snarks.size() > 0) {
if (peerParam != null)
out.write("(<a href=\"" + req.getRequestURI() + "\">Hide Peers</a>)<br />\n");
out.write("(<a href=\"" + req.getRequestURI() + "\">Hide Peers</a>)<br>\n");
else
out.write("(<a href=\"" + req.getRequestURI() + "?p=1" + "\">Show Peers</a>)<br />\n");
out.write("(<a href=\"" + req.getRequestURI() + "?p=1" + "\">Show Peers</a>)<br>\n");
}
out.write(TABLE_HEADER2);
out.write("<th align=\"left\">");
@ -455,7 +455,7 @@ public class I2PSnarkServlet extends HttpServlet {
else {
if (err.length() > MAX_DISPLAYED_ERROR_LENGTH)
err = err.substring(0, MAX_DISPLAYED_ERROR_LENGTH) + "&hellip;";
statusString = "TrackerErr<br />(" + err + ")";
statusString = "TrackerErr<br>(" + err + ")";
}
} else if (remaining <= 0) {
if (isRunning && curPeers > 0 && !showPeers)
@ -553,7 +553,7 @@ public class I2PSnarkServlet extends HttpServlet {
out.write("<a href=\"" + uri + "?action=Start" + parameters
+ "\" title=\"Start the torrent\">Start</a> ");
out.write("<a href=\"" + uri + "?action=Remove" + parameters
+ "\" title=\"Remove the torrent from the active list, deleting the .torrent file\">Remove</a><br />");
+ "\" title=\"Remove the torrent from the active list, deleting the .torrent file\">Remove</a><br>");
out.write("<a href=\"" + uri + "?action=Delete" + parameters
+ "\" title=\"Delete the .torrent file and the associated data file(s)\">Delete</a> ");
}
@ -655,13 +655,13 @@ public class I2PSnarkServlet extends HttpServlet {
// *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file
out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
out.write("<div class=\"addtorrentsection\"><span class=\"snarkConfigTitle\">Add Torrent:</span><br />\n");
out.write("<div class=\"addtorrentsection\"><span class=\"snarkConfigTitle\">Add Torrent:</span><br>\n");
out.write("From URL&nbsp;: <input type=\"text\" name=\"newURL\" size=\"80\" value=\"" + newURL + "\" /> \n");
// not supporting from file at the moment, since the file name passed isn't always absolute (so it may not resolve)
//out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br />\n");
out.write("<input type=\"submit\" value=\"Add torrent\" name=\"action\" /><br />\n");
out.write("<span class=\"snarkAddInfo\">Alternately, you can copy .torrent files to " + _manager.getDataDir().getAbsolutePath() + "<br />\n");
out.write("Removing that .torrent file will cause the torrent to stop.<br /></span>\n");
//out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
out.write("<input type=\"submit\" value=\"Add torrent\" name=\"action\" /><br>\n");
out.write("<span class=\"snarkAddInfo\">Alternately, you can copy .torrent files to " + _manager.getDataDir().getAbsolutePath() + "<br>\n");
out.write("Removing that .torrent file will cause the torrent to stop.<br></span>\n");
out.write("</form>\n</span></div>");
}
@ -675,11 +675,11 @@ public class I2PSnarkServlet extends HttpServlet {
// *not* enctype="multipart/form-data", so that the input type=file sends the filename, not the file
out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
out.write("<span class=\"snarkConfigTitle\">Create Torrent:</span><br />\n");
//out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br />\n");
out.write("<span class=\"snarkConfigTitle\">Create Torrent:</span><br>\n");
//out.write("From file: <input type=\"file\" name=\"newFile\" size=\"50\" value=\"" + newFile + "\" /><br>\n");
out.write("Data to seed: " + _manager.getDataDir().getAbsolutePath() + File.separatorChar
+ "<input type=\"text\" name=\"baseFile\" size=\"20\" value=\"" + baseFile
+ "\" title=\"File to seed (must be within the specified path)\" /><br />\n");
+ "\" title=\"File to seed (must be within the specified path)\" /><br>\n");
out.write("Tracker: <select name=\"announceURL\"><option value=\"\">Select a tracker</option>\n");
Map trackers = _manager.getTrackers();
for (Iterator iter = trackers.entrySet().iterator(); iter.hasNext(); ) {
@ -709,15 +709,15 @@ public class I2PSnarkServlet extends HttpServlet {
out.write("<form action=\"" + uri + "\" method=\"POST\">\n");
out.write("<div class=\"configsection\"><span class=\"snarkConfig\">\n");
out.write("<input type=\"hidden\" name=\"nonce\" value=\"" + _nonce + "\" />\n");
out.write("<span class=\"snarkConfigTitle\">Configuration:</span><br />\n");
out.write("<span class=\"snarkConfigTitle\">Configuration:</span><br>\n");
out.write("Data directory: <input type=\"text\" size=\"40\" name=\"dataDir\" value=\"" + dataDir + "\" ");
out.write("title=\"Directory to store torrents and data\" disabled=\"true\" /> <i>(Edit i2psnark.config and restart to change)</i><br />\n");
out.write("title=\"Directory to store torrents and data\" disabled=\"true\" /> <i>(Edit i2psnark.config and restart to change)</i><br>\n");
out.write("Auto start: <input type=\"checkbox\" class=\"optbox\" name=\"autoStart\" value=\"true\" "
+ (autoStart ? "checked " : "")
+ "title=\"If true, automatically start torrents that are added\" />");
//Auto add: <input type="checkbox" name="autoAdd" value="true" title="If true, automatically add torrents that are found in the data directory" />
//Auto stop: <input type="checkbox" name="autoStop" value="true" title="If true, automatically stop torrents that are removed from the data directory" />
//out.write("<br />\n");
//out.write("<br>\n");
/*
out.write("Seed percentage: <select name=\"seedPct\" disabled=\"true\" >\n\t");
if (seedPct <= 0)
@ -732,28 +732,28 @@ public class I2PSnarkServlet extends HttpServlet {
out.write("<option value=\"150\" selected=\"true\">150%</option>\n\t");
else
out.write("<option value=\"150\">150%</option>\n\t");
out.write("</select><br />\n");
out.write("</select><br>\n");
*/
out.write("Total uploader limit: <input type=\"text\" name=\"upLimit\" value=\""
+ _manager.util().getMaxUploaders() + "\" size=\"3\" maxlength=\"3\" /> peers<br />\n");
+ _manager.util().getMaxUploaders() + "\" size=\"3\" maxlength=\"3\" /> peers<br>\n");
out.write("Up bandwidth limit: <input type=\"text\" name=\"upBW\" value=\""
+ _manager.util().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" /> KBps <i>(Half <a href=\"/config.jsp\" target=\"blank\">available bandwidth</a> recommended.)</i><br />\n");
+ _manager.util().getMaxUpBW() + "\" size=\"3\" maxlength=\"3\" /> KBps <i>(Half <a href=\"/config.jsp\" target=\"blank\">available bandwidth</a> recommended.)</i><br>\n");
out.write("Use open trackers also: <input type=\"checkbox\" class=\"optbox\" name=\"useOpenTrackers\" value=\"true\" "
+ (useOpenTrackers ? "checked " : "")
+ "title=\"If true, uses open trackers in addition\" /> ");
out.write("Announce URLs: <input type=\"text\" name=\"openTrackers\" value=\""
+ openTrackers + "\" size=\"50\" /><br />\n");
+ openTrackers + "\" size=\"50\" /><br>\n");
//out.write("\n");
out.write("EepProxy host: <input type=\"text\" name=\"eepHost\" value=\""
+ _manager.util().getEepProxyHost() + "\" size=\"15\" /> ");
out.write("port: <input type=\"text\" name=\"eepPort\" value=\""
+ _manager.util().getEepProxyPort() + "\" size=\"5\" maxlength=\"5\" /><br />\n");
+ _manager.util().getEepProxyPort() + "\" size=\"5\" maxlength=\"5\" /><br>\n");
out.write("I2CP host: <input type=\"text\" name=\"i2cpHost\" value=\""
+ _manager.util().getI2CPHost() + "\" size=\"15\" /> ");
out.write("port: <input type=\"text\" name=\"i2cpPort\" value=\"" +
+ _manager.util().getI2CPPort() + "\" size=\"5\" maxlength=\"5\" /> <br />\n");
+ _manager.util().getI2CPPort() + "\" size=\"5\" maxlength=\"5\" /> <br>\n");
StringBuilder opts = new StringBuilder(64);
Map options = new TreeMap(_manager.util().getI2CPOptions());
for (Iterator iter = options.entrySet().iterator(); iter.hasNext(); ) {
@ -763,7 +763,7 @@ public class I2PSnarkServlet extends HttpServlet {
opts.append(key).append('=').append(val).append(' ');
}
out.write("I2CP opts: <input type=\"text\" name=\"i2cpOpts\" size=\"80\" value=\""
+ opts.toString() + "\" /><br />\n");
+ opts.toString() + "\" /><br>\n");
out.write("<input type=\"submit\" value=\"Save configuration\" name=\"action\" />\n");
out.write("</span>\n");
out.write("</form></div>");

38
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java
View File

@ -464,7 +464,7 @@ public class TunnelController implements Logging {
private void getHttpClientSummary(StringBuilder buf) {
String description = getDescription();
if ( (description != null) && (description.trim().length() > 0) )
buf.append("<i>").append(description).append("</i><br />\n");
buf.append("<i>").append(description).append("</i><br>\n");
buf.append("HTTP proxy listening on port ").append(getListenPort());
String listenOn = getListenOnInterface();
if ("0.0.0.0".equals(listenOn))
@ -473,19 +473,19 @@ public class TunnelController implements Logging {
buf.append(" (reachable locally only)");
else
buf.append(" (reachable at the ").append(listenOn).append(" interface)");
buf.append("<br />\n");
buf.append("<br>\n");
String proxies = getProxyList();
if ( (proxies == null) || (proxies.trim().length() <= 0) )
buf.append("Outproxy: default [squid.i2p]<br />\n");
buf.append("Outproxy: default [squid.i2p]<br>\n");
else
buf.append("Outproxy: ").append(proxies).append("<br />\n");
buf.append("Outproxy: ").append(proxies).append("<br>\n");
getOptionSummary(buf);
}
private void getClientSummary(StringBuilder buf) {
String description = getDescription();
if ( (description != null) && (description.trim().length() > 0) )
buf.append("<i>").append(description).append("</i><br />\n");
buf.append("<i>").append(description).append("</i><br>\n");
buf.append("Client tunnel listening on port ").append(getListenPort());
buf.append(" pointing at ").append(getTargetDestination());
String listenOn = getListenOnInterface();
@ -495,58 +495,58 @@ public class TunnelController implements Logging {
buf.append(" (reachable locally only)");
else
buf.append(" (reachable at the ").append(listenOn).append(" interface)");
buf.append("<br />\n");
buf.append("<br>\n");
getOptionSummary(buf);
}
private void getServerSummary(StringBuilder buf) {
String description = getDescription();
if ( (description != null) && (description.trim().length() > 0) )
buf.append("<i>").append(description).append("</i><br />\n");
buf.append("<i>").append(description).append("</i><br>\n");
buf.append("Server tunnel pointing at port ").append(getTargetPort());
buf.append(" on ").append(getTargetHost());
buf.append("<br />\n");
buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("<br />\n");
buf.append("<br>\n");
buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("<br>\n");
getOptionSummary(buf);
}
private void getHttpServerSummary(StringBuilder buf) {
String description = getDescription();
if ( (description != null) && (description.trim().length() > 0) )
buf.append("<i>").append(description).append("</i><br />\n");
buf.append("<i>").append(description).append("</i><br>\n");
buf.append("Server tunnel pointing at port ").append(getTargetPort());
buf.append(" on ").append(getTargetHost());
buf.append(" for the site ").append(getSpoofedHost());
buf.append("<br />\n");
buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("<br />\n");
buf.append("<br>\n");
buf.append("Private destination loaded from ").append(getPrivKeyFile()).append("<br>\n");
getOptionSummary(buf);
}
private void getOptionSummary(StringBuilder buf) {
String opts = getClientOptions();
if ( (opts != null) && (opts.length() > 0) )
buf.append("Network options: ").append(opts).append("<br />\n");
buf.append("Network options: ").append(opts).append("<br>\n");
if (_running) {
List sessions = _tunnel.getSessions();
for (int i = 0; i < sessions.size(); i++) {
I2PSession session = (I2PSession)sessions.get(i);
Destination dest = session.getMyDestination();
if (dest != null) {
buf.append("Destination hash: ").append(dest.calculateHash().toBase64()).append("<br />\n");
buf.append("Destination hash: ").append(dest.calculateHash().toBase64()).append("<br>\n");
if ( ("server".equals(getType())) || ("httpserver".equals(getType())) ) {
buf.append("Full destination: ");
buf.append("<input type=\"text\" size=\"10\" onclick=\"this.select();\" ");
buf.append("value=\"").append(dest.toBase64()).append("\" />\n");
long val = new Random().nextLong();
if (val < 0) val = 0 - val;
buf.append("<br />You can <a href=\"http://temp").append(val);
buf.append("<br>You can <a href=\"http://temp").append(val);
buf.append(".i2p/?i2paddresshelper=").append(dest.toBase64()).append("\">view</a>");
buf.append(" it in a browser (only when you're using the eepProxy)\n");
buf.append("<br />If you are going to share this on IRC, you need to split it up:<br />\n");
buf.append("<br>If you are going to share this on IRC, you need to split it up:<br>\n");
String str = dest.toBase64();
buf.append(str.substring(0, str.length()/2)).append("<br />\n");
buf.append(str.substring(str.length()/2)).append("<br />\n");
buf.append("You can also post it to <a href=\"http://forum.i2p/viewforum.php?f=16\">Eepsite announcement forum</a><br />");
buf.append(str.substring(0, str.length()/2)).append("<br>\n");
buf.append(str.substring(str.length()/2)).append("<br>\n");
buf.append("You can also post it to <a href=\"http://forum.i2p/viewforum.php?f=16\">Eepsite announcement forum</a><br>");
}
}
}

20
apps/i2ptunnel/jsp/editClient.jsp
View File

@ -50,7 +50,7 @@
</div>
<div class="separator">
<hr />
<hr>
</div>
<div id="nameField" class="rowItem">
@ -71,7 +71,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="accessField" class="rowItem">
@ -129,7 +129,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<% if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType)) {
@ -197,7 +197,7 @@
</div>
<div class="separator">
<hr />
<hr>
</div>
<div id="tunnelOptionsField" class="rowItem">
@ -265,7 +265,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="optionsField" class="rowItem">
@ -286,7 +286,7 @@
<% if (!"streamrclient".equals(tunnelType)) { // streamr client sends pings so it will never be idle %>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="optionsField" class="rowItem">
@ -314,7 +314,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="optionsField" class="rowItem">
@ -349,7 +349,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="optionsField" class="rowItem">
@ -366,7 +366,7 @@
<% } // !streamrclient %>
<div class="subdivider">
<hr />
<hr>
</div>
<% if ("client".equals(tunnelType) || "ircclient".equals(tunnelType)) { %>
@ -393,7 +393,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<% } %>

20
apps/i2ptunnel/jsp/editServer.jsp
View File

@ -50,7 +50,7 @@
</div>
<div class="separator">
<hr />
<hr>
</div>
<div id="nameField" class="rowItem">
@ -78,7 +78,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="targetField" class="rowItem">
@ -110,7 +110,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<% if ("httpserver".equals(tunnelType)) {
@ -164,7 +164,7 @@
</div>
<div class="separator">
<hr />
<hr>
</div>
<div id="tunnelOptionsField" class="rowItem">
@ -232,7 +232,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="optionsField" class="rowItem">
@ -252,7 +252,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="optionsField" class="rowItem">
@ -281,7 +281,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="optionsField" class="rowItem">
@ -304,7 +304,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="optionsField" class="rowItem">
@ -332,7 +332,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="tunnelOptionsField" class="rowItem">
@ -382,7 +382,7 @@
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<div id="customOptionsField" class="rowItem">

16
apps/i2ptunnel/jsp/index.jsp
View File

@ -27,13 +27,13 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
</div>
<div class="separator">
<hr />
<hr>
</div>
<textarea id="statusMessages" rows="4" cols="60" readonly="readonly"><jsp:getProperty name="indexBean" property="messages" /></textarea>
<div class="separator">
<hr />
<hr>
</div>
<div class="footer">
@ -74,7 +74,7 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
</div>
<div class="statusHeaderField rowItem">
<label>Status:</label>
<hr /> </div>
<hr> </div>
<%
for (int curServer = 0; curServer < indexBean.getTunnelCount(); curServer++) {
@ -141,13 +141,13 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<%
}
%>
<div class="separator">
<hr />
<hr>
</div>
<div class="footer">
@ -194,7 +194,7 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
</div>
<div class="separator">
<hr />
<hr>
</div>
<%
for (int curClient = 0; curClient < indexBean.getTunnelCount(); curClient++) {
@ -262,13 +262,13 @@ p-equiv="Content-Type" content="text/html; charset=UTF-8" />
</div>
<div class="subdivider">
<hr />
<hr>
</div>
<%
}
%>
<div class="separator">
<hr />
<hr>
</div>
<div class="footer">

2
apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkClient.java
View File

@ -117,7 +117,7 @@ public class StreamSinkClient {
}
/**
* Fire up the client. <code>Usage: StreamSinkClient [i2cpHost i2cpPort] sendSizeKB writeDelayMs serverDestFile [concurrentSends]</code> <br />
* Fire up the client. <code>Usage: StreamSinkClient [i2cpHost i2cpPort] sendSizeKB writeDelayMs serverDestFile [concurrentSends]</code> <br>
* <ul>
* <li><b>sendSizeKB</b>: how many KB to send, or -1 for unlimited</li>
* <li><b>writeDelayMs</b>: how long to wait between each .write (0 for no delay)</li>

2
apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkSend.java
View File

@ -104,7 +104,7 @@ public class StreamSinkSend {
}
/**
* Fire up the client. <code>Usage: StreamSinkClient sendFile writeDelayMs serverDestFile</code> <br />
* Fire up the client. <code>Usage: StreamSinkClient sendFile writeDelayMs serverDestFile</code> <br>
* <ul>
* <li><b>sendFile</b>: filename to send</li>
* <li><b>writeDelayMs</b>: how long to wait between each .write (0 for no delay)</li>

2
apps/ministreaming/java/src/net/i2p/client/streaming/StreamSinkServer.java
View File

@ -155,7 +155,7 @@ public class StreamSinkServer {
}
/**
* Fire up the streaming server. <code>Usage: StreamSinkServer [i2cpHost i2cpPort] sinkDir ourDestFile [numHandlers]</code><br />
* Fire up the streaming server. <code>Usage: StreamSinkServer [i2cpHost i2cpPort] sinkDir ourDestFile [numHandlers]</code><br>
* <ul>
* <li><b>sinkDir</b>: Directory to store received files in</li>
* <li><b>ourDestFile</b>: filename to write our binary destination to</li>

2
apps/streaming/java/src/net/i2p/client/streaming/SchedulerDead.java
View File

@ -8,7 +8,7 @@ import net.i2p.util.Log;
* connection was reset.</p>
*
* <h2>Entry conditions:</h2><ul>
* <li>Both sides have closed and ACKed and the timeout has passed. <br />
* <li>Both sides have closed and ACKed and the timeout has passed. <br>
* <b>or</b></li>
* <li>A RESET was received</li>
* </ul>