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

6 files changed, 35 insertions, 35 deletions

diff --git a/squid-authentication-html.lsp b/squid-authentication-html.lsp
index 21cf071..8a2d933 100644
--- a/squid-authentication-html.lsp
+++ b/squid-authentication-html.lsp
@@ -45,7 +45,7 @@ the changes will not be <i>applied</i> until you restart the service.</dd>
 </form>
 
 <p>
-<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre>
+<pre class="attention"><? io.write( service.message ) ?></pre>
 </p>
 
 <form action="" method="POST">
diff --git a/squid-basic-html.lsp b/squid-basic-html.lsp
index 5171833..e92c3cd 100644
--- a/squid-basic-html.lsp
+++ b/squid-basic-html.lsp
@@ -37,9 +37,9 @@ such as DansGuardian.</p>
 <DT>Process information</DT><DD>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.</DD>
-<DT>Daemon control</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>
+<DT>Daemon control</DT><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>
 <p class="error"><? io.write( service.message ) ?></p>
 </form>
@@ -56,10 +56,8 @@ until you restart the service.</DD>
 <h3>Primary Listener service</h3>
 <p>These parameters define the interface and port that the web proxy uses to accept connections.</p>
 
-<dl>
-<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>
-</dl>
+<dl><dt>proxyip</dt><dd><input class="text" type="text" name="proxyip" value="<? io.write( config.proxyip.value ) ?>"></dd></dl>
+<dl><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>
@@ -105,8 +103,8 @@ servers run on other ports as well. These fields list all ports and port ranges
 <p>It is safe to leave these values at their default values.</p>
 
 <dl>
-<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>
+<dt>Safe_ports</dt><dd><input class="text" type="text" name="safeports" value="<? io.write( config.safeports.value ) ?>></dd>
+<dt>SSL_ports</dt><dd><input class="text" type="text" name="sslports" value="<? io.write( config.sslports.value ) ?>"></dd>
 </dl>
 
 <p></p>
diff --git a/squid-dep-html.lsp b/squid-dep-html.lsp
index 8cd2bcb..3cacc54 100644
--- a/squid-dep-html.lsp
+++ b/squid-dep-html.lsp
@@ -12,5 +12,5 @@ If you press the button below a template config file will be created which holds
 then modify this config file as you like, just leave the tags where they are.
 </p>
 <form action="" method="POST">
-<dt>Action</dt><dd><input class="submit" type="submit" name="cmd" value="create file"></dd>
+<dl><dt>Action</dt><dd><input class="submit" type="submit" name="cmd" value="create file"></dd></dl>
 </form>
diff --git a/squid-digest-html.lsp b/squid-digest-html.lsp
index d459300..9c9e9a3 100644
--- a/squid-digest-html.lsp
+++ b/squid-digest-html.lsp
@@ -21,7 +21,7 @@
 <p></p>
 <h2>User List</h2>
 <form action="" method="POST">
-<textarea name="userlist" style="width:100%;"><? io.write( service.config ) ?></textarea>
+<textarea name="userlist"><? io.write( service.config ) ?></textarea>
 <p></p>
 <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-ntlm-html.lsp b/squid-ntlm-html.lsp
index 8fe0c4b..9897532 100644
--- a/squid-ntlm-html.lsp
+++ b/squid-ntlm-html.lsp
@@ -27,35 +27,35 @@ service must be (re)started. It is only necessary to join the domain once.
 </p>
 
 <h2>Status</h2>
-<dt>Program version</dt><dd><? io.write( form.info.version.value ) ?></dd>
-<dt>Process status</dt><dd><? io.write( form.info.status.value ) ?></dd>
-<dt>Process information</dt><dd>This process runs as a service. When you make 
+<dl><dt>Program version</dt><dd><? io.write( form.info.version.value ) ?></dd></dl>
+<dl><dt>Process status</dt><dd><? io.write( form.info.status.value ) ?></dd></dl>
+<dl><dt>Process information</dt><dd>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.</dd>
+the changes will not be <i>applied</i> until you restart the service.</dd></dl>
 <form action="" method="POST">
-<dt>Daemon control</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>
+<dl><dt>Daemon control</dt>
+<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=error><? io.write( service.message ) ?></pre>
 </p>
 
 <form action="" method="POST">
 <h2>Configuration</h2>
-<dt>Domain</dt><dd><input class="input" type="text" name="domain" value="<? io.write ( config.domain.value ) ?>"></dd>
-<dt>DC NetBIOS Name</dt><dd><input class="input" type="text" name="domain" value="<? io.write ( config.dcnetbiosname.value ) ?>"></dd>
-<dt>DC IP Address</dt><dd><input class="input" type="text" name="domain" value="<? io.write ( config.dcipaddress.value ) ?>"></dd>
-<dt>Interface</dt><dd><input class="input" type="text" name="domain" value="<? io.write ( config.interface.value ) ?>"></dd>
-<dt>Loglevel</dt><dd><input class="input" type="text" name="domain" value="<? io.write ( config.loglevel.value ) ?>"></dd>
-<dt>Account</dt><dd><input class="input" type="text" name="domain" value=""></dd>
-<dt>Password</dt><dd><input class="input" type="text" name="domain" value=""></dd>
+<dl><dt>Domain</dt><dd><input class="input" type="text" name="domain" value="<? io.write ( config.domain.value ) ?>"></dd></dl>
+<dl><dt>DC NetBIOS Name</dt><dd><input class="input" type="text" name="domain" value="<? io.write ( config.dcnetbiosname.value ) ?>"></dd></dl>
+<dl><dt>DC IP Address</dt><dd><input class="input" type="text" name="domain" value="<? io.write ( config.dcipaddress.value ) ?>"></dd></dl>
+<dl><dt>Interface</dt><dd><input class="input" type="text" name="domain" value="<? io.write ( config.interface.value ) ?>"></dd></dl>
+<dl><dt>Loglevel</dt><dd><input class="input" type="text" name="domain" value="<? io.write ( config.loglevel.value ) ?>"></dd></dl>
+<dl><dt>Account</dt><dd><input class="input" type="text" name="domain" value=""></dd></dl>
+<dl><dt>Password</dt><dd><input class="input" type="text" name="domain" value=""></dd></dl>
 
 <h3>Action</h3>
-<dt>What to do?</dt>
+<dl><dt>What to do?</dt>
 <dd><input class="submit" type="submit" name="cmd" value="join domain">
-<input class="submit" type="submit" name="cmd" value="save"></dd>
+<input class="submit" type="submit" name="cmd" value="save"></dd></dl>
 </form>
 
diff --git a/squid-saccess-html.lsp b/squid-saccess-html.lsp
index eb14ff5..64ac5c4 100644
--- a/squid-saccess-html.lsp
+++ b/squid-saccess-html.lsp
@@ -16,19 +16,20 @@
 <p>
   The squid web proxy server is normally configured to require authenticated access. In some cases, such
   as anti-virus update programs, the process cannot authenticate itself to the proxy server. For these
-  <i>special</i> cases, it is possible to have squid allow anonymous access to the Internet.<br><br>
-  You may choose to specify the special cases by specific ip address, browser identification or destination
+  <i>special</i> cases, it is possible to have squid allow anonymous access to the Internet.</p>
+<p>You may choose to specify the special cases by specific ip address, browser identification or destination
   domain.
 </p>
 
 <form action="" method="POST">
+<p></p>
 <h2>Special IP Addresses</h2>
 <p>
 If you wish to specify hosts that may access the Internet by IP address, 
 enter the address(es) in the box below, one per line.
 </p>
 <p>
-<textarea name="s_ip" style="width:100%;"><? io.write( service.config.s_ip ) ?></textarea>
+<textarea name="s_ip"><? io.write( service.config.s_ip ) ?></textarea>
 </p>
 
 <h2>Browser Identification</h2>
@@ -39,7 +40,7 @@ of browser will be allowed anonymous access. Enter the browser identification(s)
 in the box below, one per line. Regular expressions are allowed.
 </p>
 <p>
-<textarea name="s_browser" style="width:100%;"><? io.write( service.config.s_browser ) ?></textarea>
+<textarea name="s_browser"><? io.write( service.config.s_browser ) ?></textarea>
 </p>
 
 <h2>Special Domains</h2>
@@ -49,9 +50,10 @@ may specify if here. This will allow anonymous access to the domains listed.
 Enter the domain url below. Regular expressions are allowed.
 </p>
 <p>
-<textarea name="s_domain" style="width:100%;"><? io.write( service.config.s_domain ) ?></textarea>
+<textarea name="s_domain"><? io.write( service.config.s_domain ) ?></textarea>
 </p>
 
+<p></p>
 <h3>Save Changes</h3>
 <dt>Save changes of the above boxes</dt><dd><input class="submit" type="submit" name="cmd" value="save"></dd>
 </form>