Graphical bugfixes.

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

3 files changed, 5 insertions, 39 deletions

diff --git a/openntpd-config-html.lsp b/openntpd-config-html.lsp
index 34c7b0d..dd330a7 100644
--- a/openntpd-config-html.lsp
+++ b/openntpd-config-html.lsp
@@ -3,11 +3,9 @@
 <h1>SYSTEM INFO</h1>
 
 <dl>
-<dt>Program status
+<dt>Program status</dt>
 <dd><? if (view.status.enabled) then io.write('Enabled') else io.write('Disabled') end ?></dd>
-</dl>
 
-<dl>
 <dt>Program version</dt>
 <dd><?= view.status.version ?></dd>
 </dl>
@@ -22,9 +20,7 @@
 <dl>
 <dt>Set time immediately at startup</dt>
 <dd><input type="checkbox" name="settings_startup" <? if (view.status.setstimeonstartup) then io.write("checked") end ?>></dd>
-</dl>
 
-<dl>
 <dt>Save the above settings</dt>
 <dd><input name="settings_cmd" class="submit" type="submit" value="Save"> (see above)
 </dd>
@@ -51,24 +47,16 @@ for i = 1, table.maxn(view.config.variables.server) do ?>
 </select><BR>
 In most cases you could use <i><b>pool.ntp.org</b></i> or <i><b>[countryname].pool.ntp.org</i></b> (if listed in <i><b>http://www.pool.ntp.org/</b></i>).
 <? if (view.errors.hosts_list) then io.write("<p class=error>"..view.errors.hosts_list.."</p>") end ?></dd>
-</dl>
 
-<dl>
 <dt>Delete selected host</dt>
 <dd><input name="hosts_cmd" class="submit" type="submit" value="Delete"> (see above)</dd>
-</dl>
 
-<dl>
 <dt <? if (view.errors.hosts_add) then io.write("class=error") end ?>>Host to add</dt>
 <dd><input type="text" name="hosts_add" class="text" value="<?= view.errors.hosts_add_orgvalue or "" ?>"><? if (view.errors.hosts_add) then io.write("<p class=error>"..view.errors.hosts_add.."</p>") end ?></dd>
-</dl>
 
-<dl <? if (view.errors.hosts_type) then io.write("class=error") end ?>>
-<dt>Type of above server</dt>
+<dt <? if (view.errors.hosts_type) then io.write("class=error") end ?>>Type of above server</dt>
 <dd><span style="display:inline">Single server:<input type="radio" name="hosts_type" value="server"> Server pool:<input type="radio" name="hosts_type" value="servers"></span><? if (view.errors.hosts_type) then io.write("<p class=error>"..view.errors.hosts_type.."</p>") end ?></dd>
-</dl>
 
-<dl>
 <dt>Add new host</dt>
 <dd><input name="hosts_cmd" class="submit"type="submit" value="Add"></dd>
 </dl>
@@ -88,14 +76,10 @@ for i = 1, table.maxn(view.config.variables.listen) do ?>
 </select><BR>Empty list = Listening (acting as server) is disabled<br>"*" = Listen on all local addresses
 <? if (view.errors.listen_list) then io.write("<p class=error>"..view.errors.listen_list.."</p>") end ?>
 </dd>
-</dl>
 
-<dl>
 <dt>Delete selected address</dt>
 <dd><input name="listen_cmd" type="submit" class="submit" value="Delete"> (see above)</dd>
-</dl>
 
-<dl>
 <dt>Add new listen address</dt>
 <dd><input name="listen_add" type="text" class="text" value=""> <input name="listen_cmd" type="submit" class="submit" value="Add"><? if (view.errors.listen_add) then io.write("<p class=error>"..view.errors.listen_add.."</p>") end ?></dd>
 </dl>
@@ -110,14 +94,12 @@ for i = 1, table.maxn(view.config.variables.listen) do ?>
 <input type=submit class="submit" name="cmd" value="stop">
 <input type=submit class="submit" name="cmd" value="restart">
 </form></dd>
-</dl>
 
 <? if (view.startstop) and (view.startstop.cmdresult) then ?>
-<dl>
 <dt>Previous action result</dt>
 <dd><pre><?= view.startstop.cmdresult?></pre></dd>
-</dl>
 <? end ?>
+</dl>
 
 <?
 --[[ DEBUG INFORMATION
diff --git a/openntpd-expert-html.lsp b/openntpd-expert-html.lsp
index b632646..ede8ecc 100644
--- a/openntpd-expert-html.lsp
+++ b/openntpd-expert-html.lsp
@@ -11,9 +11,7 @@ io.write(debugs.variables(view))
 <dl>
 <dt>Program status
 <dd><? if (view.status.enabled) then io.write('Enabled') else io.write('Disabled') end ?></dd>
-</dl>
 
-<dl>
 <dt>Program version</dt>
 <dd><?= view.status.version ?></dd>
 </dl>
@@ -27,14 +25,10 @@ io.write(debugs.variables(view))
 <DL>
 <dt>File name</dt>
 <dd><?= view.file.details.path ?></dd>
-</DL>
 
-<DL>
 <dt>File size</dt>
 <dd><?= view.file.details.size ?></dd>
-</DL>
 
-<DL>
 <dt>Last modified</dt>
 <dd><?= view.file.details.mtime ?></dd>
 </DL>
@@ -61,14 +55,12 @@ io.write(debugs.variables(view))
 <input type=submit class="submit" name="cmd" value="stop">
 <input type=submit class="submit" name="cmd" value="restart">
 </form></dd>
-</dl>
 
 <? if (view.startstop) and (view.startstop.cmdresult) then ?>
-<dl>
 <dt>Previous action result</dt>
 <dd><pre><?= view.startstop.cmdresult?></pre></dd>
-</dl>
 <? end ?>
+</dl>
 
 <?
 --[[ DEBUG INFORMATION
diff --git a/openntpd-status-html.lsp b/openntpd-status-html.lsp
index 43b4a35..f983398 100644
--- a/openntpd-status-html.lsp
+++ b/openntpd-status-html.lsp
@@ -5,33 +5,25 @@
 <dl>
 <dt>Program status</dt>
 <DD><? if (view.status.enabled) then io.write('Enabled') else io.write('Disabled') end ?></DD>
-</dl>
 
-<dl>
 <dt>Program version</dt>
 <dd><?= view.status.version ?></dd>
 </dl>
 
 <H2>PROGRAM SPECIFIC OPTIONS/INFORMATION</H2>
 
-<? --[[ ?>
 <dl>
+<? --[[ ?>
 <dt>Configured as server (listens)</dt>
 <dd><? io.write(view.status.listenstate) ?></dd>
-</dl>
 <? --]] ?>
 
-<dl>
 <dt>Sets time directly at startup</dt>
 <dd><? if (view.status.setstimeonstartup) then io.write("Yes") else io.write("No") end ?></dd>
-</dl>
 
-<dl>
 <dt>Current time</dt>
 <dd><? io.write(view.status.date) ?></dd>
-</dl>
 
-<dl>
 <dt>Previous time adjustment</dt>
 <dd><? io.write(view.status.timechanged) ?></dd>
 </dl>