gui updates

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

2 files changed, 19 insertions, 7 deletions

diff --git a/squid-advanced-html.lsp b/squid-advanced-html.lsp
index f65a19b..5366eac 100644
--- a/squid-advanced-html.lsp
+++ b/squid-advanced-html.lsp
@@ -13,23 +13,27 @@
 ?>
 <h1>Web Proxy Configuration</h1>
 <p>
+<dl>
 <dt>
-  <div style="color: #ff2020; font-weight: bold;">WARNING:</div><br>
+  <div class="attention">WARNING:</div><br>
   Modifying the web proxy configuration file is generally not necessary.
   You must be familiar with the configuration file before proceeding.
 </dt>
+</dl>
 </p>
 
 <h2>Status</h2>
 <form action="" method="POST">
+<dl>
 <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>
+<dd><input class="submit" type="submit" name="srvcmd" value="start" <? io.write( srv1fill ) ?>>
+<input class="submit" type="submit" name="srvcmd" value="stop" <? io.write( srv2fill ) ?>>
+<input class="submit" type="submit" name="srvcmd" value="restart" <? io.write( srv2fill ) ?>></dd>
+</dl>
 </form>
 
 <p>
-<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre>
+<pre class="attention"><? io.write( service.message ) ?></pre>
 </p>
 
 <p>
@@ -40,7 +44,7 @@ until you restart the service.
 
 <h2>Configuration</h2>
 <form action="" method="POST">
-<textarea name="config" style="width:100%;"><? io.write( service.config ) ?></textarea>
+<textarea name="config"><? io.write( service.config ) ?></textarea>
 
 <h3>Save Changes</h3>
 <dt>Save the contents of the box above</dt><dd><input class="submit" type="submit" name="cmd" value="save"></dd>
diff --git a/squid-basic-html.lsp b/squid-basic-html.lsp
index 127a03b..5171833 100644
--- a/squid-basic-html.lsp
+++ b/squid-basic-html.lsp
@@ -26,7 +26,7 @@ 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.</p>
-<p>This page determines the general operational settings for squid.</p>
+<p>This page determines the general operational settings for squid.</p><p></p>
 
 <h2>Status</h2>
 
@@ -44,12 +44,15 @@ until you restart the service.</DD>
 <p class="error"><? io.write( service.message ) ?></p>
 </form>
 
+<p></p>
+
 <h2>Configuration</h2>
 <form action="" method="POST">
 <dl>
 <DT>Config status</DT><DD class="error"><? io.write(service.error ) ?></DD>
 </dl>
 
+<p></p>
 <h3>Primary Listener service</h3>
 <p>These parameters define the interface and port that the web proxy uses to accept connections.</p>
 
@@ -58,6 +61,7 @@ until you restart the service.</DD>
 <dt>proxyport</dt><dd><input class="text" type="text" name="proxyport" value="<? io.write( config.proxyport.value ) ?>"></dd>
 </dl>
 
+<p></p>
 <h3>Filter Service</h3>
 <p>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. 
@@ -72,6 +76,7 @@ It is safe to leave this at the default settings.</p>
 <dt>FilterRegex</dt><dd><input class="text" type="text" name="filterregex" value="<? io.write( config.filterregex.value ) ?>"></dd>
 </dl>
 
+<p></p>
 <h3>Access Logs</h3>
 <p>This determines if the visited sites are logged or not.</p>
 <dl>
@@ -80,6 +85,7 @@ It is safe to leave this at the default settings.</p>
 <input type="radio" name="accesslog" value="yes"<? ifthen( config.accesslog.value, "yes", " checked" ); ?>> Use access log</dd>
 </dl>
 
+<p></p>
 <h3>Disk Cache Parameters</h3>
 <p>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.</p>
@@ -90,6 +96,7 @@ but it requires a local hard disk.</p>
 <input class="radio" type="radio" name="diskcache" value="yes"<? ifthen( config.diskcache.value, "yes", " checked" ); ?>>Yes</dd>
 </dl>
 
+<p></p>
 <h3>Allowed Ports</h3>
 <p>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 
@@ -102,6 +109,7 @@ servers run on other ports as well. These fields list all ports and port ranges
 <dt>SSL_ports</dt><dd><input class="text" type="text" name="sslports" value="<? io.write( config.sslports.value ) ?>" style="width:400px;"></dd>
 </dl>
 
+<p></p>
 <h2>Save changes</h2>
 <dl>
 <DT>Save above changes</DT><DD><input class="submit" type="submit" name="cmd" value="save"></DD>