From f6b08443f0f55047af1262a0f049871cffc8f53b Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Mon, 30 Jan 2017 22:44:28 +0100
Subject: [PATCH] adjust column layout in Settings_Proxy.inc

---
 htroot/Settings_Proxy.inc | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/htroot/Settings_Proxy.inc b/htroot/Settings_Proxy.inc
index 365cfa8ea..2f02d1401 100644
--- a/htroot/Settings_Proxy.inc
+++ b/htroot/Settings_Proxy.inc
@@ -7,51 +7,50 @@
   <tr valign="top">
     <td><label for="rem_prxy">Use remote proxy</label>:</td>
     <td><input type="checkbox" name="remoteProxyUse" id="rem_prxy"#(remoteProxyUseChecked)#:: checked="checked"#(/remoteProxyUseChecked)# /></td>
-    <td>&nbsp;</td>
     <td>Enables the usage of the remote proxy by yacy</td>
   </tr>
   <tr valign="top">
-    <td colspan="2"><label for="prxy4ssl">Use remote proxy for HTTPS</label></td>
+    <td><label for="prxy4ssl">Use remote proxy for HTTPS</label></td>
     <td><input type="checkbox" name="remoteProxyUse4SSL" id="prxy4ssl"#(remoteProxyUse4SSL)#:: checked="checked"#(/remoteProxyUse4SSL)# /></td>
-  	<td>Specifies if YaCy should forward ssl connections to the remote proxy.</td>  
+    <td>Specifies if YaCy should forward ssl connections to the remote proxy.</td>  
   </tr>  
-  <tr><td colspan="4"><hr /></td></tr>
+  <tr><td colspan="3"><hr /></td></tr>
   
   <!-- remote proxy hostname + port -->
   <tr valign="top">
     <td><label for="host">Remote proxy host</label>:</td>
-    <td colspan="2"><input name="remoteProxyHost" id="host" type="text" size="32" maxlength="128" value="#[remoteProxyHost]#" /></td>
+    <td><input name="remoteProxyHost" id="host" type="text" size="32" maxlength="128" value="#[remoteProxyHost]#" /></td>
     <td>The ip address or domain name of the remote proxy</td>
   </tr>
   <tr valign="top">
     <td><label for="port">Remote proxy port</label>:</td>
-    <td colspan="2"><input name="remoteProxyPort" id="port" type="text" size="5" maxlength="5" value="#[remoteProxyPort]#" /></td>
+    <td><input name="remoteProxyPort" id="port" type="text" size="5" maxlength="5" value="#[remoteProxyPort]#" /></td>
     <td>the port of the remote proxy</td>
   </tr>
   
   <!-- remote proxy username + pwd -->
   <tr valign="top">
     <td><label for="user">Remote proxy user</label>:</td>
-    <td colspan="2"><input name="remoteProxyUser" type="text" id="user" size="32" maxlength="128" value="#[remoteProxyUser]#" /></td>
+    <td><input name="remoteProxyUser" type="text" id="user" size="32" maxlength="128" value="#[remoteProxyUser]#" /></td>
     <td>&nbsp;</td>
   </tr>
     <tr valign="top">
     <td><label for="pwd">Remote proxy password</label>:</td>
-    <td colspan="2"><input name="remoteProxyPwd" id="pwd" type="password" size="32" maxlength="128" value="#[remoteProxyPwd]#" /></td>
+    <td><input name="remoteProxyPwd" id="pwd" type="password" size="32" maxlength="128" value="#[remoteProxyPwd]#" /></td>
     <td>&nbsp;</td>
   </tr>  
-  <tr><td colspan="4"><hr /></td></tr>
+  <tr><td colspan="3"><hr /></td></tr>
   
   <!-- no remote proxy pattern -->
   <tr valign="top">
     <td><label for="no_prxy">No-proxy adresses</label>:</td>
-    <td colspan="2"><input name="remoteProxyNoProxy" type="text" id="no_prxy" size="32" maxlength="5000" value="#[remoteProxyNoProxy]#" /></td>
+    <td><input name="remoteProxyNoProxy" type="text" id="no_prxy" size="32" maxlength="5000" value="#[remoteProxyNoProxy]#" /></td>
     <td>IP addresses for which the remote proxy should not be used</td>
   </tr>
   
   <!-- submit button -->
   <tr valign="top">
-    <td colspan="4"><input type="submit" name="proxysettings" class="btn btn-primary" value="Submit" /> <em>Changes will take effect immediately.</em></td>
+    <td colspan="3"><input type="submit" name="proxysettings" class="btn btn-primary" value="Submit" /> <em>Changes will take effect immediately.</em></td>
   </tr>
 </table>
 </fieldset>