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

luci-0.10: Merge r7863

Browse source
This commit is contained in:
Manuel Munz 2011-11-02 08:47:44 +00:00
parent f60d31425e
commit 9c7ee0afc5
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/freifunk/luasrc/view/freifunk/contact.htm
View file

@ -16,9 +16,20 @@ You may obtain a copy of the License at
<%
local uci = require "luci.model.uci".cursor()
local contact = uci:get_all("freifunk", "contact")
local location = uci:get_first("system", "system", "location") or contact.location
local nickname, name, mail, phone, location, note
local lon = uci:get_first("system", "system", "longitude")
local lat = uci:get_first("system", "system", "latitude")
if not contact then
nickname, name, mail, phone, location, note = ""
else
nickname = contact.nickname or ""
name = contact.name or ""
mail = contact.mail or ""
phone = contact.phone or ""
location = uci:get_first("system", "system", "location") or contact.location
note = contact.note or ""
end
%>
<h2><a id="content" name="content"><%:Contact%></a></h2>
@ -26,10 +37,10 @@ local lat = uci:get_first("system", "system", "latitude")
<fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section">
<legend><%:Operator%></legend>
<table cellspacing="10" width="100%" style="text-align:left">
<tr><th width="33%"><%:Nickname%>:</th><td><%=contact.nickname%></td></tr>
<tr><th width="33%"><%:Realname%>:</th><td><%=contact.name%></td></tr>
<tr><th width="33%"><%:E-Mail%>:</th><td><a href="mailto:<%=contact.mail%>"><%=contact.mail%></a></td></tr>
<tr><th width="33%"><%:Phone%>:</th><td><%=contact.phone%></td></tr>
<tr><th width="33%"><%:Nickname%>:</th><td><%=nickname%></td></tr>
<tr><th width="33%"><%:Realname%>:</th><td><%=name%></td></tr>
<tr><th width="33%"><%:E-Mail%>:</th><td><a href="mailto:<%=mail%>"><%=mail%></a></td></tr>
<tr><th width="33%"><%:Phone%>:</th><td><%=phone%></td></tr>
</table>
</fieldset>
@ -41,11 +52,11 @@ local lat = uci:get_first("system", "system", "latitude")
</table>
</fieldset>
<% if contact.note then %>
<% if note then %>
<fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section">
<legend><%:Notice%></legend>
<table cellspacing="10" width="100%" style="text-align:left">
<tr><td><%=contact.note%></td></tr>
<tr><td><%=note%></td></tr>
</table>
</fieldset>
<%end%>

21
modules/freifunk/luasrc/view/freifunk/index.htm
View file

@ -15,19 +15,28 @@ $Id$
<%+header%>
<%
local uci = require "luci.model.uci".cursor()
local ff = {}
local ff = uci:get_all("freifunk")
if not ff.community.name then
ff.community.name = ""
if not ff or not ff.community.name then
community = "Freifunk"
DefaultText = ""
nickname = "No Nickname set"
else
community = ff.community.name
DefaultText = ff.community.DefaultText
nickname = ff.contact.nickname
end
local co = "profile_" .. ff.community.name
local community = uci:get_first(co, "community", "name") or "Freifunk"
local co = "profile_" .. community
--local community = uci:get_first(co, "community", "name") or "Freifunk"
local url = uci:get_first(co, "community", "homepage") or "http://www.freifunk.net"
require("luci.fs")
local usertext = luci.fs.readfile("/www/luci-static/index_user.html")
if (ff.community.DefaultText or "") ~= "disabled" then
if DefaultText ~= "disabled" then
defaulttext = '<h2><a id="content" name="content">'..
(translate("Hello and welcome in the network of"))..
@ -44,7 +53,7 @@ if (ff.community.DefaultText or "") ~= "disabled" then
' <a href="'..
luci.dispatcher.build_url("freifunk", "contact")..
'">'..
(ff.contact.nickname or translate("Please set your contact information"))..
(nickname or translate("Please set your contact information"))..
'</a>.</p><p>'..
translate("You can find further information about the global Freifunk initiative at")..
' <a href="http://freifunk.net">Freifunk.net</a>.<br />'..