summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Brodmann <andreas.brodmann@gmail.com>2008-01-18 14:01:35 +0000
committerAndreas Brodmann <andreas.brodmann@gmail.com>2008-01-18 14:01:35 +0000
commit84235a21498d5294ed8b00b9b04f87af7ec8389f (patch)
treeeb959fc327e9703a97957747f55dcde67f594a44
parentbce897383c5090870e15f9ccd7d73922750d82ce (diff)
downloadacf-dansguardian-84235a21498d5294ed8b00b9b04f87af7ec8389f.tar.bz2
acf-dansguardian-84235a21498d5294ed8b00b9b04f87af7ec8389f.tar.xz
git-svn-id: svn://svn.alpinelinux.org/acf/dansguardian/trunk@624 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--dansguardian-advanced-html.lsp18
-rw-r--r--dansguardian-category-html.lsp23
-rw-r--r--dansguardian-edit-html.lsp10
-rw-r--r--dansguardian-general-html.lsp32
-rw-r--r--dansguardian-plain-html.lsp32
5 files changed, 51 insertions, 64 deletions
diff --git a/dansguardian-advanced-html.lsp b/dansguardian-advanced-html.lsp
index 3c0fc2b..0f6b78a 100644
--- a/dansguardian-advanced-html.lsp
+++ b/dansguardian-advanced-html.lsp
@@ -33,21 +33,21 @@ This page lets you manually configure the filter rule files for DansGuardian.
</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
+<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>
+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>
<p class="error"><? io.write( service.message ) ?></p>
</form>
<h2>Configuration</h2>
-<pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre>
+<pre class=error><? io.write( service.cfgerr ) ?></pre>
<h3>Files</h3>
<p>
Click on one of the files to edit it.
diff --git a/dansguardian-category-html.lsp b/dansguardian-category-html.lsp
index d9ddcac..32ef877 100644
--- a/dansguardian-category-html.lsp
+++ b/dansguardian-category-html.lsp
@@ -19,32 +19,31 @@
?>
<h1>Content Filter</h1>
-DansGuardian is web content filtering software. It works as a web proxy,
+<p>DansGuardian is web content filtering software. It works as a web proxy,
making web requests in behalf of the client, and inspecting the returned
content before passing on to the client. DansGuardian uses phraselists to
identify harmful content. This means that updated "blacklists" are
generally not necessary. DansGuardian must be used in combination with a
"smart proxy", such as squid.
-<b>This page lets you manually add/remove categories for DansGuardian.</b><br><br>
+<b>This page lets you manually add/remove categories for DansGuardian.</b></p>
<h1>Status</h1>
<form action="" method="POST">
-<table><tr>
-<td>dansguardian 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>
+<dl><dt>dansguardian is:</dt><dd><b><? io.write( service.status ) ?></b></dd></dl>
+<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>
-<pre style="color: #ff2020;"><? io.write( service.message ) ?></pre><br>
+<p><pre class=error><? io.write( service.message ) ?></pre></p>
-This process runs as a service. When you make and save changes, the configuration
+<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.<br><br><br>
+until you restart the service.</p>
<h1>Categories</h1>
-<pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre><br>
+<p><pre class=error><? io.write( service.cfgerr ) ?></pre></p>
<h2>Delete Category</h2>
<form action="" method="POST">
diff --git a/dansguardian-edit-html.lsp b/dansguardian-edit-html.lsp
index fe6205c..1f34d30 100644
--- a/dansguardian-edit-html.lsp
+++ b/dansguardian-edit-html.lsp
@@ -21,15 +21,13 @@
<h1>Content Filter (<? io.write( service.name ) ?>)</h1>
<form action="" method="POST">
-<pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre><br>
-These parameters define the interface and port that Dansguardian uses to accept connections.<br><br>
+<p><pre class=error><? io.write( service.cfgerr ) ?></pre></p>
+<p>These parameters define the interface and port that Dansguardian uses to accept connections.</p>
-<table>
-<tr><td><textarea name="config" style="width:100%"><? io.write( service.config ) ?></textarea></td></tr>
-</table><br>
+<textarea name="config"><? io.write( service.config ) ?></textarea>
<input class="text" type="hidden" name="name" value="<? io.write( service.name ) ?>">
<h3>Save Changes</h3>
-<dt>Save the content of the above box</dt><dd><input class="submit" type="submit" name="cmd" value="save" style="width:100px"></dd>
+<dl><dt>Save the content of the above box</dt><dd><input class="submit" type="submit" name="cmd" value="save"></dd></dl>
</form>
diff --git a/dansguardian-general-html.lsp b/dansguardian-general-html.lsp
index 888a19c..10ea6b7 100644
--- a/dansguardian-general-html.lsp
+++ b/dansguardian-general-html.lsp
@@ -32,16 +32,16 @@ This page defines the basic network configuration settings for DansGuardian.
</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 applied until you restart the service.</dd>
+However, the changes will not be applied 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>
@@ -50,21 +50,21 @@ However, the changes will not be applied until you restart the service.</dd>
<form action="" method="POST">
<h2>Configuration</h2>
-<pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre>
+<p><pre class=error><? io.write( service.cfgerr ) ?></pre></p>
<p>
These parameters define the interface and port that Dansguardian uses to accept connections.
</p>
-<dt>filterip</dt><dd><input class="text" type="text" name="filterip" value="<? io.write( config.filterip.value ) ?>" style="width:100px"></dd>
-<dt>filterport</dt><dd><input class="text" type="text" name="filterport" value="<? io.write( config.filterport.value ) ?>" style="width:100px"></dd>
+<dl><dt>filterip</dt><dd><input class="text" type="text" name="filterip" value="<? io.write( config.filterip.value ) ?>" ></dd></dl>
+<dl><dt>filterport</dt><dd><input class="text" type="text" name="filterport" value="<? io.write( config.filterport.value ) ?>" ></dd></dl>
<h3>Proxy service</h3>
<p>
These parameters define the ip address and port that Dansguardian should forward requests on to.
</p>
-<dt>proxyip</dt><dd><input class="text" type="text" name="proxyip" value="<? io.write( config.proxyip.value ) ?>" style="width:100px"></dd>
-<dt>proxyport</dt><dd><input class="text" type="text" name="proxyport" value="<? io.write( config.proxyport.value ) ?>" style="width:100px"></dd>
+<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>
<h3>Filter Actions</h3>
<p>
@@ -73,10 +73,10 @@ determines that the content is inappropriate. The "naughtynesslimit" is more sen
The author recommends 50 for "young children", 100 for "older children" and 160 for "young adults".
</p>
-<dt>accessdeniedaddress</dt><dd><input class="text" type="text" name="accessdeniedaddress" value="<? io.write( config.accessdeniedaddress.value ) ?>" style="width:350px"></dd>
-<dt>naughtynesslimit</dt><dd><input class="text" type="text" name="naughtynesslimit" value="<? io.write( config.naughtynesslimit.value ) ?>" style="width:100px"></dd>
+<dl><dt>accessdeniedaddress</dt><dd><input class="text" type="text" name="accessdeniedaddress" value="<? io.write( config.accessdeniedaddress.value ) ?>"></dd></dl>
+<dl><dt>naughtynesslimit</dt><dd><input class="text" type="text" name="naughtynesslimit" value="<? io.write( config.naughtynesslimit.value ) ?>"></dd></dl>
<h2>Save Changes</h2>
-<dt>Save the above changes?</dt><dd><input class="submit" type="submit" name="cmd" value="save" style="width:100px"></dd>
+<dl><dt>Save the above changes?</dt><dd><input class="submit" type="submit" name="cmd" value="save"></dd></dl>
</form>
diff --git a/dansguardian-plain-html.lsp b/dansguardian-plain-html.lsp
index 2e24fd0..cf76317 100644
--- a/dansguardian-plain-html.lsp
+++ b/dansguardian-plain-html.lsp
@@ -19,24 +19,16 @@
?>
<h1>Content Filter (Plain Config File)</h1>
-<table border="2">
- <tr>
- <td style="width:80%">
- <center>
- <div style="color: #ff2020; font-weight: bold;">WARNING:</div><br>
- Modifying the DansGuardian configuration file is generally not necessary.
- You must be familiar with the configuration file before proceeding.
- </center>
- </td>
- </tr>
-</table><br>
+<p class=warning>WARNING:</p>
+<p>Modifying the DansGuardian configuration file is generally not necessary.
+You must be familiar with the configuration file before proceeding.</p>
<h2>Status</h2>
<form action="" method="POST">
-<dt>dansguardian 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>
+<dl><dt>dansguardian is: <? io.write( service.status ) ?> </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 class="error"><? io.write( service.message ) ?></p>
@@ -48,14 +40,12 @@ until you restart the service.
<form action="" method="POST">
<h2>Configuration</h2>
-<pre style="color: #ff2020;"><? io.write( service.cfgerr ) ?></pre><br>
-These parameters define the interface and port that Dansguardian uses to accept connections.<br><br>
+<p><pre class=error><? io.write( service.cfgerr ) ?></pre></p>
+<p>These parameters define the interface and port that Dansguardian uses to accept connections.</p>
-<table>
-<tr><td><textarea name="config" style="width:100%"><? io.write( service.config ) ?></textarea></td></tr>
-</table><br>
+<textarea name="config"><? io.write( service.config ) ?></textarea>
<h3>Save Changes</h3>
-<dt>Save the contents of the above box</dt><dd><input class="submit" type="submit" name="cmd" value="save" style="width:100px"></dd>
+<dl><dt>Save the contents of the above box</dt><dd><input class="submit" type="submit" name="cmd" value="save"></dd></dl>
</form>