diff options
author | Natanael Copa <natanael.copa@gmail.com> | 2008-07-28 06:48:16 +0000 |
---|---|---|
committer | Natanael Copa <natanael.copa@gmail.com> | 2008-07-28 06:48:16 +0000 |
commit | 5aa214f71f495db0d0d75e9e16f2677d6a09f585 (patch) | |
tree | 051e1f9282f71121d7f8125dd22e32beb92c57e3 | |
parent | 9fcda9ad78f8c42ed291c10e8bfea3e3000c30a3 (diff) | |
download | acf-alpine-baselayout-5aa214f71f495db0d0d75e9e16f2677d6a09f585.tar.bz2 acf-alpine-baselayout-5aa214f71f495db0d0d75e9e16f2677d6a09f585.tar.xz |
use <% %> instead of <? ?>
git-svn-id: svn://svn.alpinelinux.org/acf/alpine-baselayout/trunk@1323 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r-- | health-modules-html.lsp | 4 | ||||
-rw-r--r-- | health-network-html.lsp | 6 | ||||
-rw-r--r-- | health-proc-html.lsp | 6 | ||||
-rw-r--r-- | health-storage-html.lsp | 30 | ||||
-rw-r--r-- | health-system-html.lsp | 18 | ||||
-rw-r--r-- | hostname-html.lsp | 4 | ||||
-rw-r--r-- | interfaces-read-html.lsp | 70 | ||||
-rw-r--r-- | interfaces-status-html.lsp | 16 | ||||
-rw-r--r-- | interfaces-update-html.lsp | 76 | ||||
-rw-r--r-- | logfiles-status-html.lsp | 28 | ||||
-rw-r--r-- | password-read-html.lsp | 4 | ||||
-rw-r--r-- | skins-read-html.lsp | 20 | ||||
-rw-r--r-- | syslog-config-html.lsp | 34 | ||||
-rw-r--r-- | syslog-loginfo-html.lsp | 20 |
14 files changed, 168 insertions, 168 deletions
diff --git a/health-modules-html.lsp b/health-modules-html.lsp index d379d95..ee6e0ad 100644 --- a/health-modules-html.lsp +++ b/health-modules-html.lsp @@ -1,6 +1,6 @@ -<? local view = ... ?> +<% local view = ... %> <h1>Modules</h1> <h2>Installed modules</h2> -<pre><?= view.value.list.value ?></pre> +<pre><%= view.value.list.value %></pre> diff --git a/health-network-html.lsp b/health-network-html.lsp index 6533133..d97322a 100644 --- a/health-network-html.lsp +++ b/health-network-html.lsp @@ -1,9 +1,9 @@ -<? local view = ... ?> +<% local view = ... %> <h1>Network</h1> <h2>Interface status</h2> -<pre><?= view.value.interfaces.value ?></pre> +<pre><%= view.value.interfaces.value %></pre> <h2>Routes</h2> -<pre><?= view.value.routes.value ?></pre> +<pre><%= view.value.routes.value %></pre> diff --git a/health-proc-html.lsp b/health-proc-html.lsp index 299c605..6e52d21 100644 --- a/health-proc-html.lsp +++ b/health-proc-html.lsp @@ -1,9 +1,9 @@ -<? local view = ... ?> +<% local view = ... %> <h1>Process information</h1> <h2>Processor</h2> -<pre><?= view.value.processor.value ?></pre> +<pre><%= view.value.processor.value %></pre> <h2>Memory</h2> -<pre><?= view.value.memory.value ?></pre> +<pre><%= view.value.memory.value %></pre> diff --git a/health-storage-html.lsp b/health-storage-html.lsp index 4e9a0a8..cd9162e 100644 --- a/health-storage-html.lsp +++ b/health-storage-html.lsp @@ -1,6 +1,6 @@ -<? local view = ... ?> +<% local view = ... %> -<? displaydisk = function(disk, name) +<% displaydisk = function(disk, name) io.write("<pre>"..disk.value.."</pre>\n") io.write('<TABLE STYLE="margin:0px;padding:0px;border:0px">\n') io.write(" <TR>\n") @@ -27,39 +27,39 @@ io.write(" <TR>\n") io.write(' <TD WIDTH="100px"><B>'..name..'</B></TD><TD STYLE="background:red;border:2px solid black;" WIDTH="20px"></TD><TD WIDTH="70px"><B>=Used</B></TD><TD STYLE="background:#0c0;border:2px solid black;" WIDTH="20px"></TD><TD><B>=Free</B></TD>\n') io.write(" </TR>\n") io.write("</TABLE>\n") -end ?> +end %> <h1>Storage</h1> <h2>Floppy capacity</h2> -<? if (view.value.floppy) then +<% if (view.value.floppy) then for name,floppy in pairs(view.value.floppy.value) do displaydisk(floppy, name) end -else ?> +else %> No Floppy mounted -<? end ?> +<% end %> <h2>Harddrive capacity</h2> -<? if (view.value.hd) then +<% if (view.value.hd) then for name,hd in pairs(view.value.hd.value) do displaydisk(hd, name) end -else ?> +else %> No Harddrive mounted -<? end ?> +<% end %> <h2>RAM Disk capacity</h2> -<? if (view.value.ramdisk) then +<% if (view.value.ramdisk) then for name,ramdisk in pairs(view.value.ramdisk.value) do displaydisk(ramdisk, name) end -else ?> +else %> No RAM Disk mounted -<? end ?> +<% end %> -<? if view.value.partitions then ?> +<% if view.value.partitions then %> <h2>Disk partitions</h2> -<pre><?= view.value.partitions.value ?></pre> -<? end ?> +<pre><%= view.value.partitions.value %></pre> +<% end %> diff --git a/health-system-html.lsp b/health-system-html.lsp index ec6ea12..69f3dad 100644 --- a/health-system-html.lsp +++ b/health-system-html.lsp @@ -1,25 +1,25 @@ -<? local view = ... ?> +<% local view = ... %> <h1>System</h1> <h2>Versions and names</h2> -<pre><?= view.value.version.value ?></pre> -<pre><?= view.value.uname.value ?></pre> +<pre><%= view.value.version.value %></pre> +<pre><%= view.value.uname.value %></pre> <h2>Uptime</h2> -<pre><?= view.value -.uptime.value ?></pre> +<pre><%= view.value +.uptime.value %></pre> <h2>Time/TimeZone</h2> -<pre><?= view.value.date.value ?></pre> -<pre><?= view.value.timezone.value ?></pre> +<pre><%= view.value.date.value %></pre> +<pre><%= view.value.timezone.value %></pre> <h2>Memory</h2> -<pre><?= view.value.memory.value ?></pre> +<pre><%= view.value.memory.value %></pre> <TABLE STYLE="margin:0px;padding:0px;border:0px"> <TR> - <TD>0%</TD><TD WIDTH="<?= view.value.memory.used ?>%" STYLE="background:red;border:2px solid black;border-right:none;"><CENTER><B><? if ( tonumber(view.value.memory.used) > 10) then io.write(view.value.memory.used .. "%") end ?></B></CENTER></TD><TD WIDTH="<?= (100-view.value.memory.used) ?>%" STYLE="background:#0c0;border:2px solid black;border-left:none;""><CENTER><B><? if ( 90 > tonumber(view.value.memory.used)) then io.write((100-view.value.memory.used) .. "%") end ?></B></CENTER></TD><TD>100%</TD> + <TD>0%</TD><TD WIDTH="<%= view.value.memory.used %>%" STYLE="background:red;border:2px solid black;border-right:none;"><CENTER><B><% if ( tonumber(view.value.memory.used) > 10) then io.write(view.value.memory.used .. "%") end %></B></CENTER></TD><TD WIDTH="<%= (100-view.value.memory.used) %>%" STYLE="background:#0c0;border:2px solid black;border-left:none;""><CENTER><B><% if ( 90 > tonumber(view.value.memory.used)) then io.write((100-view.value.memory.used) .. "%") end %></B></CENTER></TD><TD>100%</TD> </TR> </TABLE> <TABLE STYLE="margin:0px;padding:0px;border:0px;margin-top:5px;"> diff --git a/hostname-html.lsp b/hostname-html.lsp index 1fd32c7..b27d0d5 100644 --- a/hostname-html.lsp +++ b/hostname-html.lsp @@ -1,4 +1,4 @@ -<? local view = ... ?> +<% local view = ... %> <h1>Hostname</h1> <dt>The Hostname is</dt> -<dd><?= view.value ?></dd> +<dd><%= view.value %></dd> diff --git a/interfaces-read-html.lsp b/interfaces-read-html.lsp index 54908cf..ac910a9 100644 --- a/interfaces-read-html.lsp +++ b/interfaces-read-html.lsp @@ -1,68 +1,68 @@ -<? local view, viewlibrary, pageinfo, session = ... +<% local view, viewlibrary, pageinfo, session = ... require("viewfunctions") -?> -<? +%> +<% --[[ DEBUG INFORMATION io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>") io.write(html.cfe_unpack(view)) io.write("</span>") --]] -?> +%> -<? showoption = function(option) - if option.errtxt or option.value ~= "" then ?> - <TR><TD WIDTH='120px' STYLE='font-weight:bold;border:none;'><?= option.label ?></TD> - <TD STYLE='border:none;'<? if option.errtxt then io.write("class='error'") end ?>> - <?= string.gsub(tostring(option.value), "\n", "<BR>") ?> - <? if option.errtxt then io.write("<BR>"..option.errtxt) end ?> +<% showoption = function(option) + if option.errtxt or option.value ~= "" then %> + <TR><TD WIDTH='120px' STYLE='font-weight:bold;border:none;'><%= option.label %></TD> + <TD STYLE='border:none;'<% if option.errtxt then io.write("class='error'") end %>> + <%= string.gsub(tostring(option.value), "\n", "<BR>") %> + <% if option.errtxt then io.write("<BR>"..option.errtxt) end %> </TD></TR> - <? end ?> -<? end ?> + <% end %> +<% end %> -<? displaycommandresults({"delete", "ifup", "ifdown"}, session) ?> +<% displaycommandresults({"delete", "ifup", "ifdown"}, session) %> -<? if viewlibrary and viewlibrary.dispatch_component then +<% if viewlibrary and viewlibrary.dispatch_component then viewlibrary.dispatch_component("status") -end ?> +end %> <H1>Configured interfaces</H1> <DL> -<? for i,entry in ipairs(view.value) do - local interface = entry.value ?> - <DT><IMG SRC='/skins/static/tango/16x16/devices/network-wired.png' width='16' height='16'> <?= interface.name.value ?></DT><DD> +<% for i,entry in ipairs(view.value) do + local interface = entry.value %> + <DT><IMG SRC='/skins/static/tango/16x16/devices/network-wired.png' width='16' height='16'> <%= interface.name.value %></DT><DD> <TABLE STYLE='margin-bottom:10px'> - <? + <% showoption(interface.family) if interface.method then showoption(interface.method) end for name,option in pairs(interface) do if name~="name" and name~="family" and name~="method" then showoption(option) end - end ?> + end %> <TR> - <? if session.permissions.interfaces.update then ?> - <A HREF='update?name=<?= interface.name.value ?>'>Edit </A> - <? end - if session.permissions.interfaces.delete then ?> - <A HREF='delete?name=<?= interface.name.value ?>'>Delete </A> - <? end - if session.permissions.interfaces.ifup then ?> - <A HREF='ifup?name=<?= interface.name.value ?>'>ifup </A> - <? end - if session.permissions.interfaces.ifdown then ?> - <A HREF='ifdown?name=<?= interface.name.value ?>'>ifdown </A> - <? end ?> + <% if session.permissions.interfaces.update then %> + <A HREF='update?name=<%= interface.name.value %>'>Edit </A> + <% end + if session.permissions.interfaces.delete then %> + <A HREF='delete?name=<%= interface.name.value %>'>Delete </A> + <% end + if session.permissions.interfaces.ifup then %> + <A HREF='ifup?name=<%= interface.name.value %>'>ifup </A> + <% end + if session.permissions.interfaces.ifdown then %> + <A HREF='ifdown?name=<%= interface.name.value %>'>ifdown </A> + <% end %> </TR> </TABLE> -<? end ?> +<% end %> </DD> </DL> -<? +<% --[[ DEBUG INFORMATION io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>") io.write(html.cfe_unpack(form)) io.write("</span>") --]] -?> +%> diff --git a/interfaces-status-html.lsp b/interfaces-status-html.lsp index aa36c99..8ab9596 100644 --- a/interfaces-status-html.lsp +++ b/interfaces-status-html.lsp @@ -1,28 +1,28 @@ -<? local view = ... ?> -<? require("viewfunctions") ?> -<? +<% local view = ... %> +<% require("viewfunctions") %> +<% --[[ DEBUG INFORMATION io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>") io.write(html.cfe_unpack(view)) io.write("</span>") --]] -?> +%> <H1>SYSTEM INFO</H1> <DL> -<? +<% displayitem(view.value.filename) displayitem(view.value.ipaddr) displayitem(view.value.iproute) -?> +%> </DL> -<? +<% --[[ DEBUG INFORMATION io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>") io.write(html.cfe_unpack(form)) io.write("</span>") --]] -?> +%> diff --git a/interfaces-update-html.lsp b/interfaces-update-html.lsp index 13e7181..ced2d86 100644 --- a/interfaces-update-html.lsp +++ b/interfaces-update-html.lsp @@ -1,11 +1,11 @@ -<? local form, viewlibrary, page_info = ... +<% local form, viewlibrary, page_info = ... require("viewfunctions") -?> +%> <script type="text/javascript" src="/js/jquery-latest.js"></script> <script type="text/javascript"> // Here are the optional form entries - <? -- I'm going to temporarily override the io.write function so I can remove \n from the form items + <% -- I'm going to temporarily override the io.write function so I can remove \n from the form items local tmpwrite = io.write local buffer = {} io.write = function(...) @@ -17,36 +17,36 @@ require("viewfunctions") print((table.concat(buffer,""):gsub("\n",""))) buffer = {} end - ?> - var _address = '<? displayformitem({ name="address", label="Address", value="", type="text" }) ?>';<? outputbuffer() ?> - var _netmask = '<? displayformitem({ name="netmask", label="Netmask", value="", type="text" }) ?>';<? outputbuffer() ?> - var _broadcast = '<? displayformitem({ name="broadcast", label="Broadcast address", value="", type="text" }) ?>';<? outputbuffer() ?> - var _network = '<? displayformitem({ name="network", label="Network address", value="", type="text" }) ?>';<? outputbuffer() ?> - var _metric = '<? displayformitem({ name="metric", label="Routing metric", value="", type="text" }) ?>';<? outputbuffer() ?> - var _gateway = '<? displayformitem({ name="gateway", label="Default gateway", value="", type="text" }) ?>';<? outputbuffer() ?> - var _pointopoint = '<? displayformitem({ name="pointopoint", label="Point-to-point address", value="", type="text" }) ?>';<? outputbuffer() ?> - var _media = '<? displayformitem({ name="media", label="Medium type", value="", type="text" }) ?>';<? outputbuffer() ?> - var _hwaddress = '<? displayformitem({ name="hwaddress", label="Hardware address", value="", type="text" }) ?>';<? outputbuffer() ?> - var _mtu = '<? displayformitem({ name="mtu", label="MTU size", value="", type="text" }) ?>';<? outputbuffer() ?> - var _hostname = '<? displayformitem({ name="hostname", label="Hostname", value="", type="text" }) ?>';<? outputbuffer() ?> - var _leasehours = '<? displayformitem({ name="leasehours", label="Preferred lease time (hours)", value="", type="text" }) ?>';<? outputbuffer() ?> - var _leasetime = '<? displayformitem({ name="leasetime", label="Preferred lease time (seconds)", value="", type="text" }) ?>';<? outputbuffer() ?> - var _vendor = '<? displayformitem({ name="vendor", label="Vendor class identifier", value="", type="text" }) ?>';<? outputbuffer() ?> - var _client = '<? displayformitem({ name="client", label="Client identifier", value="", type="text" }) ?>';<? outputbuffer() ?> - var _bootfile = '<? displayformitem({ name="bootfile", label="Boot file", value="", type="text" }) ?>';<? outputbuffer() ?> - var _server = '<? displayformitem({ name="server", label="Server address", value="", type="text" }) ?>';<? outputbuffer() ?> - var _hwaddr = '<? displayformitem({ name="hwaddr", label="Hardware address", value="", type="text" }) ?>';<? outputbuffer() ?> - var _provider = '<? displayformitem({ name="provider", label="Provider name", value="", type="text" }) ?>';<? outputbuffer() ?> - var _frame = '<? displayformitem({ name="frame", label="Ethernet frame type", value="", type="text" }) ?>';<? outputbuffer() ?> - var _netnum = '<? displayformitem({ name="netnum", label="Network number", value="", type="text" }) ?>';<? outputbuffer() ?> - var _endpoint = '<? displayformitem({ name="endpoint", label="Endpoint address", value="", type="text" }) ?>';<? outputbuffer() ?> - var _local = '<? displayformitem({ name="local", label="Local address", value="", type="text" }) ?>';<? outputbuffer() ?> - var _ttl = '<? displayformitem({ name="ttl", label="TTL setting", value="", type="text" }) ?>';<? outputbuffer() ?> - // Finally, add the different types of method inputs<? outputbuffer() ?> - var _inetmethod = '<? displayformitem({ name="method", type="select", value="", label="Method", errtxt="Must define method", option={"loopback", "static", "manual", "dhcp", "bootp", "ppp", "wvdial"} }) ?>';<? outputbuffer() ?> - var _ipxmethod = '<? displayformitem({ name="method", type="select", value="", label="Method", errtxt="Must define method", option={"static", "dynamic"} }) ?>';<? outputbuffer() ?> - var _inet6method = '<? displayformitem({ name="method", type="select", value="", label="Method", errtxt="Must define method", option={"loopback", "static", "manual", "v4tunnel"} }) ?>';<? outputbuffer() ?> - <? io.write = tmpwrite ?> + %> + var _address = '<% displayformitem({ name="address", label="Address", value="", type="text" }) %>';<% outputbuffer() %> + var _netmask = '<% displayformitem({ name="netmask", label="Netmask", value="", type="text" }) %>';<% outputbuffer() %> + var _broadcast = '<% displayformitem({ name="broadcast", label="Broadcast address", value="", type="text" }) %>';<% outputbuffer() %> + var _network = '<% displayformitem({ name="network", label="Network address", value="", type="text" }) %>';<% outputbuffer() %> + var _metric = '<% displayformitem({ name="metric", label="Routing metric", value="", type="text" }) %>';<% outputbuffer() %> + var _gateway = '<% displayformitem({ name="gateway", label="Default gateway", value="", type="text" }) %>';<% outputbuffer() %> + var _pointopoint = '<% displayformitem({ name="pointopoint", label="Point-to-point address", value="", type="text" }) %>';<% outputbuffer() %> + var _media = '<% displayformitem({ name="media", label="Medium type", value="", type="text" }) %>';<% outputbuffer() %> + var _hwaddress = '<% displayformitem({ name="hwaddress", label="Hardware address", value="", type="text" }) %>';<% outputbuffer() %> + var _mtu = '<% displayformitem({ name="mtu", label="MTU size", value="", type="text" }) %>';<% outputbuffer() %> + var _hostname = '<% displayformitem({ name="hostname", label="Hostname", value="", type="text" }) %>';<% outputbuffer() %> + var _leasehours = '<% displayformitem({ name="leasehours", label="Preferred lease time (hours)", value="", type="text" }) %>';<% outputbuffer() %> + var _leasetime = '<% displayformitem({ name="leasetime", label="Preferred lease time (seconds)", value="", type="text" }) %>';<% outputbuffer() %> + var _vendor = '<% displayformitem({ name="vendor", label="Vendor class identifier", value="", type="text" }) %>';<% outputbuffer() %> + var _client = '<% displayformitem({ name="client", label="Client identifier", value="", type="text" }) %>';<% outputbuffer() %> + var _bootfile = '<% displayformitem({ name="bootfile", label="Boot file", value="", type="text" }) %>';<% outputbuffer() %> + var _server = '<% displayformitem({ name="server", label="Server address", value="", type="text" }) %>';<% outputbuffer() %> + var _hwaddr = '<% displayformitem({ name="hwaddr", label="Hardware address", value="", type="text" }) %>';<% outputbuffer() %> + var _provider = '<% displayformitem({ name="provider", label="Provider name", value="", type="text" }) %>';<% outputbuffer() %> + var _frame = '<% displayformitem({ name="frame", label="Ethernet frame type", value="", type="text" }) %>';<% outputbuffer() %> + var _netnum = '<% displayformitem({ name="netnum", label="Network number", value="", type="text" }) %>';<% outputbuffer() %> + var _endpoint = '<% displayformitem({ name="endpoint", label="Endpoint address", value="", type="text" }) %>';<% outputbuffer() %> + var _local = '<% displayformitem({ name="local", label="Local address", value="", type="text" }) %>';<% outputbuffer() %> + var _ttl = '<% displayformitem({ name="ttl", label="TTL setting", value="", type="text" }) %>';<% outputbuffer() %> + // Finally, add the different types of method inputs<% outputbuffer() %> + var _inetmethod = '<% displayformitem({ name="method", type="select", value="", label="Method", errtxt="Must define method", option={"loopback", "static", "manual", "dhcp", "bootp", "ppp", "wvdial"} }) %>';<% outputbuffer() %> + var _ipxmethod = '<% displayformitem({ name="method", type="select", value="", label="Method", errtxt="Must define method", option={"static", "dynamic"} }) %>';<% outputbuffer() %> + var _inet6method = '<% displayformitem({ name="method", type="select", value="", label="Method", errtxt="Must define method", option={"loopback", "static", "manual", "v4tunnel"} }) %>';<% outputbuffer() %> + <% io.write = tmpwrite %> var optionalfields = "address,netmask,broadcast,network,metric,gateway,pointopoint,media,hwaddress,mtu,hostname,leasehours,leasetime,vendor,client,bootfile,server,hwaddr,provider,frame,netnum,endpoint,local,ttl"; var inetstaticfields = "address,netmask,broadcast,network,metric,gateway,pointopoint,media,hwaddress,mtu"; @@ -143,19 +143,19 @@ require("viewfunctions") }); </script> -<? +<% --[[ DEBUG INFORMATION io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>") io.write(html.cfe_unpack(form)) io.write("</span>") --]] -?> +%> -<h1><?= form.label ?><? if page_info.action == "update" then io.write(" - "..form.value.name.value) end ?></h1> -<? +<h1><%= form.label %><% if page_info.action == "update" then io.write(" - "..form.value.name.value) end %></h1> +<% if page_info.action == "update" then form.value.name.contenteditable = false end local order = {"name", "comment", "auto", "family", "method", "pre-up", "up", "down", "post-down"} displayform(form, order) -?> +%> diff --git a/logfiles-status-html.lsp b/logfiles-status-html.lsp index d7cbe6c..f25d8a4 100644 --- a/logfiles-status-html.lsp +++ b/logfiles-status-html.lsp @@ -1,7 +1,7 @@ -<? local view, viewlibrary, page_info, session = ... ?> -<? require("viewfunctions") ?> +<% local view, viewlibrary, page_info, session = ... %> +<% require("viewfunctions") %> -<? displaycommandresults({"delete"}, session) ?> +<% displaycommandresults({"delete"}, session) %> <h1>Available Logfiles</h1> @@ -15,19 +15,19 @@ <TD style="white-space:nowrap;" WIDTH="90%" class="header">File</TD> </TR> -<? for i,file in ipairs(view.value) do ?> +<% for i,file in ipairs(view.value) do %> <TR> <TD style="padding-right:20px;white-space:nowrap;"> - <? if file.value.inuse.value then ?> + <% if file.value.inuse.value then %> in use - <? else ?> - <?= html.link{value = "delete?name="..file.value.filename.value, label="Delete" } ?> - <? end ?></TD> - <TD style="padding-right:20px;white-space:nowrap;"><?= html.link{value = "view?name="..file.value.filename.value, label="View" } ?></TD> - <TD style="padding-right:20px;white-space:nowrap;"><?= html.link{value = "download?name="..file.value.filename.value, label="Download" } ?></TD> - <TD style="padding-right:20px;white-space:nowrap;text-align:right"><?= file.value.filesize.value ?></TD> - <TD style="padding-right:20px;white-space:nowrap;"><?= file.value.mtime.value ?></TD> - <TD style="white-space:nowrap;"><?= file.value.filename.value ?></TD> + <% else %> + <%= html.link{value = "delete?name="..file.value.filename.value, label="Delete" } %> + <% end %></TD> + <TD style="padding-right:20px;white-space:nowrap;"><%= html.link{value = "view?name="..file.value.filename.value, label="View" } %></TD> + <TD style="padding-right:20px;white-space:nowrap;"><%= html.link{value = "download?name="..file.value.filename.value, label="Download" } %></TD> + <TD style="padding-right:20px;white-space:nowrap;text-align:right"><%= file.value.filesize.value %></TD> + <TD style="padding-right:20px;white-space:nowrap;"><%= file.value.mtime.value %></TD> + <TD style="white-space:nowrap;"><%= file.value.filename.value %></TD> </TR> -<? end ?> +<% end %> </TABLE> diff --git a/password-read-html.lsp b/password-read-html.lsp index 9ab91bf..1636cdc 100644 --- a/password-read-html.lsp +++ b/password-read-html.lsp @@ -1,2 +1,2 @@ -<? local view = ... ?> -<p>The local root password is <?= view.password.value ?></p> +<% local view = ... %> +<p>The local root password is <%= view.password.value %></p> diff --git a/skins-read-html.lsp b/skins-read-html.lsp index 25ed300..9bb70a0 100644 --- a/skins-read-html.lsp +++ b/skins-read-html.lsp @@ -1,17 +1,17 @@ -<? local view, viewlibrary, page_info, session = ... ?> -<? require("viewfunctions") ?> +<% local view, viewlibrary, page_info, session = ... %> +<% require("viewfunctions") %> -<? displaycommandresults({"update"}, session) ?> +<% displaycommandresults({"update"}, session) %> <h1>Available skins</h1> <DL> -<? for i,skin in ipairs(view.value) do ?> - <dt><?= skin.value ?></dt> - <? if (skin.inuse) then ?> +<% for i,skin in ipairs(view.value) do %> + <dt><%= skin.value %></dt> + <% if (skin.inuse) then %> <dd>in use</dd> - <? else ?> - <dd>[<a href="update?skin=<?= skin.value ?>">use this skin</a>]</dd> - <? end ?> -<? end ?> + <% else %> + <dd>[<a href="update?skin=<%= skin.value %>">use this skin</a>]</dd> + <% end %> +<% end %> </DL> diff --git a/syslog-config-html.lsp b/syslog-config-html.lsp index 5d4061f..e6001b3 100644 --- a/syslog-config-html.lsp +++ b/syslog-config-html.lsp @@ -1,49 +1,49 @@ -<? local form, viewlibrary = ... ?> -<? require("viewfunctions") ?> -<? +<% local form, viewlibrary = ... %> +<% require("viewfunctions") %> +<% --[[ DEBUG INFORMATION io.write("<H1>Debugging</H1><span style='color:red'><H2>Debug Info:</H2>") io.write(html.cfe_unpack(form)) io.write("</span>") --]] -?> +%> -<? if viewlibrary and viewlibrary.dispatch_component then +<% if viewlibrary and viewlibrary.dispatch_component then viewlibrary.dispatch_component("status") -end ?> +end %> <H1>Configuration</H1> -<? if form.descr then ?><P CLASS='descr'><?= string.gsub(form.descr, "\n", "<BR>") ?></P><? end ?> -<? if form.errtxt then ?><P CLASS='error'><?= string.gsub(form.errtxt, "\n", "<BR>") ?></P><? end ?> +<% if form.descr then %><P CLASS='descr'><%= string.gsub(form.descr, "\n", "<BR>") %></P><% end %> +<% if form.errtxt then %><P CLASS='error'><%= string.gsub(form.errtxt, "\n", "<BR>") %></P><% end %> <form action="" method="POST"> <H2>Advanced Configuration</H2> <H3>General</H3> <DL> -<? +<% displayformitem(form.value.logfile, "logfile") displayformitem(form.value.loglevel, "loglevel") displayformitem(form.value.smallerlogs, "smallerlogs") -?> +%> </DL> <H3>Log Rotate</H3> <DL> -<? +<% displayformitem(form.value.maxsize, "maxsize") displayformitem(form.value.numrotate, "numrotate") -?> +%> </DL> <H3>Remote Logging</H3> <DL> -<? +<% displayformitem(form.value.localandnetworklog, "localandnetworklog") displayformitem(form.value.remotelogging, "remotelogging") -?> +%> </DL> <H2>Save and Apply Above Settings</H2> -<DL><DT>Save/Apply above settings</DT><DD><input class="submit" type="submit" name="<?= form.option ?>" value="Save"></DD></DL> +<DL><DT>Save/Apply above settings</DT><DD><input class="submit" type="submit" name="<%= form.option %>" value="Save"></DD></DL> </form> -<? if viewlibrary and viewlibrary.dispatch_component then +<% if viewlibrary and viewlibrary.dispatch_component then viewlibrary.dispatch_component("startstop") end -?> +%> diff --git a/syslog-loginfo-html.lsp b/syslog-loginfo-html.lsp index a0b8c38..ad3b08d 100644 --- a/syslog-loginfo-html.lsp +++ b/syslog-loginfo-html.lsp @@ -1,23 +1,23 @@ -<? local form, viewlibrary = ... ?> -<? require("viewfunctions") ?> -<? +<% local form, viewlibrary = ... %> +<% require("viewfunctions") %> +<% --[[ DEBUG INFORMATION io.write("<H1>DEBUGGING</H1><span style='color:red'><H2>DEBUG INFO: CFE</H2>") io.write(html.cfe_unpack(form)) io.write("</span>") --]] -?> +%> -<? ---[[ ?> -<? if viewlibrary and viewlibrary.dispatch_component then +<% ---[[ %> +<% if viewlibrary and viewlibrary.dispatch_component then viewlibrary.dispatch_component("status") -end ?> -<? --]] ?> +end %> +<% --]] %> <H2>Program Specific Options/Information</H2> <DL> -<? +<% displayitem(form.value.logfile) displayitem(form.value.remote) -?> +%> </DL> |