diff options
| author | Ted Trask <ttrask01@yahoo.com> | 2008-05-14 20:44:18 +0000 |
|---|---|---|
| committer | Ted Trask <ttrask01@yahoo.com> | 2008-05-14 20:44:18 +0000 |
| commit | eb779faf48d89baea5b3b9b4ce09cb09e9cd9cfe (patch) | |
| tree | 4734eba845f293e9bcb33c5aca5e0d5eaed2d821 /app/template-html.lsp | |
| parent | 309ecb7da28b78999d29eea937ebdd8eaa411d66 (diff) | |
| download | acf-core-eb779faf48d89baea5b3b9b4ce09cb09e9cd9cfe.tar.bz2 acf-core-eb779faf48d89baea5b3b9b4ce09cb09e9cd9cfe.tar.xz | |
Added suppress_view option to dispatch_component and return viewtable.
Removed hostname from pageinfo and replaced with component load in template.
A little cleanup to use pageinfo in views.
git-svn-id: svn://svn.alpinelinux.org/acf/core/trunk@1119 ab2d0c66-481e-0410-8bed-d214d4d58bed
Diffstat (limited to 'app/template-html.lsp')
| -rw-r--r-- | app/template-html.lsp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/app/template-html.lsp b/app/template-html.lsp index a60f2b5..307807f 100644 --- a/app/template-html.lsp +++ b/app/template-html.lsp @@ -13,7 +13,16 @@ Content-Type: text/html <html lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title><?= pageinfo.hostname .. " - " .. pageinfo.controller .. "->" .. pageinfo.action ?></title> +<? +local hostname = "" +if viewlibrary and viewlibrary.dispatch_component then + local result = viewlibrary.dispatch_component("alpine-baselayout/hostname/read", nil, true) + if result and result.value then + hostname = result.value + end +end +?> +<title><?= hostname .. " - " .. pageinfo.controller .. "->" .. pageinfo.action ?></title> <link rel="stylesheet" type="text/css" href="/static/reset.css"> <link rel="stylesheet" type="text/css" href="<?= "/"..pageinfo.skin.."/"..pageinfo.skin..".css" ?>"> <!--[if IE]> @@ -30,12 +39,12 @@ Content-Type: text/html <div id="logo"> <div class="leader"></div> <h1>AlpineLinux</h1> - <p><?= pageinfo.hostname or "unknown hostname" ?></p> + <p><?= hostname or "unknown hostname" ?></p> <div class="tailer"></div> </div> <span class="mute"> <p> - <? local ctlr = pageinfo.script .. "/acf-util/logon/" + <? local ctlr = pageinfo.appuri .. "/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" ) ) @@ -72,7 +81,7 @@ Content-Type: text/html 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,ENV.SCRIPT_NAME,group.prefix, group.controller, group.tabs[1].action, group.name )) + class,pageinfo.appuri,group.prefix, group.controller, group.tabs[1].action, group.name )) end io.write ( "\t\t\t\t\t</ul>" ) end |