modules/freifunk: Nicer layout of the contact page; make note a TextValue...

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

modules/freifunk: Nicer layout of the contact page; make note a TextValue...
modules/freifunk: Nicer layout of the contact page; make note a TextValue field in the admin interface
c0ce5f96 · Manuel Munz · cd1fa7c0 · c0ce5f96 · c0ce5f96 · c0ce5f96
21 changed file
--- 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
--- 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%>
--- 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 ""
-
-
-
-
-
-
-
-
-
-
-
-
-
--- 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"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/po/el/freifunk.po
+++ b/po/el/freifunk.po
@@ -195,6 +195,9 @@ msgstr "Σημείωση"
 msgid "OLSR"
 msgstr ""

+msgid "Operator"
+msgstr ""
+
 msgid "Overview"
 msgstr ""


--- 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 ""
-
-
-
-
-
-
-
-
-
-
-
-
-
--- 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 ""
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/po/fr/freifunk.po
+++ b/po/fr/freifunk.po
@@ -193,6 +193,9 @@ msgstr ""
 msgid "OLSR"
 msgstr ""

+msgid "Operator"
+msgstr ""
+
 msgid "Overview"
 msgstr ""


--- a/po/he/freifunk.po
+++ b/po/he/freifunk.po
@@ -190,6 +190,9 @@ msgstr ""
 msgid "OLSR"
 msgstr ""

+msgid "Operator"
+msgstr ""
+
 msgid "Overview"
 msgstr ""


--- a/po/it/freifunk.po
+++ b/po/it/freifunk.po
@@ -193,6 +193,9 @@ msgstr ""
 msgid "OLSR"
 msgstr ""

+msgid "Operator"
+msgstr ""
+
 msgid "Overview"
 msgstr ""


--- a/po/ja/freifunk.po
+++ b/po/ja/freifunk.po
@@ -193,6 +193,9 @@ msgstr ""
 msgid "OLSR"
 msgstr ""

+msgid "Operator"
+msgstr ""
+
 msgid "Overview"
 msgstr ""


--- a/po/ms/freifunk.po
+++ b/po/ms/freifunk.po
@@ -189,6 +189,9 @@ msgstr ""
 msgid "OLSR"
 msgstr ""

+msgid "Operator"
+msgstr ""
+
 msgid "Overview"
 msgstr ""


--- 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"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/po/pl/freifunk.po
+++ b/po/pl/freifunk.po
@@ -191,6 +191,9 @@ msgstr ""
 msgid "OLSR"
 msgstr ""

+msgid "Operator"
+msgstr ""
+
 msgid "Overview"
 msgstr ""


--- 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 ""


--- 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"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/po/ro/freifunk.po
+++ b/po/ro/freifunk.po
@@ -191,6 +191,9 @@ msgstr ""
 msgid "OLSR"
 msgstr ""

+msgid "Operator"
+msgstr ""
+
 msgid "Overview"
 msgstr ""


--- 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 "настройки беспроводной сети"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- a/po/templates/freifunk.pot
+++ b/po/templates/freifunk.pot
@@ -182,6 +182,9 @@ msgstr ""
 msgid "OLSR"
 msgstr ""

+msgid "Operator"
+msgstr ""
+
 msgid "Overview"
 msgstr ""


--- 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 ""
-
-
-
-
-
-
-
-
-
-
-
-
-
--- 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 ""
-
-
-
-