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

modules/freifunk: Nicer layout of the contact page; make note a TextValue field in the admin interface

Browse source
This commit is contained in:
Manuel Munz 2011-10-21 13:27:55 +00:00
parent cd1fa7c070
commit c0ce5f96f2
21 changed files with 92 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
View file

@ -2,14 +2,13 @@
LuCI - Lua Configuration Interface LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
$Id$
]]-- ]]--
luci.i18n.loadc("freifunk") luci.i18n.loadc("freifunk")
@ -18,17 +17,10 @@ m = Map("freifunk", translate("Contact"), translate("Please fill in your contact
c = m:section(NamedSection, "contact", "public", "") c = m:section(NamedSection, "contact", "public", "")
local nick = c:option(Value, "nickname", translate("Nickname")) c:option(Value, "nickname", translate("Nickname"))
nick.rmempty = false c:option(Value, "name", translate("Realname"))
c:option(Value, "mail", translate("E-Mail"))
name = c:option(Value, "name", translate("Realname"))
name.rmempty = false
mail = c:option(Value, "mail", translate("E-Mail"))
mail.rmempty = false
c:option(Value, "phone", translate("Phone")) c:option(Value, "phone", translate("Phone"))
c:option(TextValue, "note", translate("Notice")).rows = 10
c:option(Value, "note", translate("Notice"))
return m return m

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

@ -2,16 +2,15 @@
LuCI - Lua Configuration Interface LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org> Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net> Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
Copyright 2011 Manuel Munz <freifunk at somakoma dot de>
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
You may obtain a copy of the License at You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
$Id$
-%> -%>
<%+header%> <%+header%>
<% <%
@ -23,13 +22,32 @@ local lat = uci:get_first("system", "system", "latitude")
%> %>
<h2><a id="content" name="content"><%:Contact%></a></h2> <h2><a id="content" name="content"><%:Contact%></a></h2>
<table cellspacing="0" cellpadding="6">
<tr><th><%:Nickname%>:</th><td><%=contact.nickname%></td></tr> <fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section">
<tr><th><%:Realname%>:</th><td><%=contact.name%></td></tr> <legend><%:Operator%></legend>
<tr><th><%:E-Mail%>:</th><td><%=contact.mail%></td></tr> <table cellspacing="10" width="100%" style="text-align:left">
<tr><th><%:Phone%>:</th><td><%=contact.phone%></td></tr> <tr><th width="33%"><%:Nickname%>:</th><td><%=contact.nickname%></td></tr>
<tr><th><%:Location%>:</th><td><%=location%></td></tr> <tr><th width="33%"><%:Realname%>:</th><td><%=contact.name%></td></tr>
<tr><th><%:Coordinates%>:</th><td><%=lat%> <%=lon%></td></tr> <tr><th width="33%"><%:E-Mail%>:</th><td><a href="mailto:<%=contact.mail%>"><%=contact.mail%></a></td></tr>
<tr><th><%:Notice%>:</th><td><%=contact.note%></td></tr> <tr><th width="33%"><%:Phone%>:</th><td><%=contact.phone%></td></tr>
</table> </table>
</fieldset>
<fieldset xmlns="http://www.w3.org/1999/xhtml" class="cbi-section">
<legend><%:Location%></legend>
<table cellspacing="10" width="100%" style="text-align:left">
<tr><th width="33%"><%:Location%>:</th><td><%=location%></td></tr>
<tr><th width="33%"><%:Coordinates%>:</th><td><%=lat%> <%=lon%> (<a href="<%=pcdata(luci.dispatcher.build_url("freifunk/map"))%>"><%:Show on map%>)</a></td></tr>
</table>
</fieldset>
<% if contact.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>
</table>
</fieldset>
<%end%>
<%+footer%> <%+footer%>

16
po/ca/freifunk.po
View file

@ -197,6 +197,9 @@ msgstr "Avís"
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""
@ -358,16 +361,3 @@ msgstr ""
msgid "wireless settings" msgid "wireless settings"
msgstr "" msgstr ""

36
po/de/freifunk.po
View file

@ -205,6 +205,9 @@ msgstr "Notiz"
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr "Betreiber"
msgid "Overview" msgid "Overview"
msgstr "Übersicht" msgstr "Übersicht"
@ -382,36 +385,3 @@ msgstr ""
msgid "wireless settings" msgid "wireless settings"
msgstr "Drahtloseinstellungen" msgstr "Drahtloseinstellungen"

3
po/el/freifunk.po
View file

@ -195,6 +195,9 @@ msgstr "Σημείωση"
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""

16
po/en/freifunk.po
View file

@ -195,6 +195,9 @@ msgstr "Notice"
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""
@ -358,16 +361,3 @@ msgstr ""
msgid "wireless settings" msgid "wireless settings"
msgstr "" msgstr ""

16
po/es/freifunk.po
View file

@ -197,6 +197,9 @@ msgstr "Aviso"
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""
@ -359,16 +362,3 @@ msgstr ""
msgid "wireless settings" msgid "wireless settings"
msgstr "" msgstr ""

3
po/fr/freifunk.po
View file

@ -193,6 +193,9 @@ msgstr ""
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""

3
po/he/freifunk.po
View file

@ -190,6 +190,9 @@ msgstr ""
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""

3
po/it/freifunk.po
View file

@ -193,6 +193,9 @@ msgstr ""
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""

3
po/ja/freifunk.po
View file

@ -193,6 +193,9 @@ msgstr ""
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""

3
po/ms/freifunk.po
View file

@ -189,6 +189,9 @@ msgstr ""
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""

23
po/no/freifunk.po
View file

@ -191,6 +191,9 @@ msgstr "Merknad"
msgid "OLSR" msgid "OLSR"
msgstr "OLSR" msgstr "OLSR"
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "Oversikt" msgstr "Oversikt"
@ -369,23 +372,3 @@ msgstr "brukt"
msgid "wireless settings" msgid "wireless settings"
msgstr "trådløse innstillinger" msgstr "trådløse innstillinger"

3
po/pl/freifunk.po
View file

@ -191,6 +191,9 @@ msgstr ""
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""

3
po/pt/freifunk.po
View file

@ -197,6 +197,9 @@ msgstr "Notas"
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""

23
po/pt_BR/freifunk.po
View file

@ -202,6 +202,9 @@ msgstr "Aviso"
msgid "OLSR" msgid "OLSR"
msgstr "OLSR" msgstr "OLSR"
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "Visão Geral" msgstr "Visão Geral"
@ -382,23 +385,3 @@ msgstr "não usado"
msgid "wireless settings" msgid "wireless settings"
msgstr "configurações da rede sem fio" msgstr "configurações da rede sem fio"

3
po/ro/freifunk.po
View file

@ -191,6 +191,9 @@ msgstr ""
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""

23
po/ru/freifunk.po
View file

@ -201,6 +201,9 @@ msgstr "Внимание"
msgid "OLSR" msgid "OLSR"
msgstr "OLSR" msgstr "OLSR"
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "Обзор" msgstr "Обзор"
@ -380,23 +383,3 @@ msgstr "использовано"
msgid "wireless settings" msgid "wireless settings"
msgstr "настройки беспроводной сети" msgstr "настройки беспроводной сети"

3
po/templates/freifunk.pot
View file

@ -182,6 +182,9 @@ msgstr ""
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""

16
po/vi/freifunk.po
View file

@ -196,6 +196,9 @@ msgstr "Chú ý"
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""
@ -356,16 +359,3 @@ msgstr ""
msgid "wireless settings" msgid "wireless settings"
msgstr "" msgstr ""

7
po/zh_CN/freifunk.po
View file

@ -193,6 +193,9 @@ msgstr ""
msgid "OLSR" msgid "OLSR"
msgstr "" msgstr ""
msgid "Operator"
msgstr ""
msgid "Overview" msgid "Overview"
msgstr "" msgstr ""
@ -353,7 +356,3 @@ msgstr ""
msgid "wireless settings" msgid "wireless settings"
msgstr "" msgstr ""