diff options
Diffstat (limited to 'core/src/view')
| -rw-r--r-- | core/src/view/cbi/header.htm | 2 | ||||
| -rw-r--r-- | core/src/view/cbi/mvalue.htm | 4 | ||||
| -rw-r--r-- | core/src/view/error404.htm | 2 | ||||
| -rw-r--r-- | core/src/view/footer.htm | 2 | ||||
| -rw-r--r-- | core/src/view/header.htm | 26 |
5 files changed, 18 insertions, 18 deletions
diff --git a/core/src/view/cbi/header.htm b/core/src/view/cbi/header.htm index 3b615d7294..a66d28fee5 100644 --- a/core/src/view/cbi/header.htm +++ b/core/src/view/cbi/header.htm @@ -1,5 +1,5 @@ <%+header%> - <form method="post" action="<%=ffluci.http.env.REQUEST_URI%>"> + <form method="post" action="<%=luci.http.env.REQUEST_URI%>"> <div> <script type="text/javascript" src="<%=media%>/cbi.js"></script> <input type="hidden" name="cbi.submit" value="1" /> diff --git a/core/src/view/cbi/mvalue.htm b/core/src/view/cbi/mvalue.htm index 97a1c4295a..bed66e569a 100644 --- a/core/src/view/cbi/mvalue.htm +++ b/core/src/view/cbi/mvalue.htm @@ -5,14 +5,14 @@ local v = self:valuelist(section) <% if self.widget == "select" then %> <select multiple="multiple" name="cbid.<%=self.config.."."..section.."."..self.option%>[]"<% if self.size then %> size="<%=self.size%>"<% end %>> <%for i, key in pairs(self.keylist) do %> - <option<% if ffluci.util.contains(v, key) then %> selected="selected"<% end %> value="<%=key%>"><%=self.vallist[i]%></option> + <option<% if luci.util.contains(v, key) then %> selected="selected"<% end %> value="<%=key%>"><%=self.vallist[i]%></option> <% end %> </select> <% elseif self.widget == "checkbox" then local c = 0; for i, key in pairs(self.keylist) do c = c + 1%> - <%=self.vallist[i]%><input type="checkbox" name="cbid.<%=self.config.."."..section.."."..self.option%>[]"<% if ffluci.util.contains(v, key) then %> checked="checked"<% end %> value="<%=key%>" /> + <%=self.vallist[i]%><input type="checkbox" name="cbid.<%=self.config.."."..section.."."..self.option%>[]"<% if luci.util.contains(v, key) then %> checked="checked"<% end %> value="<%=key%>" /> <% if c == self.size then c = 0 %><br /> <% end end %> <% end %> diff --git a/core/src/view/error404.htm b/core/src/view/error404.htm index 51ea176d6e..60daee2cbd 100644 --- a/core/src/view/error404.htm +++ b/core/src/view/error404.htm @@ -1,5 +1,5 @@ <%+header%> <h1>404 Not Found</h1> <p>Sorry, the object you requested was not found.</p> -<tt>Unable to dispatch: <%=ffluci.http.env.PATH_INFO%></tt> +<tt>Unable to dispatch: <%=luci.http.env.PATH_INFO%></tt> <%+footer%>
\ No newline at end of file diff --git a/core/src/view/footer.htm b/core/src/view/footer.htm index f324408a1c..c8506ac5c6 100644 --- a/core/src/view/footer.htm +++ b/core/src/view/footer.htm @@ -2,6 +2,6 @@ <div class="clear"></div> </div></div> -<div class="separator magenta bold"><a href="http://luci.freifunk-halle.net"><%=require("ffluci").__appname__ .. " " .. ffluci.__version__%> - Freifunk Lua Configuration Interface</a></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/core/src/view/header.htm b/core/src/view/header.htm index 99b43805d3..126eb3696b 100644 --- a/core/src/view/header.htm +++ b/core/src/view/header.htm @@ -1,12 +1,12 @@ <% -require("ffluci.sys") -local load1, load5, load15 = ffluci.sys.loadavg() +require("luci.sys") +local load1, load5, load15 = luci.sys.loadavg() -local request = require("ffluci.dispatcher").request +local request = require("luci.dispatcher").request local category = request[1] -local tree = ffluci.dispatcher.node() -local cattree = category and ffluci.dispatcher.node(category) -local node = ffluci.dispatcher.dispatched +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 @@ -16,9 +16,9 @@ for i,r in ipairs(request) do end end -require("ffluci.i18n").loadc("default") +require("luci.i18n").loadc("default") -require("ffluci.http").prepare_content("text/html") +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"> @@ -27,7 +27,7 @@ require("ffluci.http").prepare_content("text/html") <% 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>FFLuCI - Freifunk Lua Configuration Interface</title> + <title>LuCI - Lua Configuration Interface</title> </head> <body> <div id="header"> @@ -36,7 +36,7 @@ require("ffluci.http").prepare_content("text/html") OpenWRT Kamikaze<br /> Freifunk Firmware 2.0-dev<br /> <%:load Last%>: <%=load1%> <%=load5%> <%=load15%><br /> - <%:hostname Hostname%>: <%=ffluci.sys.hostname()%> + <%:hostname Hostname%>: <%=luci.sys.hostname()%> </div> <div> <span class="headertitle"><%~luci.main.title%></span><br /> @@ -115,10 +115,10 @@ end </div> <% if "admin" == request[1] then - require("ffluci.model.uci") - local ucic = ffluci.model.uci.changes() + require("luci.model.uci") + local ucic = luci.model.uci.changes() if ucic then - ucic = #ffluci.util.split(ucic) + ucic = #luci.util.split(ucic) end %> <div><%:config Konfiguration%> |