Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

OXYGEN #2: Reorganized theme selection, added indexing support

Browse source
This commit is contained in:
Steven Barth 2008-10-10 14:37:53 +00:00
parent 6bfef156f2
commit 676203d1fc
4 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libs/web/luasrc/dispatcher.lua
View file

@ -161,7 +161,7 @@ function dispatch(request)
end end
-- Init template engine -- Init template engine
if not track.notemplate then if (c and c.index) or not track.notemplate then
local tpl = require("luci.template") local tpl = require("luci.template")
local media = luci.config.main.mediaurlbase local media = luci.config.main.mediaurlbase
if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then if not pcall(tpl.Template, "themes/%s/header" % fs.basename(media)) then
@ -183,6 +183,7 @@ function dispatch(request)
viewns.striptags = util.striptags viewns.striptags = util.striptags
viewns.controller = luci.http.getenv("SCRIPT_NAME") viewns.controller = luci.http.getenv("SCRIPT_NAME")
viewns.media = media viewns.media = media
viewns.theme = fs.basename(media)
viewns.resource = luci.config.main.resourcebase viewns.resource = luci.config.main.resourcebase
viewns.REQUEST_URI = (luci.http.getenv("SCRIPT_NAME") or "") .. (luci.http.getenv("PATH_INFO") or "") viewns.REQUEST_URI = (luci.http.getenv("SCRIPT_NAME") or "") .. (luci.http.getenv("PATH_INFO") or "")
end end
@ -231,6 +232,13 @@ function dispatch(request)
luci.sys.process.setuser(track.setuser) luci.sys.process.setuser(track.setuser)
end end
if c and c.index then
local tpl = require "luci.template"
if util.copcall(tpl.render, "indexer") then
return true
end
end
if c and type(c.target) == "function" then if c and type(c.target) == "function" then
context.dispatched = c context.dispatched = c

2
modules/admin-core/luasrc/view/footer.htm
View file

@ -12,4 +12,4 @@ You may obtain a copy of the License at
$Id$ $Id$
-%> -%>
<% include("themes/" .. luci.fs.basename(media) .. "/footer") %> <% include("themes/" .. theme .. "/footer") %>

2
modules/admin-core/luasrc/view/header.htm
View file

@ -12,4 +12,4 @@ You may obtain a copy of the License at
$Id$ $Id$
-%> -%>
<% include("themes/" .. luci.fs.basename(media) .. "/header") %> <% include("themes/" .. theme .. "/header") %>

15
modules/admin-core/luasrc/view/indexer.htm Normal file
View file

@ -0,0 +1,15 @@
<%#
LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
$Id$
-%>
<% include("themes/" .. theme .. "/indexer") %>