summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shorewall-advanced-html.lsp17
-rw-r--r--shorewall-check-html.lsp15
-rw-r--r--shorewall-edit-html.lsp14
-rw-r--r--shorewall-logfile-html.lsp2
-rw-r--r--shorewall-model.lua2
-rw-r--r--shorewall-read-html.lsp9
-rw-r--r--shorewall.menu3
7 files changed, 18 insertions, 44 deletions
diff --git a/shorewall-advanced-html.lsp b/shorewall-advanced-html.lsp
index 93e1dab..7bff100 100644
--- a/shorewall-advanced-html.lsp
+++ b/shorewall-advanced-html.lsp
@@ -3,19 +3,13 @@
<h1>Firewall configuration</h1>
-<h2>MENU</h2>
+<h2>List of configfiles</h2>
-<dt><?= html.link{value = view.url .. "/", label="Home" } ?></dt>
-<dd>Go back to start page</dd>
-
-
-<h2>ADVANCED</h2>
-
-<TABLE border=0>
+<TABLE>
<TR style="background:#eee;font-weight:bold;">
- <TD "width=200px" align="left">File</TD>
- <TD "width=70px" align="right" style="padding-right:10px">Size</TD>
- <TD "width=200px" align="left">Last Modified</TD>
+ <TD width="120px" align="left">File</TD>
+ <TD width="60px" align="right" style="padding-right:10px">Size</TD>
+ <TD align="left">Last Modified</TD>
</TR>
@@ -26,3 +20,4 @@
<TD><?= view.filelist[i].filedetails.mtimelong ?></TD>
</TR>
<? end ?>
+</TABLE>
diff --git a/shorewall-check-html.lsp b/shorewall-check-html.lsp
index 0fcfa0e..c41480a 100644
--- a/shorewall-check-html.lsp
+++ b/shorewall-check-html.lsp
@@ -2,24 +2,15 @@
<h1>Firewall configuration</h1>
-<h2>MENU</h2>
-
-<dt><?= html.link{value = view.url .. "/", label="Home" } ?></dt>
-<dd>Go back to start page</dd>
-
-<dt><?= html.link{value = view.url .. "/advanced", label="Advanced" } ?></dt>
-<dd>Provide a autogenerated list of files in '/etc/shorewall'.</dd>
-
-
<h2>SHOREWALL CHECK RESULT</h2>
-<textarea name="checkresult" style="width:100%;height:400px;"><?= view.check.result ?></textarea>
+<textarea name="checkresult"><?= view.check.result ?></textarea>
<h2>MANAGEMENT</h2>
<dt>Preform check of configs</dt>
-<dd><form name="check" action="" method="POST"><input type=submit name="cmd" value="check" style="width:100px"></form></dd>
+<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="check" action="<? io.write(view.url .. "/read") ?>" method="POST"><input type=submit name="cmd" value="restart" style="width:100px"></form><? if (view.check.restart) then io.write(view.programstats.restart) end ?></dd>
+<dd><form name="check" action="<? io.write(view.url .. "/read") ?>" method="POST"><input type=submit name="cmd" value="restart" class="submit"></form><? if (view.check.restart) then io.write(view.programstats.restart) end ?></dd>
diff --git a/shorewall-edit-html.lsp b/shorewall-edit-html.lsp
index 7583ff5..c1d2537 100644
--- a/shorewall-edit-html.lsp
+++ b/shorewall-edit-html.lsp
@@ -4,14 +4,6 @@
<h1>Edit configuration</h1>
-<h2>MENU</h2>
-
-<dt><?= html.link{value = view.url .. "/", label="Home" } ?></dt>
-<dd>Go back to start page</dd>
-
-<dt><?= html.link{value = view.url .. "/advanced", label="Advanced" } ?></dt>
-<dd>Provide a autogenerated list of files in '/etc/shorewall'.</dd>
-
<h2>Details</h2>
<dt>File name</dt>
@@ -26,10 +18,10 @@
<h2>Content</h2>
<form name="myform" action="" method="POST">
-<input name="name" type=hidden value="<?= view.filecontent.filedetails.name ?>" style="width:100%">
-<textarea name="modifications" style="width:100%;height:360px;"><?= view.filecontent.value ?></textarea>
+<input name="name" type=hidden value="<?= view.filecontent.filedetails.name ?>">
+<textarea name="modifications"><?= view.filecontent.value ?></textarea>
-<input type="submit" name="cmd" value="update"><p class="error"><?= view.filecontent.errtxt ?></p></form>
+<input type="submit" name="cmd" value="update" class="submit"><p class="error"><?= view.filecontent.errtxt ?></p></form>
</body>
</html>
diff --git a/shorewall-logfile-html.lsp b/shorewall-logfile-html.lsp
index 748bd09..593a8d1 100644
--- a/shorewall-logfile-html.lsp
+++ b/shorewall-logfile-html.lsp
@@ -9,7 +9,7 @@
<dd><?= view.logfile.cmd ?></dd>
<h2>Content</h2>
-<textarea name="" style="width:100%;height:450px;"><? io.write(view.logfile.value) ?></textarea>
+<textarea name=""><? io.write(view.logfile.value) ?></textarea>
</body>
</html>
diff --git a/shorewall-model.lua b/shorewall-model.lua
index e97fc4e..9589b0b 100644
--- a/shorewall-model.lua
+++ b/shorewall-model.lua
@@ -56,7 +56,7 @@ function get_status ()
local programstate = f:read("*l")
f:close()
local f,error = io.popen("/sbin/shorewall version")
- local programversion = f:read("*l")
+ local programversion = "shorewall_" .. f:read("*l")
f:close()
return {programversion=programversion,programstatus=programstatus,programstate=programstate}
end
diff --git a/shorewall-read-html.lsp b/shorewall-read-html.lsp
index 264c4a5..831a350 100644
--- a/shorewall-read-html.lsp
+++ b/shorewall-read-html.lsp
@@ -2,11 +2,6 @@
<h1>Firewall configuration</h1>
-<h2>MENU</h2>
-
-<dt><?= html.link{value = view.url .. "/advanced", label="Advanced" } ?></dt>
-<dd>Provide a autogenerated list of files in '/etc/shorewall'.</dd>
-
<h2>SYSTEM INFO</h2>
<dt>Program version</dt>
@@ -21,10 +16,10 @@
<h2>MANAGEMENT</h2>
<dt>Preform check of configs</dt>
-<dd><form name="check" action="" method="POST"><input type=submit name="cmd" value="check" style="width:100px"></form></dd>
+<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" style="width:100px"></form><? if (view.programstats.restart) then io.write(view.programstats.restart) end ?></dd>
+<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
diff --git a/shorewall.menu b/shorewall.menu
index 21066d5..14ae912 100644
--- a/shorewall.menu
+++ b/shorewall.menu
@@ -1,2 +1,3 @@
-Networking Shorewall Define read
+#CAT GROUP/DESC TAB ACTION
+Networking 40Firewall Firewall read