further step in adapting css changes

git-svn-id: svn://svn.alpinelinux.org/acf/squid/trunk@512 ab2d0c66-481e-0410-8bed-d214d4d58bed

1 files changed, 31 insertions, 37 deletions

diff --git a/squid-basic-html.lsp b/squid-basic-html.lsp
index 3f55aa5..4768f28 100644
--- a/squid-basic-html.lsp
+++ b/squid-basic-html.lsp
@@ -19,41 +19,42 @@
    
 ?>
 <h1>Web Proxy</h1>
+<p>
 Squid is a web proxy server. It makes web requests in behalf of the client, and 
 inspecting the returned and optionally caches that content so that the next time 
 a client request is made, the content can be served from local disk. This can make 
 web surfing faster. Squid can also forward its requests on to a content filter, 
 such as DansGuardian.<br><br>
-This page determines the general operational settings for squid.<br><br>
+This page determines the general operational settings for squid.</p>
 
-<h1>Status</h1>
+<h2>Status</h2>
 <form action="" method="POST">
-<table><tr>
-<td>squid is: <b><? io.write( service.status ) ?> </b> </td>
-<td><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?> style="width:100px"></td>
-<td><input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?> style="width:100px"></td>
-<td><input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?> style="width:100px"></td>
-</tr></table>
+<p>
+<dt>squid is: <? io.write( service.status ) ?> </dt>
+<dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?> style="width:100px"> 
+<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?> style="width:100px">
+<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?> style="width:100px"></dd>
+</p>
+<p class="error"><? io.write( service.message ) ?></p>
 </form>
 
-<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre><br>
 
 This process runs as a service. When you make and save changes, the configuration 
 files for the service are changed. However, the changes will not be <i>applied</i> 
 until you restart the service.<br><br>
 
 <form action="" method="POST">
-<h1>Configuration</h1>
+<h2>Configuration</h2>
 <? io.write("<pre style=\"color: #ff2020;\">" .. service.error .. "</pre><br>\n" ) ?>
-<h2>Primary Listener service</h2>
+<h3>Primary Listener service</h3>
 These parameters define the interface and port that the web proxy uses to accept connections.<br><br>
 
 <table>
-<tr><td align="right" style="width:80px"><b>proxyip</b></td><td><input class="text" type="text" name="proxyip" value="<? io.write( config.proxyip.value ) ?>"></td></tr>
-<tr><td align="right" style="width:80px"><b>proxyport</b></td><td><input class="text" type="text" name="proxyport" value="<? io.write( config.proxyport.value ) ?>"></td></tr>
+<dt>proxyip</dt><dd><input class="text" type="text" name="proxyip" value="<? io.write( config.proxyip.value ) ?>"></dd>
+<dt>proxyport</dt><dd><input class="text" type="text" name="proxyport" value="<? io.write( config.proxyport.value ) ?>"></dd>
 </table><br>
 
-<h2>Filter Service</h2>
+<h3>Filter Service</h3>
 These parameters define the ip address and port that the web proxy forwards requests to. 
 This is typically the address that DansGuardian (Web Content Filter) is listening on. 
 If you want this web proxy to handle retrieving the content, then leave these blank.<br><br>
@@ -62,41 +63,34 @@ Filtering is a cpu-intensive process. The FilterRegex is a list of regular expre
 for filtering. Anything not matching the regular expression filter will bypass the content filter. 
 It is safe to leave this at the default settings.<br><br>
 
-<table>
-<tr><td align="right" style="width:80px"><b>filterip</b></td><td><input class="text" type="text" name="filterip" value="<? io.write( config.filterip.value ) ?>"</td></tr>
-<tr><td align="right" style="width:80px"><b>filterport</b></td><td><input class="text" type="text" name="filterport" value="<? io.write( config.filterport.value ) ?>"></td></tr>
-<tr><td align="right" style="width:80px"><b>FilterRegex</b></td><td><input class="text" type="text" name="filterregex" value="<? io.write( config.filterregex.value ) ?>" style="width:400px;"></td></tr>
-</table><br>
+<dt>filterip</dt><dd><input class="text" type="text" name="filterip" value="<? io.write( config.filterip.value ) ?>"</dd>
+<dt>filterport</dt><dd><input class="text" type="text" name="filterport" value="<? io.write( config.filterport.value ) ?>"></dd>
+<dt>FilterRegex</dt><dd><input class="text" type="text" name="filterregex" value="<? io.write( config.filterregex.value ) ?>" style="width:400px;"></dd>
 
-<h2>Access Logs</h2>
-This determines if the visited sites are logged or not.<br><br>
-
-<table>
-<tr><td><input type="radio" name="accesslog" value="no"<? ifthen( config.accesslog.value, "no", " checked" ); ?>> No access log</td></tr>
-<tr><td><input type="radio" name="accesslog" value="yes"<? ifthen( config.accesslog.value, "yes", " checked" ); ?>> Use access log</td></tr>
-</table><br>
+<h3>Access Logs</h3>
+<p>This determines if the visited sites are logged or not.</p>
+<dt>Log visited sites</dt>
+<dd><input type="radio" name="accesslog" value="no"<? ifthen( config.accesslog.value, "no", " checked" ); ?>> No access log
+<input type="radio" name="accesslog" value="yes"<? ifthen( config.accesslog.value, "yes", " checked" ); ?>> Use access log</dd>
 
-<h2>Disk Cache Parameters</h2>
+<h3>Disk Cache Parameters</h3>
 This determines if the disk is used for caching. This can speed up web surfing when many clients are accessing the Internet, 
 but it requires a local hard disk.<br><br>
 
-<table>
-<tr><td><input type="radio" name="diskcache" value="no"<? ifthen( config.diskcache.value, "no", " checked" ); ?>>No caching</td></tr>
-<tr><td><input type="radio" name="diskcache" value="yes"<? ifthen( config.diskcache.value, "yes", " checked" ); ?>>Use disk cache</td></tr>
-</table><br>
+<dt>Enable disk caching</dt>
+<dd><input class="radio" type="radio" name="diskcache" value="no"<? ifthen( config.diskcache.value, "no", " checked" ); ?>>No
+<input class="radio" type="radio" name="diskcache" value="yes"<? ifthen( config.diskcache.value, "yes", " checked" ); ?>>Yes</dd>
 
-<h2>Allowed Ports</h2>
+<h3>Allowed Ports</h3>
 Web servers typically run on port 80; SSL (https) servers typically run on port 443. Some web 
 servers run on other ports as well. These fields list all ports and port ranges that are considered 
 "safe" for the web proxy to handle.<br><br>
 
 It is safe to leave these values at their default values.<br><br>
 
-<table>
-<tr><td align="right" style="width:80px"><b>Safe_ports</b></td><td><input class="text" type="text" name="safeports" value="<? io.write( config.safeports.value ) ?>" style="width:400px;"></td></tr>
-<tr><td align="right" style="width:80px"><b>SSL_ports</b></td><td><input class="text" type="text" name="sslports" value="<? io.write( config.sslports.value ) ?>" style="width:400px;"></td></tr>
-</table><br><br>
+<dt>Safe_ports</dt><dd><input class="text" type="text" name="safeports" value="<? io.write( config.safeports.value ) ?>" style="width:400px;"></dd>
+<dt>SSL_ports</dt><dd><input class="text" type="text" name="sslports" value="<? io.write( config.sslports.value ) ?>" style="width:400px;"></dd>
 
-<input class="submit" type="submit" name="cmd" value="save" style="width:100%"><br>
+<input class="submit" type="submit" name="cmd" value="save"><br>
 </form><br>