From b15f9ef2aea50f99fb2926b677a546c5aabc0c70 Mon Sep 17 00:00:00 2001
From: Mika Havela <mika.havela@gmail.com>
Date: Tue, 4 Dec 2007 16:40:54 +0000
Subject: Saving work for today

git-svn-id: svn://svn.alpinelinux.org/acf/openntpd/trunk@406 ab2d0c66-481e-0410-8bed-d214d4d58bed
---
 Makefile               |  7 ++++++-
 openntpd-model.lua     |  4 +++-
 openntpd-read-html.lsp | 16 +++++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index eff3741..404f7c7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,12 @@ APP_NAME=openntpd
 PACKAGE=acf-$(APP_NAME)
 VERSION=1.0_alpha1
 
-APP_DIST=openntpd.menu
+APP_DIST=\
+openntpd-advanced-html.lsp \
+openntpd-controller.lua \
+openntpd-model.lua \
+openntpd-read-html.lsp \
+openntpd.menu
 
 
 EXTRA_DIST=README Makefile config.mk
diff --git a/openntpd-model.lua b/openntpd-model.lua
index 742c64a..5c52444 100644
--- a/openntpd-model.lua
+++ b/openntpd-model.lua
@@ -90,7 +90,9 @@ end
 function get ()
 	local path = ntpdconfig
 	config = config_content ( path )
-	config["version"] = get_version()
+	config["version"] = string.match(get_version(), "^(%S*)" )
+	config["status"] = "xXx"
+	config["date"] = os.date()
 	return config
 end
 
diff --git a/openntpd-read-html.lsp b/openntpd-read-html.lsp
index 5beee8e..73caead 100644
--- a/openntpd-read-html.lsp
+++ b/openntpd-read-html.lsp
@@ -5,16 +5,18 @@
 <h2>SYSTEM INFO</h2>
 
 <dt>Program version</dt>
-<dd>xxx</dd>
+<dd><? io.write(view.filecontent.version) ?></dd>
 
 <dt>Process running or not</dt>
-<dd>xxx</dd>
+<dd><? io.write(view.filecontent.status) ?></dd>
 
 <dt>Current time</dt>
-<dd>yyy-mm-dd hh:mm:ss</dd>
+<dd><? io.write(view.filecontent.date) ?></dd>
 
+<? --[[ ?>
 <dt>TimeZone</dt>
 <dd>xxx</dd>
+<? --]] ?>
 
 <h2>NTPD SETTINGS</h2>
 
@@ -28,6 +30,9 @@
 <? for i = 1, table.maxn(view.filecontent.servers) do ?>
 	<option name="<? io.write(view.filecontent.servers[i].value) ?>"><? io.write(view.filecontent.servers[i].value) ?></option>
 <? end ?>
+<? for i = 1, table.maxn(view.filecontent.server) do ?>
+	<option name="<? io.write(view.filecontent.server[i].value) ?>"><? io.write(view.filecontent.server[i].value) ?></option>
+<? end ?>
 </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>).
 </dd>
@@ -58,11 +63,8 @@ for i = 1, table.maxn(view.filecontent.listen) do ?>
 <dd><input type="text" name="" value=""> <input type="submit" value="Add"></dd>
 
 
-
-
-
 <?
----[[ DEBUG INFORMATION
+--[[ DEBUG INFORMATION
 require("debugs")
 io.write(debugs.variables(view))
 --]]
-- 
cgit v1.2.3