luci-0.11: merge r9571 - r9622

[project/luci.git] / modules / freifunk / luasrc / view / freifunk / contact.htm

diff --git a/modules/freifunk/luasrc/view/freifunk/contact.htm b/modules/freifunk/luasrc/view/freifunk/contact.htm
index 59d508c6f389b9f02f03ffecd5445680b4bcbd60..2d79ccd40616788dc099e5cc8c5071ba92ee6e0b 100644 (file)
--- a/modules/freifunk/luasrc/view/freifunk/contact.htm
+++ b/modules/freifunk/luasrc/view/freifunk/contact.htm
@@ -2,26 +2,69 @@
 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%>
-<% local contact = luci.model.uci.cursor():get_all("freifunk", "contact") %>
-<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><%=contact.location%></td></tr>
-       <tr><th><%:Coordinates%>:</th><td><%=contact.geo%></td></tr>
-       <tr><th><%:Notice%>:</th><td><%=contact.note%></td></tr>
-</table>
+
+<% 
+local uci = require "luci.model.uci".cursor()
+local contact = uci:get_all("freifunk", "contact")
+local nickname, name, mail, phone, location, note
+local lon = uci:get_first("system", "system", "longitude")
+local lat = uci:get_first("system", "system", "latitude")
+
+if not contact then
+       nickname, name, homepage, mail, phone, location, note = ""
+else
+       nickname = contact.nickname or ""
+       name = contact.name or ""
+       homepage = contact.homepage or {}
+       mail = contact.mail or ""
+       phone = contact.phone or ""
+       location = uci:get_first("system", "system", "location") or contact.location
+       note = contact.note or ""
+end
+%>
+
+<h2><a id="content" name="content"><%:Contact%></a></h2>
+
+<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><%=nickname%></td></tr>
+               <tr><th width="33%"><%:Realname%>:</th><td><%=name%></td></tr>
+               <tr><th width="33%"><%:Homepage%>:</th><td>
+                       <% for k, v in ipairs(homepage) do %>
+                       <a href="<%=v%>"><%=v%></a><br />
+                       <% end %>
+               </td></tr>
+               <tr><th width="33%"><%:E-Mail%>:</th><td><a href="mailto:<%=mail%>"><%=mail%></a></td></tr>
+               <tr><th width="33%"><%:Phone%>:</th><td><%=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 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><%=note%></td></tr>
+       </table>
+</fieldset>
+<%end%>
+
 <%+footer%>