diff options
| author | Mika Havela <mika.havela@gmail.com> | 2007-12-03 16:14:50 +0000 |
|---|---|---|
| committer | Mika Havela <mika.havela@gmail.com> | 2007-12-03 16:14:50 +0000 |
| commit | 4e251ae246461f2e9443e875ab28072d754e3b94 (patch) | |
| tree | ed303a56b88e8b29a7da81020b4519b595356245 | |
| parent | 4348cbb93645b06a8d3f0ad658239301bdd7afb9 (diff) | |
| download | acf-shorewall-4e251ae246461f2e9443e875ab28072d754e3b94.tar.bz2 acf-shorewall-4e251ae246461f2e9443e875ab28072d754e3b94.tar.xz | |
Code is ready for evaluation. Basic functionallity is ready (advanced mode for editing configs). No GuidesSetup at this point.
git-svn-id: svn://svn.alpinelinux.org/acf/shorewall/trunk@401 ab2d0c66-481e-0410-8bed-d214d4d58bed
| -rw-r--r-- | shorewall-advanced-html.lsp | 4 | ||||
| -rw-r--r-- | shorewall-check-html.lsp | 6 | ||||
| -rw-r--r-- | shorewall-edit-html.lsp | 7 | ||||
| -rw-r--r-- | shorewall-model.lua | 11 |
4 files changed, 12 insertions, 16 deletions
diff --git a/shorewall-advanced-html.lsp b/shorewall-advanced-html.lsp index 043b58b..93e1dab 100644 --- a/shorewall-advanced-html.lsp +++ b/shorewall-advanced-html.lsp @@ -14,7 +14,7 @@ <TABLE border=0> <TR style="background:#eee;font-weight:bold;"> <TD "width=200px" align="left">File</TD> - <TD "width=100px" align="left">Size</TD> + <TD "width=70px" align="right" style="padding-right:10px">Size</TD> <TD "width=200px" align="left">Last Modified</TD> </TR> @@ -22,7 +22,7 @@ <? for i = 1, table.maxn(view.filelist) do ?> <TR> <TD><?= html.link{value = view.url .. "/edit?name=" .. view.filelist[i].name , label=view.filelist[i].name } ?></TD> - <TD><?= view.filelist[i].filedetails.size ?></TD> + <TD style="padding-right:10px" align="right"><?= view.filelist[i].filedetails.size ?></TD> <TD><?= view.filelist[i].filedetails.mtimelong ?></TD> </TR> <? end ?> diff --git a/shorewall-check-html.lsp b/shorewall-check-html.lsp index a31b947..0fcfa0e 100644 --- a/shorewall-check-html.lsp +++ b/shorewall-check-html.lsp @@ -22,10 +22,4 @@ <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> -<? ---[[ DEBUG INFORMATION -require("debugs") -io.write(debugs.variables(view)) ---]] -?> diff --git a/shorewall-edit-html.lsp b/shorewall-edit-html.lsp index afbe172..7583ff5 100644 --- a/shorewall-edit-html.lsp +++ b/shorewall-edit-html.lsp @@ -31,12 +31,5 @@ <input type="submit" name="cmd" value="update"><p class="error"><?= view.filecontent.errtxt ?></p></form> -<? ---[[ DEBUG INFORMATION -require("debugs") -io.write(debugs.variables(view)) ---]] -?> - </body> </html> diff --git a/shorewall-model.lua b/shorewall-model.lua index b6f6c39..10a8092 100644 --- a/shorewall-model.lua +++ b/shorewall-model.lua @@ -13,7 +13,16 @@ local function file_info ( path ) filedetails["mtimelong"]=os.date("%c", filedetails["mtime"]) filedetails["longname"]=path filedetails["name"]=basename(path) - filedetails["size"]=filedetails["size"] .. " bytes" + + if ( filedetails["size"] > 1073741824 ) then + filedetails["size"]=((filedetails["size"]/1073741824) - (filedetails["size"]/1073741824%0.1)) .. "G" + elseif ( filedetails["size"] > 1048576 ) then + filedetails["size"]=((filedetails["size"]/1048576) - (filedetails["size"]/1048576%0.1)) .. "M" + elseif ( filedetails["size"] > 1024 ) then + filedetails["size"]=((filedetails["size"]/1024) - (filedetails["size"]/1024%0.1)) .. "k" + else + filedetails["size"]=filedetails["size"] + end return filedetails end |