luci-0.10: Merge r7866

This commit is contained in:
Manuel Munz 2011-11-02 10:35:03 +00:00
parent bcfa820625
commit 7d121d1573

View file

@ -8,6 +8,15 @@ local latitude = uci:get_first ("system", "system", "latitude")
local longitude = uci:get_first ("system", "system", "longitude")
local location = uci:get_first ("system", "system", "location")
local basicsurl = luci.dispatcher.build_url(luci.dispatcher.context.path[1], "freifunk", "basics")
local nickname, name, mail
if not contact then
nickname, name, mail = ""
else
nickname = contact.nickname
name = contact.name
mail = contact.mail
end
luci.i18n.loadc("freifunk")
%>
@ -23,7 +32,7 @@ luci.i18n.loadc("freifunk")
<%end%>
<p />
<% if not (contact.nickname and contact.name and contact.mail) then%>
<% if not (nickname and name and mail) then%>
<div class="error">
<%:Contact information is incomplete. Please go to%> <a href='<%=contacturl%>'><%:Contact%></a> <%:and fill out all required fields.%>
<p />