summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTed Trask <ttrask01@yahoo.com>2008-06-13 12:57:21 +0000
committerTed Trask <ttrask01@yahoo.com>2008-06-13 12:57:21 +0000
commit6ecf169b19bc153c1af23cc8973ffbafdfc138f9 (patch)
tree1c5312dc4c48e42be4afbc3dac3ff93645160f9a
parentbddb9d2c490bd51731e2a85fa7aa44e6f97952d5 (diff)
downloadacf-gnats-6ecf169b19bc153c1af23cc8973ffbafdfc138f9.tar.bz2
acf-gnats-6ecf169b19bc153c1af23cc8973ffbafdfc138f9.tar.xz
Added javascript to dispatch error and exception pages.
Removed gnats template and moved javascript init into query page. git-svn-id: svn://svn.alpinelinux.org/acf/gnats/trunk@1216 ab2d0c66-481e-0410-8bed-d214d4d58bed
-rw-r--r--Makefile1
-rw-r--r--gnats-query-html.lsp10
-rw-r--r--template-html.lsp155
3 files changed, 10 insertions, 156 deletions
diff --git a/Makefile b/Makefile
index bf6f075..1138d7f 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ VERSION=0.3
APP_DIST=\
gnats* \
- template-html.lsp
EXTRA_DIST=README Makefile config.mk
diff --git a/gnats-query-html.lsp b/gnats-query-html.lsp
index cc7824b..fcd9a33 100644
--- a/gnats-query-html.lsp
+++ b/gnats-query-html.lsp
@@ -7,6 +7,16 @@ io.write("</span>")
--]]
?>
+<script type="text/javascript" src="/js/jquery-1.2.5.min.js"></script>
+<script type="text/javascript" src="/js/sgbeal-togglepane.jquery.min.js"></script>
+<script type="text/javascript">
+
+$(document).ready(function() {
+ $('#toggle_pane').initTogglePane({ startOpened:false});
+});
+
+</script>
+
<?
function displayinfo(myform,tags,viewtype)
for k,v in pairs(tags) do
diff --git a/template-html.lsp b/template-html.lsp
deleted file mode 100644
index f429394..0000000
--- a/template-html.lsp
+++ /dev/null
@@ -1,155 +0,0 @@
-<? local viewtable, viewlibrary, pageinfo, session = ...
- html=require("html") ?>
-Status: 200 OK
-Content-Type: text/html
-<? if (session.id) then
- io.write( html.cookie.set("sessionid", session.id) )
- else
- io.write (html.cookie.unset("sessionid"))
- end
-?>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title><?= pageinfo.controller .. "->" .. pageinfo.action ?></title>
-<script type="text/javascript" src="/js/jquery-1.2.5.min.js"></script>
-<script type="text/javascript" src="/js/sgbeal-togglepane.jquery.min.js"></script>
-<link rel="stylesheet" type="text/css" href="<?= pageinfo.skindir ?>static/reset.css">
-<link rel="stylesheet" type="text/css" href="<?= pageinfo.skindir .. pageinfo.skin.."/"..pageinfo.skin..".css" ?>">
-<!--[if IE]>
-<link rel="stylesheet" type="text/css" href="<?= pageinfo.skindir .. pageinfo.skin.."/"..pageinfo.skin.."-ie.css" ?>">
-<![endif]-->
-
-<script type="text/javascript">
-
-$(document).ready(function() {
- $('#toggle_pane').initTogglePane({ startOpened:false});
-});
-
-</script>
-
-
-</head>
-<body>
-
-<div id="page">
- <div id="header">
- <div class="leader">
- <a href="#Content" class="hide">[Skip to main content]</a>
- </div>
- <div id="logo">
- <div class="leader"></div>
- <h1>AlpineLinux</h1>
- <p><?= hostname or "" ?></p>
- <div class="tailer"></div>
- </div>
- <span class="mute">
- <p>
- <? local ctlr = pageinfo.script .. "/acf-util/logon/"
-
- if session.userinfo and session.userinfo.userid then
- io.write ( string.format("\t\t\t\t\t\t<a href=\"%s\">Log out as '" .. session.userinfo.userid .. "'</a>\n", ctlr .. "logout" ) )
- else
- io.write ( string.format("\t\t\t\t\t\t<a href=\"%s\">Log in</a>\n", ctlr .. "logon" ) )
- end ?>
- |
- <a href="/">home</a> |
- <a href="http://wiki.alpinelinux.org">about</a>
- </p></span>
- <div class="tailer"></div>
- </div> <!-- header -->
-
- <div id="main">
- <div class="leader">
- </div>
-
- <div id="nav">
- <div class="leader">
- <h3 class="hide">[Main menu]</h3>
- </div>
-
- <?
- local class
- local tabs
- io.write ( "<ul>")
- for x,cat in ipairs(session.menu.cats) do
- io.write (string.format("\n\t\t\t\t<li>%s\n\t\t\t\t\t<ul>\n", cat.name)) --start row
- for y,group in ipairs(cat.groups) do
- if pageinfo.prefix == group.prefix .. '/' and pageinfo.controller == group.controller then
- class="class='selected'"
- tabs = group.tabs
- else
- class=""
- end
- io.write (string.format("\t\t\t\t\t\t<li %s><a href=\"%s%s/%s/%s\">%s</a></li>\n",
- class,pageinfo.script,group.prefix, group.controller, group.tabs[1].action, group.name ))
- end
- io.write ( "\t\t\t\t\t</ul>" )
- end
- io.write ( "\n\t\t\t\t</li>\n\t\t\t</ul>\n")
- ?>
-
- <div class="tailer">
- </div>
- </div> <!-- nav -->
-
-
- <div id="postnav">
- <div class="leader">
- </div>
- <h2><?= pageinfo.controller ?> : <?= pageinfo.action ?></h2>
- <!-- FIXME: Next row is 'dead' data! Remove 'class=hide' when done! -->
- <p class='hide'>[ welcome ] > [ login ] > [ bgp ] > [ firewall ] > [ content filter ] > [ interfaces ]</p>
- <div class="tailer">
- </div>
- </div> <!-- postnav -->
-
- <a name="Content"></a>
-
- <div id="subnav">
- <div class="leader">
- <h3 class="hide">[Submenu]</h3>
- </div>
-
- <? local class="" ?>
- <? for x,tab in pairs(tabs or {}) do
- if tab.action == pageinfo.action then
- class="class='selected'"
- else
- class=""
- end
- io.write (string.format('\t\t\t<a %s href="%s">%s</a>\n',class,tab.action,tab.name ))
- end
- ?>
-
- <div class="tailer">
- </div>
- </div> <!-- subnav -->
-
-<div id="content">
- <div class="leader">
- </div>
-
- <? local func = haserl.loadfile(pageinfo.viewfile) ?>
- <? func (viewtable, viewlibrary, pageinfo, session) ?>
-
- <div class="tailer">
- </div>
-</div> <!-- content -->
-
- </div> <!-- main -->
-
- <div id="footer">
- <div class="leader">
- </div>
- Made with care by webconf
- <div class="tailer">
- </div>
- </div> <!-- footer -->
-</div> <!-- page -->
-
-</body>
-</html>
-