1 files changed, 25 insertions, 21 deletions
diff --git a/squid-advanced-html.lsp b/squid-advanced-html.lsp
index 328680e..1d933b0 100644
--- a/squid-advanced-html.lsp
+++ b/squid-advanced-html.lsp
@@ -1,4 +1,6 @@
 <? 
+require("viewfunctions")
+
    local form = ... 
    local data = form.option
    local service = form.service
@@ -11,8 +13,17 @@
    end
    
 ?>
-<h1>Web Proxy Configuration</h1>
-<p>
+<H1>SYSTEM INFO</H1>
+<DL>
+<? 
+local myform = form.info
+local tags = { "status", "version", "autostart", }
+displayinfo(myform,tags,"viewonly")
+?>
+</DL>
+
+
+<h1>Advanced configuration</h1>
 <dl>
 <dt>Warning</dt>
 <dd class="attention">
@@ -20,35 +31,28 @@
   You must be familiar with the configuration file before proceeding.
 </dd>
 </dl>
-</p>
 
-<p></p>
-<h2>Status</h2>
+<h2>Configuration</h2>
 <form action="" method="POST">
+<textarea name="config"><? io.write( service.config ) ?></textarea>
+
+<h3>Save Changes</h3>
 <dl>
-<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>Save the contents of the box above</dt><dd><input class="submit" type="submit" name="cmd" value="save"></dd>
 <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 ) ?>>
-<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 class="attention"><? io.write( service.message ) ?></pre>
-</p>
-
-<h2>Configuration</h2>
+<h1>MANAGEMENT</h1>
 <form action="" method="POST">
-<textarea name="config"><? io.write( service.config ) ?></textarea>
-<p></p>
-<h3>Save Changes</h3>
 <dl>
-<dt>Save the contents of the box above</dt><dd><input class="submit" type="submit" name="cmd" value="save"></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 ) ?>>
+<pre class="attention"><? io.write( service.message ) ?></pre></dd>
 </dl>
-<p></p>
 </form>
+