- first review of Settings_*.inc, IndexShare_p and IndexControl regarding XHTML

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@3103 6c8d7289-2bf4-0310-a012-ef5d649a1542

1 files changed, 42 insertions, 24 deletions

diff --git a/htroot/Settings_ProxyAccess.inc b/htroot/Settings_ProxyAccess.inc
index cfc0ddf71..1e64764db 100644
--- a/htroot/Settings_ProxyAccess.inc
+++ b/htroot/Settings_ProxyAccess.inc
@@ -1,41 +1,59 @@
-<p><form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">

+<form action="SettingsAck_p.html" method="post" enctype="multipart/form-data">

 <fieldset><legend id="ProxyAccess">Proxy Access Settings</legend>

-These settings configure the access method to your own http proxy and server.

-All traffic is routed throug one single port, for both proxy and server.<br />

-<br /><strong>Server/Proxy Port Configuration</strong><br />

-<p>The socket addresses where YaCy should listen for incoming connections from other YaCy peers or http clients.<br />

-You have four possibilities to specify the address:<ul>

-<li>defining a port only (<em>e.g. 8080</em>)</li>

-<li>defining IP address and port (<em>e.g. 192.168.0.1:8080</em>)</li>

-<li>defining host name and port (<em>e.g. home:8080</em>)</li>

-<li>defining interface name and port (<em>e.g. #eth0:8080</em>)</li>

-</ul><br />

-<em>Hint: Dont forget to change your firewall configuration after you have changed the port.</em>

+<p>

+  These settings configure the access method to your own http proxy and server.

+  All traffic is routed throug one single port, for both proxy and server.<br />

+  <br />

+  <strong>Server/Proxy Port Configuration</strong>

+</p>

+<p>

+  The socket addresses where YaCy should listen for incoming connections from other YaCy peers or http clients.<br />

+  You have four possibilities to specify the address:

 </p>

+<ul>

+  <li>defining a port only (<em>e.g. 8080</em>)</li>

+  <li>defining IP address and port (<em>e.g. 192.168.0.1:8080</em>)</li>

+  <li>defining host name and port (<em>e.g. home:8080</em>)</li>

+  <li>defining interface name and port (<em>e.g. #eth0:8080</em>)</li>

+</ul>

+<p><em>Hint: Dont forget to change your firewall configuration after you have changed the port.</em></p>

 <table border="0" cellspacing="5">

   <tr valign="top">

-    <td>Proxy and http-Server Administration Port:</td>

-    <td><input name="port" type="text" size="30" maxlength="30" value="#[port]#"></td>

+    <td><label for="port">Proxy and http-Server Administration Port</label>:</td>

+    <td><input name="port" id="port" type="text" size="30" maxlength="30" value="#[port]#" /></td>

     <td><em>Changes will take effect in 5-10 seconds</em></td>

   </tr> 

 </table>

 

-<p><strong>Server Access Restrictions</strong><br /><br />You can restrict the access to this proxy/server using a two-stage security barrier:

+<p>

+  <strong>Server Access Restrictions</strong><br />

+  <br />

+  You can restrict the access to this proxy/server using a two-stage security barrier:

+</p>

 <ul>

-<li>define an <em>access domain</em> with a list of granted client IP-numbers or with wildcards</li>

-<li>define an <em>user account</em> with an user:password - pair</li>

-</ul><br />

-

-<p>This is the account that restricts access to the proxy function. You probably don't want to share the proxy to the internet, so you should set the IP-Number Access Domain to a pattern that corresponds to you local intranet. The default setting should be right in most cases. If you want, you can also set a proxy account so that every proxy user must authenticate first, but this is rather unusual.</p>

+  <li>define an <em>access domain</em> with a list of granted client IP-numbers or with wildcards</li>

+  <li>define an <em>user account</em> with an user:password - pair</li>

+</ul>

 <p>

+  This is the account that restricts access to the proxy function.

+  You probably don't want to share the proxy to the internet, so you should set the

+  IP-Number Access Domain to a pattern that corresponds to you local intranet.

+  The default setting should be right in most cases. If you want, you can also set a proxy account

+  so that every proxy user must authenticate first, but this is rather unusual.

+</p>

 <table border="0" cellspacing="5">

   <tr valign="top">

-    <td>IP-Number filter:</td>

-    <td colspan ="2"><input name="proxyfilter" type="text" size="50" maxlength="1000" value="#[proxyfilter]#"></td>

+    <td><label for="filter">IP-Number filter</label>:</td>

+    <td colspan ="2">

+      <input name="proxyfilter" id="filter" type="text" size="50" maxlength="1000" value="#[proxyfilter]#" />

+    </td>

   </tr>

   <tr valign="top">

-    <td>Accounts:</td>

-    <td><input name="use_proxyaccounts" type="checkbox" size="16" maxlength="16" value="on" #(use_proxyAccounts)#::checked#(/use_proxyAccounts)#> Use <a href="User_p.html">Proxy Accounts</a></td>

+    <td><label for="accounts">Accounts</label>:</td>

+    <td>

+      <input name="use_proxyaccounts" id="accounts" type="checkbox" size="16" maxlength="16" value="on"#(use_proxyAccounts)#:: checked="checked"#(/use_proxyAccounts)# />

+      Use <a href="User_p.html">Proxy Accounts</a>

+    </td>

   </tr>

   <tr valign="top">

     <td colspan="2"><input type="submit" name="proxyaccount" value="Submit"></td>