From d3179cb78a9e75faffeba5a92d3f43a4872338a4 Mon Sep 17 00:00:00 2001
From: Andreas Brodmann <andreas.brodmann@gmail.com>
Date: Wed, 16 Jan 2008 14:47:54 +0000
Subject: unification of the different squid-views

git-svn-id: svn://svn.alpinelinux.org/acf/squid/trunk@591 ab2d0c66-481e-0410-8bed-d214d4d58bed
---
 squid-authentication-html.lsp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'squid-authentication-html.lsp')

diff --git a/squid-authentication-html.lsp b/squid-authentication-html.lsp
index feef6c5..21cf071 100644
--- a/squid-authentication-html.lsp
+++ b/squid-authentication-html.lsp
@@ -6,7 +6,7 @@
    
    local srv1fill = ""
    local srv2fill = "disabled"
-   if service.status == "running" then
+   if form.info.status.value == "running" then
    	srv1fill = "disabled"
    	srv2fill = ""
    end
@@ -19,6 +19,7 @@
    
 ?>
 <h1>Web Proxy</h1>
+<h2>General Information</h2>
 <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 
@@ -31,8 +32,13 @@ This page lets you modify the authentication scheme of squid.
 </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 
+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>
 <form action="" method="POST">
-<dt>squid is: <? io.write( service.status ) ?></dt>
+<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>
@@ -42,12 +48,6 @@ This page lets you modify the authentication scheme of squid.
 <pre style="color: #ff2020;"><? io.write( service.message ) ?></pre>
 </p>
 
-<p>
-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.
-</p>
-
 <form action="" method="POST">
 <h2>Configuration</h2>
 
-- 
cgit v1.2.3