modules/freifunk: Try to get the location from /etc/config/freifunk if it isn't found...

[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 0b4a068108d98a0dd1eeb265f4516bf82e34f0ca..1ebbf69f71054fc13f7681ac38df6ecdbc41fb5f 100644 (file)
--- a/modules/freifunk/luasrc/view/freifunk/contact.htm
+++ b/modules/freifunk/luasrc/view/freifunk/contact.htm
@@ -13,15 +13,23 @@ $Id$
 
 -%>
 <%+header%>
-<% local contact = luci.model.uci.cursor():get_all("freifunk", "contact") %>
+
+<% 
+local uci = require "luci.model.uci".cursor()
+local contact = uci:get_all("freifunk", "contact")
+local location = uci:get_first("system", "system", "location") or contact.location
+local lon = uci:get_first("system", "system", "longitude")
+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><%=contact.location%></td></tr>
-       <tr><th><%:Coordinates%>:</th><td><%=contact.geo%></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>
 <%+footer%>