X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=modules%2Ffreifunk%2Fluasrc%2Fview%2Ffreifunk%2Fcontact.htm;h=0d917ad5b674cf2a5548cadaab702c0242cc8679;hb=5a1e9354b41155b9604362c9a1ef8d7a899ba2b2;hp=3596827cfd97f7835f54fcd365ea96f69f97a8f7;hpb=922f92cd7df28d8ccc396cd13392b8469c34c88a;p=project%2Fluci.git

diff --git a/modules/freifunk/luasrc/view/freifunk/contact.htm b/modules/freifunk/luasrc/view/freifunk/contact.htm
index 3596827cf..0d917ad5b 100644
--- 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") %>
-<h1><%:contact%></h1>
+
+<% 
+local uci = require "luci.model.uci".cursor()
+local contact = uci:get_all("freifunk", "contact")
+local location = uci:get_first("system", "system", "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><%:ff_nickname%>:</th><td><%=contact.nickname%></td></tr>
-	<tr><th><%:ff_name%>:</th><td><%=contact.name%></td></tr>
-	<tr><th><%:ff_mail%>:</th><td><%=contact.mail%></td></tr>
-	<tr><th><%:ff_phone%>:</th><td><%=contact.phone%></td></tr>
-	<tr><th><%:ff_location%>:</th><td><%=contact.location%></td></tr>
-	<tr><th><%:ff_geocoord%>:</th><td><%=contact.geo%></td></tr>
-	<tr><th><%:ff_note%>:</th><td><%=contact.note%></td></tr>
+	<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>
 <%+footer%>