summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorManuel Munz <freifunk@somakoma.de>2011-10-21 13:27:55 +0000
committerManuel Munz <freifunk@somakoma.de>2011-10-21 13:27:55 +0000
commitc0ce5f96f28b6db62470ad24799ee09af5a3f9d4 (patch)
treee34363806dd36c029a2e424108a85f96317597ee
parentcd1fa7c070eb3e700c4978c5c71cabcf1b693f6e (diff)
modules/freifunk: Nicer layout of the contact page; make note a TextValue field in the admin interface
Diffstat
-rw-r--r--modules/freifunk/luasrc/model/cbi/freifunk/contact.lua18
-rw-r--r--modules/freifunk/luasrc/view/freifunk/contact.htm42
-rw-r--r--po/ca/freifunk.po16
-rw-r--r--po/de/freifunk.po36
-rw-r--r--po/el/freifunk.po3
-rw-r--r--po/en/freifunk.po16
-rw-r--r--po/es/freifunk.po16
-rw-r--r--po/fr/freifunk.po3
-rw-r--r--po/he/freifunk.po3
-rw-r--r--po/it/freifunk.po3
-rw-r--r--po/ja/freifunk.po3
-rw-r--r--po/ms/freifunk.po3
-rw-r--r--po/no/freifunk.po23
-rw-r--r--po/pl/freifunk.po3
-rw-r--r--po/pt/freifunk.po3
-rw-r--r--po/pt_BR/freifunk.po23
-rw-r--r--po/ro/freifunk.po3
-rw-r--r--po/ru/freifunk.po23
-rw-r--r--po/templates/freifunk.pot3
-rw-r--r--po/vi/freifunk.po16
-rw-r--r--po/zh_CN/freifunk.po7
21 files changed, 92 insertions, 174 deletions
diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
index 178df28b8..6f998819a 100644
--- a/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
+++ b/modules/freifunk/luasrc/model/cbi/freifunk/contact.lua
@@ -2,14 +2,13 @@
LuCI - Lua Configuration Interface
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");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
]]--
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", "")
-local nick = c:option(Value, "nickname", translate("Nickname"))
-nick.rmempty = false
-
-name = c:option(Value, "name", translate("Realname"))
-name.rmempty = false
-
-mail = c:option(Value, "mail", translate("E-Mail"))
-mail.rmempty = false
-
+c:option(Value, "nickname", translate("Nickname"))
+c:option(Value, "name", translate("Realname"))
+c:option(Value, "mail", translate("E-Mail"))
c:option(Value, "phone", translate("Phone"))
-
-c:option(Value, "note", translate("Notice"))
+c:option(TextValue, "note", translate("Notice")).rows = 10
return m
diff --git a/modules/freifunk/luasrc/view/freifunk/contact.htm b/modules/freifunk/luasrc/view/freifunk/contact.htm
index 1ebbf69f7..72d868b66 100644
--- a/modules/freifunk/luasrc/view/freifunk/contact.htm
+++ b/modules/freifunk/luasrc/view/freifunk/contact.htm
@@ -2,16 +2,15 @@
LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org>
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");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
-$Id$
-
-%>
+
<%+header%>
<%
@@ -23,13 +22,32 @@ local lat = uci:get_first("system", "system", "latitude")
%>
<h2><a id="content" name="content"><%:Contact%></a></h2>
-<table cellspacing="0" cellpadding="6">
- <tr><th><%:Nickname%>:</th><td><%=contact.nickname%></td></tr>
- <tr><th><%:Realname%>:</th><td><%=contact.name%></td></tr>
- <tr><th><%:E-Mail%>:</th><td><%=contact.mail%></td></tr>
- <tr><th><%:Phone%>:</th><td><%=contact.phone%></td></tr>
- <tr><th><%:Location%>:</th><td><%=location%></td></tr>
- <tr><th><%:Coordinates%>:</th><td><%=lat%> <%=lon%></td></tr>
- <tr><th><%:Notice%>:</th><td><%=contact.note%></td></tr>
-</table>
+
+<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>
+ </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%>
diff --git a/po/ca/freifunk.po b/po/ca/freifunk.po
index 9e80e5501..cba71e73f 100644
--- a/po/ca/freifunk.po
+++ b/po/ca/freifunk.po
@@ -197,6 +197,9 @@ msgstr "Avís"
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
@@ -358,16 +361,3 @@ msgstr ""
msgid "wireless settings"
msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/po/de/freifunk.po b/po/de/freifunk.po
index ae8012e28..e02940fdf 100644
--- a/po/de/freifunk.po
+++ b/po/de/freifunk.po
@@ -205,6 +205,9 @@ msgstr "Notiz"
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr "Betreiber"
+
msgid "Overview"
msgstr "Übersicht"
@@ -382,36 +385,3 @@ msgstr ""
msgid "wireless settings"
msgstr "Drahtloseinstellungen"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/po/el/freifunk.po b/po/el/freifunk.po
index 748539295..6da2a9c40 100644
--- a/po/el/freifunk.po
+++ b/po/el/freifunk.po
@@ -195,6 +195,9 @@ msgstr "Σημείωση"
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
diff --git a/po/en/freifunk.po b/po/en/freifunk.po
index 5e34ee423..d303c81cf 100644
--- a/po/en/freifunk.po
+++ b/po/en/freifunk.po
@@ -195,6 +195,9 @@ msgstr "Notice"
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
@@ -358,16 +361,3 @@ msgstr ""
msgid "wireless settings"
msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/po/es/freifunk.po b/po/es/freifunk.po
index 662d73c3d..8d8c4622c 100644
--- a/po/es/freifunk.po
+++ b/po/es/freifunk.po
@@ -197,6 +197,9 @@ msgstr "Aviso"
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
@@ -359,16 +362,3 @@ msgstr ""
msgid "wireless settings"
msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/po/fr/freifunk.po b/po/fr/freifunk.po
index 254e3c7ff..08f9dc7fd 100644
--- a/po/fr/freifunk.po
+++ b/po/fr/freifunk.po
@@ -193,6 +193,9 @@ msgstr ""
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
diff --git a/po/he/freifunk.po b/po/he/freifunk.po
index 9eca89526..3ec87bfe4 100644
--- a/po/he/freifunk.po
+++ b/po/he/freifunk.po
@@ -190,6 +190,9 @@ msgstr ""
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
diff --git a/po/it/freifunk.po b/po/it/freifunk.po
index a5eaeae7f..559e5848e 100644
--- a/po/it/freifunk.po
+++ b/po/it/freifunk.po
@@ -193,6 +193,9 @@ msgstr ""
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
diff --git a/po/ja/freifunk.po b/po/ja/freifunk.po
index 254e3c7ff..08f9dc7fd 100644
--- a/po/ja/freifunk.po
+++ b/po/ja/freifunk.po
@@ -193,6 +193,9 @@ msgstr ""
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
diff --git a/po/ms/freifunk.po b/po/ms/freifunk.po
index c3e18e9c6..136f186bc 100644
--- a/po/ms/freifunk.po
+++ b/po/ms/freifunk.po
@@ -189,6 +189,9 @@ msgstr ""
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
diff --git a/po/no/freifunk.po b/po/no/freifunk.po
index 844531ffc..f2974c727 100644
--- a/po/no/freifunk.po
+++ b/po/no/freifunk.po
@@ -191,6 +191,9 @@ msgstr "Merknad"
msgid "OLSR"
msgstr "OLSR"
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr "Oversikt"
@@ -369,23 +372,3 @@ msgstr "brukt"
msgid "wireless settings"
msgstr "trådløse innstillinger"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/po/pl/freifunk.po b/po/pl/freifunk.po
index f8705cdaf..cc532e5e7 100644
--- a/po/pl/freifunk.po
+++ b/po/pl/freifunk.po
@@ -191,6 +191,9 @@ msgstr ""
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
diff --git a/po/pt/freifunk.po b/po/pt/freifunk.po
index 009d4925a..49c787c2c 100644
--- a/po/pt/freifunk.po
+++ b/po/pt/freifunk.po
@@ -197,6 +197,9 @@ msgstr "Notas"
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
diff --git a/po/pt_BR/freifunk.po b/po/pt_BR/freifunk.po
index 5bb42ce1a..e6059aea4 100644
--- a/po/pt_BR/freifunk.po
+++ b/po/pt_BR/freifunk.po
@@ -202,6 +202,9 @@ msgstr "Aviso"
msgid "OLSR"
msgstr "OLSR"
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr "Visão Geral"
@@ -382,23 +385,3 @@ msgstr "não usado"
msgid "wireless settings"
msgstr "configurações da rede sem fio"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/po/ro/freifunk.po b/po/ro/freifunk.po
index 1ec3970ec..3b010c3aa 100644
--- a/po/ro/freifunk.po
+++ b/po/ro/freifunk.po
@@ -191,6 +191,9 @@ msgstr ""
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
diff --git a/po/ru/freifunk.po b/po/ru/freifunk.po
index 6182cc8a9..a29140c62 100644
--- a/po/ru/freifunk.po
+++ b/po/ru/freifunk.po
@@ -201,6 +201,9 @@ msgstr "Внимание"
msgid "OLSR"
msgstr "OLSR"
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr "Обзор"
@@ -380,23 +383,3 @@ msgstr "использовано"
msgid "wireless settings"
msgstr "настройки беспроводной сети"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/po/templates/freifunk.pot b/po/templates/freifunk.pot
index 3327a7199..8c5aa8006 100644
--- a/po/templates/freifunk.pot
+++ b/po/templates/freifunk.pot
@@ -182,6 +182,9 @@ msgstr ""
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
diff --git a/po/vi/freifunk.po b/po/vi/freifunk.po
index de354386b..04499d265 100644
--- a/po/vi/freifunk.po
+++ b/po/vi/freifunk.po
@@ -196,6 +196,9 @@ msgstr "Chú ý"
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
@@ -356,16 +359,3 @@ msgstr ""
msgid "wireless settings"
msgstr ""
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/po/zh_CN/freifunk.po b/po/zh_CN/freifunk.po
index 80eb2671c..4c3b282d8 100644
--- a/po/zh_CN/freifunk.po
+++ b/po/zh_CN/freifunk.po
@@ -193,6 +193,9 @@ msgstr ""
msgid "OLSR"
msgstr ""
+msgid "Operator"
+msgstr ""
+
msgid "Overview"
msgstr ""
@@ -353,7 +356,3 @@ msgstr ""
msgid "wireless settings"
msgstr ""
-
-
-
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 02:48:36 +0000