summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMika Havela <mika.havela@gmail.com>2008-03-31 15:35:57 +0000
committerMika Havela <mika.havela@gmail.com>2008-03-31 15:35:57 +0000
commit0cd84aec11e0a54ab6e6beae46813e4e71ba27bd (patch)
treedb4fb022cecad1afd6d5ce3c7738d34df3e75452
parentc673190e23ddccd06e6365b2e1f35f446c0fcddd (diff)
downloadacf-opennhrp-0cd84aec11e0a54ab6e6beae46813e4e71ba27bd.tar.bz2
acf-opennhrp-0cd84aec11e0a54ab6e6beae46813e4e71ba27bd.tar.xz
Added description to the different types.
git-svn-id: svn://svn.alpinelinux.org/acf/opennhrp/trunk@865 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--opennhrp-model.lua2
-rw-r--r--opennhrp-status-html.lsp6
2 files changed, 7 insertions, 1 deletions
diff --git a/opennhrp-model.lua b/opennhrp-model.lua
index af5046f..f809283 100644
--- a/opennhrp-model.lua
+++ b/opennhrp-model.lua
@@ -75,6 +75,8 @@ local function opennhrpctl_show()
if (string.lower(k) == "type") then
local tooltip = string.match(v,"^.-:%s?(.*)")
cmd_output_result_table[cnt]["Tooltip"] = type_status[tooltip]
+ local typestatus = string.lower(string.match(v,"^.-:%s?(.*)"))
+ cmd_output_result_table[cnt]['type_descr']=(type_status[typestatus] or "")
end
end
end
diff --git a/opennhrp-status-html.lsp b/opennhrp-status-html.lsp
index 180c291..0d84bc1 100644
--- a/opennhrp-status-html.lsp
+++ b/opennhrp-status-html.lsp
@@ -65,7 +65,11 @@ for k,v in pairs(myform.option or {}) do
if (k2) and not ((string.lower(k2) == "protocol-address") or
(string.lower(k2) == "tooltip") or
(string.lower(k2) == "interface")) then
- io.write("<TR><TD STYLE='font-weight:bold;padding-left:40px;'>"..k2.."</TD><TD>"..v2.."</TD></TR>\n")
+ io.write("<TR><TD STYLE='font-weight:bold;padding-left:40px;'>"..k2.."</TD><TD>"..v2)
+ if (string.lower(k2) == "type") then
+ io.write(" <I>(" .. (v1['type_descr'] or "") .. ")</I>")
+ end
+ io.write("</TD></TR>\n")
end
end