From c0ce5f96f28b6db62470ad24799ee09af5a3f9d4 Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Fri, 21 Oct 2011 13:27:55 +0000 Subject: [PATCH] modules/freifunk: Nicer layout of the contact page; make note a TextValue field in the admin interface --- .../luasrc/model/cbi/freifunk/contact.lua | 18 +++----- .../freifunk/luasrc/view/freifunk/contact.htm | 42 +++++++++++++------ po/ca/freifunk.po | 16 ++----- po/de/freifunk.po | 36 ++-------------- po/el/freifunk.po | 3 ++ po/en/freifunk.po | 16 ++----- po/es/freifunk.po | 16 ++----- po/fr/freifunk.po | 3 ++ po/he/freifunk.po | 3 ++ po/it/freifunk.po | 3 ++ po/ja/freifunk.po | 3 ++ po/ms/freifunk.po | 3 ++ po/no/freifunk.po | 23 ++-------- po/pl/freifunk.po | 3 ++ po/pt/freifunk.po | 3 ++ po/pt_BR/freifunk.po | 23 ++-------- po/ro/freifunk.po | 3 ++ po/ru/freifunk.po | 23 ++-------- po/templates/freifunk.pot | 3 ++ po/vi/freifunk.po | 16 ++----- po/zh_CN/freifunk.po | 7 ++-- 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 178df28b85..6f998819a3 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 +Copyright 2011 Manuel Munz 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 1ebbf69f71..72d868b66f 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 Copyright 2008 Jo-Philipp Wich +Copyright 2011 Manuel Munz 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") %>

<%:Contact%>

- - - - - - - - -
<%:Nickname%>:<%=contact.nickname%>
<%:Realname%>:<%=contact.name%>
<%:E-Mail%>:<%=contact.mail%>
<%:Phone%>:<%=contact.phone%>
<%:Location%>:<%=location%>
<%:Coordinates%>:<%=lat%> <%=lon%>
<%:Notice%>:<%=contact.note%>
+ +
+<%:Operator%> + + + + + +
<%:Nickname%>:<%=contact.nickname%>
<%:Realname%>:<%=contact.name%>
<%:E-Mail%>:<%=contact.mail%>
<%:Phone%>:<%=contact.phone%>
+
+ +
+<%:Location%> + + + +
<%:Location%>:<%=location%>
<%:Coordinates%>:<%=lat%> <%=lon%> ("><%:Show on map%>)
+
+ +<% if contact.note then %> +
+<%:Notice%> + + +
<%=contact.note%>
+
+<%end%> + <%+footer%> diff --git a/po/ca/freifunk.po b/po/ca/freifunk.po index 9e80e5501b..cba71e73f6 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 ae8012e289..e02940fdfd 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 748539295b..6da2a9c407 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 5e34ee4239..d303c81cf3 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 662d73c3dc..8d8c4622c6 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 254e3c7ffa..08f9dc7fd5 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 9eca89526f..3ec87bfe4f 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 a5eaeae7ff..559e5848ea 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 254e3c7ffa..08f9dc7fd5 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 c3e18e9c6c..136f186bcb 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 844531ffc6..f2974c7271 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 f8705cdaf2..cc532e5e74 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 009d4925ac..49c787c2cd 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 5bb42ce1ae..e6059aea44 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 1ec3970ec7..3b010c3aa2 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 6182cc8a91..a29140c628 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 3327a71991..8c5aa80069 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 de354386b4..04499d265a 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 80eb2671ce..4c3b282d8e 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 "" - - - - -- 2.30.2