* Separated CBI from LuCI Web

* Updated OpenWRT-Makefile
author: Steven Barth <steven@midlink.org> 2008-05-27 08:32:10 +0000
committer: Steven Barth <steven@midlink.org> 2008-05-27 08:32:10 +0000
commit: 30c8b259e1b7012f7c16c1ee5aeb1997e44dcbdc (patch)
tree: 12d1195e52a82165ea44129a7ab53126a7b2b7c9 /modules
parent: b8124f18f88fe11158eb122a1e362cfbd512cf4f (diff)
4 files changed, 154 insertions, 0 deletions
diff --git a/modules/admin-core/src/view/error404.htm b/modules/admin-core/src/view/error404.htm
new file mode 100644
index 000000000..60daee2cb
--- /dev/null
+++ b/modules/admin-core/src/view/error404.htm
@@ -0,0 +1,5 @@
+<%+header%>
+<h1>404 Not Found</h1>
+<p>Sorry, the object you requested was not found.</p>
+<tt>Unable to dispatch: <%=luci.http.env.PATH_INFO%></tt>
+<%+footer%>
+\ No newline at end of file
diff --git a/modules/admin-core/src/view/error500.htm b/modules/admin-core/src/view/error500.htm
new file mode 100644
index 000000000..8af22e8f2
--- /dev/null
+++ b/modules/admin-core/src/view/error500.htm
@@ -0,0 +1,5 @@
+<%+header%>
+<h1>500 Internal Server Error</h1>
+<p>Sorry, the server encountered an unexpected error.</p>
+<tt><%=message%></tt>
+<%+footer%>
+\ No newline at end of file
diff --git a/modules/admin-core/src/view/footer.htm b/modules/admin-core/src/view/footer.htm
new file mode 100644
index 000000000..c8506ac5c
--- /dev/null
+++ b/modules/admin-core/src/view/footer.htm
@@ -0,0 +1,7 @@
+	</div>
+	<div class="clear"></div>
+</div></div>
+
+<div class="separator magenta bold"><a href="http://luci.freifunk-halle.net"><%=require("luci").__appname__ .. " " .. luci.__version__%> - Lua Configuration Interface</a></div>
+</body>
+</html>
+\ No newline at end of file
diff --git a/modules/admin-core/src/view/header.htm b/modules/admin-core/src/view/header.htm
new file mode 100644
index 000000000..5f876781f
--- /dev/null
+++ b/modules/admin-core/src/view/header.htm
@@ -0,0 +1,137 @@
+<%
+require("luci.sys")
+local load1, load5, load15 = luci.sys.loadavg()
+
+local request  = require("luci.dispatcher").request
+local category = request[1]
+local tree     = luci.dispatcher.node()
+local cattree  = category and luci.dispatcher.node(category)
+local node     = luci.dispatcher.dispatched 
+
+local c = tree
+for i,r in ipairs(request) do
+	if c.nodes and c.nodes[r] then 
+		c = c.nodes[r]
+		c._menu_selected = true
+	end
+end
+
+require("luci.i18n").loadc("default")
+
+require("luci.http").prepare_content("text/html")
+%><?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<link rel="stylesheet" type="text/css" href="<%=media%>/cascade.css" />
+	<% if node and node.css then %><link rel="stylesheet" type="text/css" href="<%=resource%>/<%=node.css%>" /><% end %>
+	<meta http-equiv="content-type" content="text/xhtml+xml; charset=utf-8" />
+	<meta http-equiv="content-script-type" content="text/javascript" />
+	<title>LuCI - Lua Configuration Interface</title>
+</head>
+<body>
+<div id="header">
+	<div class="headerlogo left"><img src="<%=media%>/logo.png" alt="<%=luci.config.brand.title%>" /></div>
+	<div class="whitetext smalltext right">
+	<%=luci.config.brand.firmware%><br />
+	<%=luci.config.brand.distro%><br />
+	<%:load Last%>: <%=load1%> <%=load5%> <%=load15%><br />
+	<%:hostname Hostname%>: <%=luci.sys.hostname()%> 
+	</div>
+	<div>
+		<span class="headertitle"><%=luci.config.brand.title%></span><br />
+		<span class="whitetext bold"><%=luci.config.brand.subtitle%></span>
+	</div>
+</div>
+
+<div class="separator yellow bold">
+<%:path Pfad%>: <% 
+local c = tree
+local url = controller
+for k,v in pairs(request) do
+	if c.nodes and c.nodes[v] then
+		c = c.nodes[v]
+		url = url .. "/" .. v
+	%><a href="<%=url%>"><%=c.title or v%></a> <% if k ~= #request then %>&#187; <% end
+	end
+end
+%>
+</div>
+
+<div id="columns"><div id="columnswrapper">
+	<div class="sidebar left">
+<%
+local function submenu(prefix, node)
+	if not node._menu_selected or not node.nodes then
+		return false
+	end
+	local index = {}	
+	for k, n in pairs(node.nodes) do
+		table.insert(index, {name=k, order=n.order or 100})
+	end
+		
+	table.sort(index, function(a, b) return a.order < b.order end)
+%>
+	<ul>
+	<% for j, v in pairs(index) do 
+		local nnode = node.nodes[v.name]%>
+		<li>
+			<span<% if nnode._menu_selected then %> class="yellowtext"<%end%>><a href="<%=controller .. prefix .. v.name%>"><%=nnode.title%></a></span>
+			<% submenu(prefix .. v.name .. "/", nnode) %>
+		</li>
+	<% end %>
+		</ul> 
+<%	 
+end
+
+if cattree and cattree.nodes then
+	local index = {}	
+	for k, node in pairs(cattree.nodes) do
+		table.insert(index, {name=k, order=node.order or 100})
+	end
+	
+	table.sort(index, function(a, b) return a.order < b.order end)
+
+	for i, k in ipairs(index) do
+		node = cattree.nodes[k.name]
+		if node.title then %>
+			<div<% if node._menu_selected then %> class="yellowtext"<%end%>><a href="<%=controller%>/<%=category%>/<%=k.name%>"><%=node.title%></a>			
+				<%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
+			</div>
+<%		end
+	end
+end
+%>		
+	</div>
+	<div class="sidebar right">
+		<div><%:webif Weboberfläche%>
+			<ul><%
+				for k,node in pairs(tree.nodes) do
+					if node.title then %>
+						<li<% if request[1] == k then %> class="yellowtext"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li>
+<%					end
+				end%>
+			</ul>
+		</div>
+		<%
+			if "admin" == request[1] then
+				require("luci.model.uci") 
+				local ucic = luci.model.uci.changes()
+				if ucic then
+					ucic = #luci.util.split(ucic)
+				end
+		%>
+		<div><%:config Konfiguration%>
+			<ul>
+			<% if ucic then %>
+				<li><a href="<%=controller%>/admin/uci/changes"><%:changes Änderungen%>: <%=ucic%></a></li>
+				<li><a href="<%=controller%>/admin/uci/apply"><%:apply Anwenden%></a></li>
+				<li><a href="<%=controller%>/admin/uci/revert"><%:revert Verwerfen%></a></li>
+			<% else %>
+				<li><%:changes Änderungen%>: 0</li>
+			<% end %>
+			</ul>
+		</div>
+		<% end %>
+	</div>
+	<div id="content">
+\ No newline at end of file
author	Steven Barth <steven@midlink.org>	2008-05-27 08:32:10 +0000
committer	Steven Barth <steven@midlink.org>	2008-05-27 08:32:10 +0000
commit	30c8b259e1b7012f7c16c1ee5aeb1997e44dcbdc (patch)
tree	12d1195e52a82165ea44129a7ab53126a7b2b7c9 /modules
parent	b8124f18f88fe11158eb122a1e362cfbd512cf4f (diff)