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

2 files changed, 35 insertions, 25 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%>