i2ptunnel:

- Remove redundant labels and spans for keyaccess - Edit Server: - Shift Local Destination / Private Key file to share table row - Reduces spread of Local Destination textarea - Move "Use SSL to connect to target" to Target Port column - Add translation tagging for title tags - Remove redundant title tags and provide enhanced strings for features that benefit from clarification - Move title tags to <label> where applicable - Fixed Cancel button on registration so it now jumps back to the list page - textareas for registration page and local destination on edit server page changed to divs - Scrollbars hidden until mouseover, 1 click to select content - Responsive width, tabindex="0" - Fixes text breaking out of textarea bounding box issue in chrome/blink - Fix overflow issue on select dropdowns (edit server/client -> tunnel options) in Chrome / Blink - More generous vertical padding for th (responsive) - Larger h2/h3s (responsive) - Increase spacing between panels in iframe mode
panagiotious · Jun 3, 2017 · 017f66a · 017f66a
1 parent ff400c9
commit 017f66a
Show file tree

Hide file tree

Showing 9 changed files with 860 additions and 296 deletions.
diff --git a/apps/i2ptunnel/jsp/editClient.jsp b/apps/i2ptunnel/jsp/editClient.jsp
diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
diff --git a/apps/i2ptunnel/jsp/register.jsp b/apps/i2ptunnel/jsp/register.jsp
@@ -68,7 +68,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 <input type="hidden" name="type" value="<%=tunnelType%>" />
                 <input type="submit" class="default" name="action" value="Save changes" />
 <%
-    if (!"new".equals(tunnelType)) {      
+    if (!"new".equals(tunnelType)) {
 %>
 
 <table>
@@ -83,7 +83,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
         </td>
     </tr>
 
-<%            
+<%
       if (("httpserver".equals(tunnelType)) || ("httpbidirserver".equals(tunnelType))) {
           %>
     <tr><td><b><%=intl._t("Website Name")%>:</b> <%=editBean.getSpoofedHost(curTunnel)%></td></tr>
@@ -131,7 +131,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
     </tr>
     <tr>
         <td>
-            <textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" title="Copy and paste this to the registration site" wrap="off" spellcheck="false" class="authentication"><% he.write(out); %></textarea>
+            <div class="displayText" tabindex="0" title="<%=intl._t("Copy and paste this to the registration site")%>"><% he.write(out); %></div>
         </td>
     </tr>
 </table>
@@ -143,7 +143,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                props.setProperty(HostTxtEntry.PROP_ACTION, HostTxtEntry.ACTION_REMOVE);
                he.signRemove(spk);
           %>
-          
+
 <table>
     <tr>
         <th>
@@ -152,7 +152,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
     </tr>
     <tr>
         <td>
-            <textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" title="Copy and paste this to the registration site" wrap="off" spellcheck="false" class="authentication"><% he.writeRemove(out); %></textarea>
+            <div class="displayText" tabindex="0" title="<%=intl._t("Copy and paste this to the registration site")%>"><% he.writeRemove(out); %></div>
         </td>
     </tr>
 
@@ -192,7 +192,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 %>
     <tr>
         <td>
-            <textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" title="Copy and paste this to the registration site" wrap="off" spellcheck="false" class="authentication"><% he.write(out); %></textarea>
+            <div class="displayText" tabindex="0" title="<%=intl._t("Copy and paste this to the registration site")%>"><% he.write(out); %></div>
         </td>
     </tr>
     <tr>
@@ -225,7 +225,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 %>
     <tr>
         <td>
-            <textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" title="Copy and paste this to the registration site" wrap="off" spellcheck="false" class="authentication"><% he.write(out); %></textarea>
+            <div class="displayText" tabindex="0" title="<%=intl._t("Copy and paste this to the registration site")%>"><% he.write(out); %></div>
         </td>
     </tr>
     <tr>
@@ -240,7 +240,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
 <%
                }
           %>
-          
+
 <%
                props.remove(HostTxtEntry.PROP_SIG);
                props.remove(HostTxtEntry.PROP_OLDNAME);
@@ -262,7 +262,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
 
     <tr>
         <td>
-            <textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" title="Copy and paste this to the registration site" wrap="off" spellcheck="false" class="authentication"><% he.write(out); %></textarea>
+            <div class="displayText" tabindex="0" title="<%=intl._t("Copy and paste this to the registration site")%>"><% he.write(out); %></div>
         </td>
     </tr>
     <tr>
@@ -283,7 +283,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                props.remove(HostTxtEntry.PROP_SIG);
                props.remove(HostTxtEntry.PROP_OLDSIG);
           %>
-          
+
     <tr>
         <th>
                     <%=intl._t("Authentication for adding alternate destination")%>
@@ -299,7 +299,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                 %>
     <tr>
         <td>
-            <textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" title="Copy and paste this to the registration site" wrap="off" spellcheck="false" class="authentication"><% he.write(out); %></textarea>
+            <div class="displayText" tabindex="0" title="<%=intl._t("Copy and paste this to the registration site")%>"><% he.write(out); %></div>
         </td>
     </tr>
     <tr>
@@ -332,7 +332,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                        props2.setProperty(HostTxtEntry.PROP_OLDDEST, b64);
                        he2.signInner(spk);
                        he2.sign(spk3);
-                %><tr><td><textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" id="localDestination" title="Copy and paste this to the registration site" wrap="off" spellcheck="false"><% he2.write(out); %></textarea></td></tr>
+                %><tr><td><div class="displayText" tabindex="0" title="<%=intl._t("Copy and paste this to the registration site")%>"><% he2.write(out); %></div></td></tr>
                 <tr><td class="infohelp"><%=intl._t("This will add an alternate destination for {0}", name)%></td></tr>
 <%
                    } else {
@@ -363,10 +363,10 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
                    he.signInner(spk2);
                    he.sign(spk);
                 %>
-                
+
     <tr>
         <td>
-            <textarea rows="1" style="height: 3em;" cols="60" readonly="readonly" title="Copy and paste this to the registration site" wrap="off" spellcheck="false" class="authentication"><% he.write(out); %></textarea>
+            <div class="displayText" tabindex="0" title="<%=intl._t("Copy and paste this to the registration site")%>"><% he.write(out); %></div>
         </td>
     </tr>
     <tr>
@@ -426,7 +426,7 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
     <tr>
         <td>
             <b><%=intl._t("Old Hostname")%>:</b>
-            <input type="text" size="30" maxlength="50" name="oldname" id="oldName" title="Old Hostname" value="<%=oldname%>" class="freetext" />
+            <input type="text" size="30" maxlength="50" name="oldname" id="oldName" value="<%=oldname%>" class="freetext" />
         </td>
     </tr>
     <tr>
@@ -438,8 +438,8 @@ input.default { width: 1px; height: 1px; visibility: hidden; }
     <tr>
         <td class="buttons">
                     <input type="hidden" value="true" name="removeConfirm" />
-                    <button id="controlCancel" class="control" type="submit" name="action" value="" title="Cancel"><%=intl._t("Cancel")%></button>
-                    <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="authenticate" title="Generate Authentication"><%=intl._t("Generate")%></button>
+                    <a class="control" href="list"><%=intl._t("Cancel")%></a>
+                    <button id="controlSave" class="control" type="submit" name="action" value="authenticate"  title="<%=intl._t("Generate Authentication")%>"><%=intl._t("Generate")%></button>
         </td>
     </tr>
 

diff --git a/apps/i2ptunnel/jsp/wizard.jsp b/apps/i2ptunnel/jsp/wizard.jsp
@@ -257,13 +257,13 @@
     <tr>
         <td>
             <span class="tag"><%=intl._t("Name")%>:</span>
-                <input type="text" size="30" maxlength="50" name="name" id="name" placeholder="New Tunnel" title="Tunnel Name" value="<%=(!"null".equals(request.getParameter("name")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("name")) : "" ) %>" class="freetext" />
+                <input type="text" size="30" maxlength="50" name="name" id="name" placeholder="New Tunnel" title="<%=intl._t("Name of tunnel to be displayed on Tunnel Manager home page and the router console sidebar")%>" value="<%=(!"null".equals(request.getParameter("name")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("name")) : "" ) %>" class="freetext" />
         </td>
     </tr>
     <tr>
         <td>
             <span class="tag"><%=intl._t("Description")%>:</span>
-                <input type="text" size="60" maxlength="80" name="nofilter_description"  id="description" title="Tunnel Description" value="<%=(!"null".equals(request.getParameter("nofilter_description")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("nofilter_description")) : "" ) %>" class="freetext" />
+                <input type="text" size="60" maxlength="80" name="nofilter_description"  id="description" title="<%=intl._t("Description of tunnel to be displayed on Tunnel Manager home page")%>" value="<%=(!"null".equals(request.getParameter("nofilter_description")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("nofilter_description")) : "" ) %>" class="freetext" />
         </td>
     </tr>
             <%
@@ -291,7 +291,7 @@
     <tr>
         <td>
             <span class="tag"><%=intl._t("Outproxies")%>:</span>
-                <input type="text" size="30" id="proxyList" name="proxyList" title="List of Outproxy I2P destinations" value="<%=(!"null".equals(request.getParameter("proxyList")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("proxyList")) : "" ) %>" class="freetext" />
+                <input type="text" size="30" id="proxyList" name="proxyList" title="<%=intl._t("List of I2P outproxy destinations, separated with commas (e.g. proxy1.i2p,proxy2.i2p)")%>" value="<%=(!"null".equals(request.getParameter("proxyList")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("proxyList")) : "" ) %>" class="freetext" />
         </td>
     </tr>
             <%
@@ -312,7 +312,7 @@
     <tr>
         <td>
             <span class="tag"><%=intl._t("Tunnel Destination")%>:</span>
-                <input type="text" size="30" id="targetDestination" name="targetDestination" title="Destination of the Tunnel" value="<%=(!"null".equals(request.getParameter("targetDestination")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("targetDestination")) : "" ) %>" class="freetext" />
+                <input type="text" size="30" id="targetDestination" name="targetDestination" title="<%=intl._t("Enter a b64 or .i2p address here")%>" value="<%=(!"null".equals(request.getParameter("targetDestination")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("targetDestination")) : "" ) %>" class="freetext" />
             &nbsp;(<%=intl._t("name, name:port, or destination")%>
                      <% if ("streamrclient".equals(tunnelType)) { /* deferred resolution unimplemented in streamr client */ %>
                          - <%=intl._t("b32 not recommended")%>
@@ -344,7 +344,7 @@
     <tr>
         <td>
             <span class="tag"><%=intl._t("Host")%>:</span>
-                <input type="text" size="20" id="targetHost" name="targetHost" title="Target Hostname or IP" placeholder="127.0.0.1" value="<%=(!"null".equals(request.getParameter("targetHost")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("targetHost")) : "127.0.0.1" ) %>" class="freetext" />
+                <input type="text" size="20" id="targetHost" name="targetHost" title="<%=intl._t("Hostname or IP address of the target server")%>" placeholder="127.0.0.1" value="<%=(!"null".equals(request.getParameter("targetHost")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("targetHost")) : "127.0.0.1" ) %>" class="freetext" />
         </td>
     </tr>
             <%
@@ -366,7 +366,7 @@
     <tr>
         <td>
             <span class="tag"><%=intl._t("Port")%>:</span>
-                <input type="text" size="6" maxlength="5" id="targetPort" name="targetPort" title="Target Port Number" value="<%=(!"null".equals(request.getParameter("targetPort")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("targetPort")) : "" ) %>" class="freetext" />
+                <input type="text" size="6" maxlength="5" id="targetPort" name="targetPort" title="<%=intl._t("Specify the port the server is running on")%>" value="<%=(!"null".equals(request.getParameter("targetPort")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("targetPort")) : "" ) %>" class="freetext" />
         </td>
     </tr>
             <%
@@ -389,7 +389,7 @@
     <tr>
         <td>
             <span class="tag"><%=intl._t("Port")%>:</span>
-                <input type="text" size="6" maxlength="5" id="port" name="port" title="Access Port Number" value="<%=(!"null".equals(request.getParameter("port")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("port")) : "" ) %>" class="freetext" />
+                <input type="text" size="6" maxlength="5" id="port" name="port" title="<%=intl._t("Specify the local port this service should be accessible from")%>" value="<%=(!"null".equals(request.getParameter("port")) ? net.i2p.data.DataHelper.stripHTML(request.getParameter("port")) : "" ) %>" class="freetext" />
         </td>
     </tr>
             <%
@@ -414,7 +414,7 @@
     <tr>
         <td>
             <span class="tag"><%=intl._t("Reachable by")%>:</span>
-                <select id="reachableBy" name="reachableBy" title="IP for Client Access" class="selectbox">
+                <select id="reachableBy" name="reachableBy" title="<%=intl._t("Listening interface (IP address) for client access (normally 127.0.0.1)")%>" class="selectbox">
               <%
                     String clientInterface = request.getParameter("reachableBy");
                     if ("null".equals(clientInterface)) {
@@ -456,7 +456,7 @@
     </tr>
     <tr>
         <td class="options">
-                <label><input value="1" type="checkbox" id="startOnLoad" name="startOnLoad" title="Start Tunnel Automatically"<%=("1".equals(request.getParameter("startOnLoad")) ? " checked=\"checked\"" : "")%> class="tickbox" />
+                <label title="<%=intl._t("Enable this option to ensure this service is available when the router starts")%>"><input value="1" type="checkbox" id="startOnLoad" name="startOnLoad" <%=("1".equals(request.getParameter("startOnLoad")) ? " checked=\"checked\"" : "")%> class="tickbox" />
             &nbsp;<%=intl._t("Automatically start tunnel when router starts")%></label>
         </td>
     </tr>
@@ -616,16 +616,16 @@ http://stats.i2p/cgi-bin/jump.cgi?a=" /><%
                /* End page 7 */ %>
     <tr>
         <td class="buttons">
-                    <a class="control" href="list"><%=intl._t("Cancel")%></a>
+                    <a class="control" title="<%=intl._t("Cancel the wizard and return to Tunnel Manager home page")%>" href="list"><%=intl._t("Cancel")%></a>
                     <% if (curPage != 1 && curPage != 7) {
-                    %><button id="controlPrevious" class="control" type="submit" name="action" value="Previous page" title="Previous Page"><%=intl._t("Previous")%></button><%
+                    %><button id="controlPrevious" class="control" type="submit" name="action" value="Previous page" title="<%=intl._t("Return to previous page")%>"><%=intl._t("Previous")%></button><%
                     } %>
                     <% if (curPage == 7) {
-                    %><button id="controlSave" class="control" type="submit" name="action" value="Save changes" title="Save Tunnel"><%=intl._t("Save Tunnel")%></button><%
+                    %><button id="controlSave" class="control" type="submit" name="action" value="Save changes" title="<%=intl._t("Save tunnel configuration")%>"><%=intl._t("Save Tunnel")%></button><%
                     } else if (curPage == 6) {
-                    %><button id="controlFinish" class="control" type="submit" name="action" value="Next page" title="Finish Wizard"><%=intl._t("Finish")%></button><%
+                    %><button id="controlFinish" class="control" type="submit" name="action" value="Next page" title="<%=intl._t("Finish Wizard and review tunnel settings")%>"><%=intl._t("Finish")%></button><%
                     } else {
-                    %><button id="controlNext" class="control" type="submit" name="action" value="Next page" title="Next Page"><%=intl._t("Next")%></button><%
+                    %><button id="controlNext" class="control" type="submit" name="action" value="Next page" title="<%=intl._t("Advance to next page")%>"><%=intl._t("Next")%></button><%
                     } %>
         </td>
     </tr>

diff --git a/history.txt b/history.txt
@@ -44,7 +44,25 @@
      - De-emphasise siderbar app icons with background-blend-mode: luminosity
      - Change sidebar snark icon to match homepage icon
      - Bump div.main text color from #222 to #333 (reduce contrast)
-   * i2ptunnel: Increase vertical spacing of H2/H3's
+   * i2ptunnel:
+     - Remove redundant labels and spans for keyaccess
+     - Edit Server:
+       - Shift Local Destination / Private Key file to share table row
+       - Move "Use SSL to connect to target" to Target Port column
+     - Add translation tagging for title tags
+     - Remove redundant title tags and provide enhanced strings for features
+       that benefit from clarification
+     - Move title tags to <label> where applicable
+     - Fixed Cancel button on registration so it now jumps back to the list page
+     - textareas for registration page and local destination on edit server page
+       changed to divs
+       - Scrollbars hidden until mouseover, 1 click to select content
+       - Responsive width, tabindex="0"
+     - Fix overflow issue on select dropdowns (edit server/client -> tunnel
+       options) in Chrome / Blink
+     - More generous vertical padding for th (responsive)
+     - Larger h2/h3s (responsive)
+     - Increase spacing between panels in iframe mode
    * SusiDNS: Change address helper icon to add book icon
    * i2psnark:
      - Remove font-adjust-size (ubergine/vanilla)