From 654032c27bce388045a78fd61af8f3228d1c334f Mon Sep 17 00:00:00 2001
From: Mika Havela <mika.havela@gmail.com>
Date: Thu, 10 Jan 2008 13:40:16 +0000
Subject: Renamed tab and reorganized first page

git-svn-id: svn://svn.alpinelinux.org/acf/shorewall/trunk@531 ab2d0c66-481e-0410-8bed-d214d4d58bed
---
 shorewall-controller.lua  |  6 +++---
 shorewall-model.lua       |  2 +-
 shorewall-read-html.lsp   | 29 -----------------------------
 shorewall-status-html.lsp | 30 ++++++++++++++++++++++++++++++
 shorewall.menu            |  4 ++--
 5 files changed, 36 insertions(+), 35 deletions(-)
 delete mode 100644 shorewall-read-html.lsp
 create mode 100644 shorewall-status-html.lsp

diff --git a/shorewall-controller.lua b/shorewall-controller.lua
index 9e16912..6b47dbb 100644
--- a/shorewall-controller.lua
+++ b/shorewall-controller.lua
@@ -4,7 +4,7 @@ module(..., package.seeall)
 -- We use the self.conf table because it already has prefix,controller,etc
 -- The redir code is defined in the application error handler (acf-controller)
 local list_redir = function (self)
-	self.conf.action = "read"
+	self.conf.action = "status"
 	self.conf.type = "redir"
 	error (self.conf)
 end
@@ -28,7 +28,7 @@ check = function(self)
 end
 
 
-read = function(self)
+status = function(self)
 	if self.clientdata.cmd == "check" then
 		self.conf.action = "check"
 		self.conf.type = "redir"
@@ -37,7 +37,7 @@ read = function(self)
 	if self.clientdata.cmd == "restart" then
 		return ( {programstats = self.model:restart_service(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller } )
 	end
-	return ( {programstats = self.model:get_status(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller } )
+	return ( {status = self.model:get_status(), url = ENV["SCRIPT_NAME"] .. self.conf.prefix .. self.conf.controller } )
 end
 
 advanced = function(self)
diff --git a/shorewall-model.lua b/shorewall-model.lua
index 65e3a57..b3a8abe 100644
--- a/shorewall-model.lua
+++ b/shorewall-model.lua
@@ -58,7 +58,7 @@ function get_status ()
 	local f,error = io.popen("/sbin/shorewall version")
 	local programversion = "shorewall-" .. f:read("*l")
 	f:close()
-	return {programversion=programversion,programstatus=programstatus,programstate=programstate}
+	return {version=programversion,status=programstatus,state=programstate}
 end
 
 
diff --git a/shorewall-read-html.lsp b/shorewall-read-html.lsp
deleted file mode 100644
index 831a350..0000000
--- a/shorewall-read-html.lsp
+++ /dev/null
@@ -1,29 +0,0 @@
-<? local view = ... ?>
-
-<h1>Firewall configuration</h1>
-
-<h2>SYSTEM INFO</h2>
-
-<dt>Program version</dt>
-<dd><?= view.programstats.programversion ?></dd>
-
-<dt>Program status</dt>
-<dd><?= view.programstats.programstatus ?></dd>
-
-<dt>Program state</dt>
-<dd><?= view.programstats.programstate ?></dd>
-
-<h2>MANAGEMENT</h2>
-
-<dt>Preform check of configs</dt>
-<dd><form name="check" action="" method="POST"><input type="submit" name="cmd" value="check" class="submit"></form></dd>
-
-<dt>Preform fw restart</dt>
-<dd><form name="restart" action="" method="POST"><input type="submit" name="cmd" value="restart" class="submit"></form><? if (view.programstats.restart) then io.write(view.programstats.restart) end ?></dd>
-
-<?
---[[ DEBUG INFORMATION
-require("debugs")
-io.write(debugs.variables(view))
---]]
-?>
diff --git a/shorewall-status-html.lsp b/shorewall-status-html.lsp
new file mode 100644
index 0000000..4af95f6
--- /dev/null
+++ b/shorewall-status-html.lsp
@@ -0,0 +1,30 @@
+<? local view = ... ?>
+
+<h1>SYSTEM INFO</h1>
+
+<h2>SYSTEM INFO</h2>
+
+<dt>Program status</dt>
+<DD><?= view.status.status ?></DD>
+
+<dt>Program version</dt>
+<dd><?= view.status.version ?></dd>
+
+<H3>PROGRAM SPECIFIC OPTIONS/INFORMATION</H3>
+<dt>Program reports</dt>
+<dd><?= view.status.state ?></dd>
+
+<? --[[ ?>
+<dt>Preform check of configs</dt>
+<dd><form name="check" action="" method="POST"><input type="submit" name="cmd" value="check" class="submit"></form></dd>
+
+<dt>Preform fw restart</dt>
+<dd><form name="restart" action="" method="POST"><input type="submit" name="cmd" value="restart" class="submit"></form><? if (view.programstats.restart) then io.write(view.programstats.restart) end ?></dd>
+<? --]] ?>
+
+<?
+--[[ DEBUG INFORMATION
+require("debugs")
+io.write(debugs.variables(view))
+--]]
+?>
diff --git a/shorewall.menu b/shorewall.menu
index 14ae912..8fb8c10 100644
--- a/shorewall.menu
+++ b/shorewall.menu
@@ -1,3 +1,3 @@
-#CAT  		GROUP/DESC		TAB			ACTION
-Networking 	40Firewall		Firewall		read
+#CAT  		GROUP/DESC		TAB		ACTION
+Networking 	40Firewall		Firewall		status
 
-- 
cgit v1.2.3