modules/freifunk: OSM in basics fixed thanks to Andreas Pittrich

This commit is contained in:
Manuel Munz 2011-03-12 17:13:36 +00:00
parent 3b4450a58b
commit 945076c895
19 changed files with 365 additions and 103 deletions

View file

@ -2,6 +2,7 @@
LuCI - Lua Configuration Interface
Copyright 2008 Steven Barth <steven@midlink.org>
Copyright 2011 Manuel Munz <freifunk at somakoma de>
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -15,6 +16,7 @@ local util = require "luci.util"
local uci = require "luci.model.uci".cursor()
local profiles = "/etc/config/profile_"
m = Map("freifunk", translate ("Community"))
c = m:section(NamedSection, "community", "public", nil, translate("These are the basic settings for your local wireless community. These settings define the default values for the wizard and DO NOT affect the actual configuration of the router."))
@ -30,7 +32,12 @@ for k,v in ipairs(list) do
community:value(n, name)
end
n = Map("system", translate("Basic system settings"))
function n.on_after_commit(self)
luci.http.redirect(luci.dispatcher.build_url("admin", "freifunk", "basics"))
end
b = n:section(TypedSection, "system")
b.anonymous = true
@ -42,25 +49,31 @@ loc = b:option(Value, "location", translate("Location"))
loc.rmempty = false
lat = b:option(Value, "latitude", translate("Latitude"), translate("e.g.") .. " 48.12345")
lat.datatype = "float"
lat.rmempty = false
lon = b:option(Value, "longitude", translate("Longitude"), translate("e.g.") .. " 10.12345")
lon.datatype = "float"
lon.rmempty = false
--[[
Opens an OpenStreetMap iframe or popup
Makes use of resources/OSMLatLon.htm and htdocs/resources/osm.js
(is that the right place for files like these?)
]]--
--[[ this needs to be fixed
local class = util.class
local co = "profile_augsburg"
local syslat = uci:get_first(co, "community", "latitude")
local syslon = uci:get_first(co, "community", "longitude")
local ff = uci:get("freifunk", "community", "name") or ""
local co = "profile_" .. ff
OpenStreetMapLonLat = class(AbstractValue)
local deflat = uci:get_first("system", "system", "latitude") or uci:get_first(co, "community", "latitude") or 52
local deflon = uci:get_first("system", "system", "longitude") or uci:get_first(co, "community", "longitude") or 10
local zoom = 12
if ( deflat == 52 and deflon == 10 ) then
zoom = 4
end
OpenStreetMapLonLat = luci.util.class(AbstractValue)
function OpenStreetMapLonLat.__init__(self, ...)
AbstractValue.__init__(self, ...)
self.template = "cbi/osmll_value"
@ -76,29 +89,16 @@ function OpenStreetMapLonLat.__init__(self, ...)
self.hidetext="X" -- text on button, that hides OSMap
end
f = SimpleForm("ffwizward", "OpenStreetMap", "Hier kann man die Geokoordinaten des Knotens herausfinden.")
osm = f:field(OpenStreetMapLonLat, "latlon", "Geokoordinaten mit OpenStreetMap ermitteln:", "Klicken Sie auf Ihren Standort in der Karte. Diese Karte funktioniert nur, wenn das Gerät bereits eine Verbindung zum Internet hat.")
osm.latfield = "lat"
osm.lonfield = "lon"
osm.centerlat = syslat
osm.centerlon = syslon
osm.width = "100%"
osm.height = "600"
osm.popup = false
syslatlengh = string.len(syslat)
if syslatlengh > 7 then
osm.zoom = "15"
elseif syslatlengh > 5 then
osm.zoom = "12"
else
osm.zoom = "6"
end
osm.displaytext="OpenStreetMap anzeigen"
osm.hidetext="OpenStreetMap verbergen"
]]
osm = b:option(OpenStreetMapLonLat, "latlon", translate("Find your coordinates with OpenStreetMap"), translate("Select your location with a mouse click on the map. The map will only show up if you are connected to the Internet."))
osm.latfield = "latitude"
osm.lonfield = "longitude"
osm.centerlat = uci:get_first("system", "system", "latitude") or deflat
osm.centerlon = uci:get_first("system", "system", "longitude") or deflon
osm.zoom = zoom
osm.width = "100%"
osm.height = "600"
osm.popup = false
osm.displaytext=translate("Show OpenStreetMap")
osm.hidetext=translate("Hide OpenStreetMap")
return m, n

View file

@ -7,66 +7,6 @@ $Id$
-%>
<%+cbi/valueheader%>
<script type="text/javascript">
function set_lat_lon() {
var net
var entry
var lon
var lat
var zoom
net = document.getElementById('cbid.ffwizward.1.net').value;
if (!net){
return
}
lon = document.getElementById('cbid.ffwizward.1.latlon.centerlon');
lat = document.getElementById('cbid.ffwizward.1.latlon.centerlat');
zoom = document.getElementById('cbid.ffwizward.1.latlon.zoom');
if ( !lon.value || lon.value == '' || lon.value == 0 || lon.value == 10 ) {
for ( var i = 0 ; true ; i++ ) {
if (i == cbi_d.length) {
break;
}
if (cbi_d[i].id == 'cbi-ffwizward-1-net_lon') {
entry = cbi_d[i];
for (var j=0; true; j++) {
if ( entry.node.children[0].children[j] ){
if ( entry.node.children[0].children[j].value == net ) {
lon.value = entry.node.children[0].children[j].text;
zoom.value = '14';
break;
}
} else {
break;
}
}
break;
}
}
}
if ( !lat.value || lat.value == '' || lat.value == 0 || lat.value == 52 ) {
for (var i=0; true; i++) {
if (i == cbi_d.length) {
break;
}
if (cbi_d[i].id == 'cbi-ffwizward-1-net_lat') {
entry = cbi_d[i];
for (var j=0; true; j++) {
if ( entry.node.children[0].children[j] ){
if ( entry.node.children[0].children[j].value == net ) {
lat.value = entry.node.children[0].children[j].text;
break;
}
} else {
break;
}
}
break;
}
}
}
}
</script>
<% if self:cfgvalue(section) ~= false then %>
<% if self.latfield and self.lonfield then %>
@ -90,7 +30,6 @@ function set_lat_lon() {
<% else %>
<input class="cbi-input-button" type="button"<%= attr("name", cbid..".displayosm")..attr("id", cbid..".displayosm")..attr("value", self.displaytext)%>
onclick="
set_lat_lon();
document.getElementById('<%=cbid..".hideosm"%>').style.display='inline';
document.getElementById('<%=cbid..".displayosm"%>').style.display='none';
for(var i = 0; Math.min(i, window.frames.length)!=window.frames.lengths; i++){

View file

@ -98,6 +98,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -116,6 +122,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr "Hola i benvingut a la xarxa de"
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -253,9 +262,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -361,6 +378,11 @@ msgstr "Pots trobar més informació sobre la iniciativa global Freifunk a"
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2011-02-11 21:42+0100\n"
"PO-Revision-Date: 2011-03-12 15:13+0100\n"
"Last-Translator: Manuel Munz <freifunk@somakoma.de>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
@ -99,6 +99,12 @@ msgstr "Splash-Text bearbeiten"
msgid "Edit index page"
msgstr "Indexseite bearbeiten"
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr "Geokoordinaten mit OpenStreetMap ermitteln"
msgid "Freifunk"
msgstr ""
@ -117,6 +123,9 @@ msgstr "Gehe zu"
msgid "Hello and welcome in the network of"
msgstr "Hallo und willkommen im Netz von"
msgid "Hide OpenStreetMap"
msgstr "OpenStreetMap ausblenden"
msgid "Homepage"
msgstr ""
@ -259,9 +268,19 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
"Wähle hier deinen Standort durch einen Mausklick aus. Die Karte funktioniert "
"nur, wenn bereits eine Verbindung zum Internet besteht."
msgid "Services"
msgstr "Dienste"
msgid "Show OpenStreetMap"
msgstr "OpenStreetMap anzeigen"
msgid "Signal"
msgstr ""
@ -384,6 +403,13 @@ msgstr "Weitere Informationen zur globalen Freifunkinitiative findest du unter"
msgid "You can manually edit the selected community profile here."
msgstr "Hier kann das ausgewählte Community-Profil bearbeitet werden."
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
"Es muss ein Profil ausgewählt werden, bevor es editiert werden kann. Gehe "
"dazu zur Seite"
msgid "and fill out all required fields."
msgstr "und fülle alle benötigten Felder aus."

View file

@ -96,6 +96,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -114,6 +120,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr "Γεια σας και καλώς ήλθατε στο δίκτυο"
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -249,9 +258,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -360,6 +377,11 @@ msgstr ""
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -96,6 +96,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -114,6 +120,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr "Hello and welcome in the network of"
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -249,9 +258,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -359,6 +376,11 @@ msgstr ""
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -96,6 +96,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -114,6 +120,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr "Hola y bienvenido a la red de"
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -251,9 +260,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -360,6 +377,11 @@ msgstr "Puede obtener información acrca de la iniciativaglobal Freifunk en"
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -97,6 +97,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -115,6 +121,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr ""
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -248,9 +257,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -355,6 +372,11 @@ msgstr ""
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -97,6 +97,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -115,6 +121,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr ""
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -248,9 +257,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -355,6 +372,11 @@ msgstr ""
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -97,6 +97,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -115,6 +121,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr ""
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -248,9 +257,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -355,6 +372,11 @@ msgstr ""
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -96,6 +96,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -114,6 +120,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr "Hei og velkommen i nettverket av"
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -251,9 +260,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -360,6 +377,11 @@ msgstr "Du finner mer informasjon om den globale Freifunk initiativ på"
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -96,6 +96,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -114,6 +120,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr "Olá e benvindo à rede "
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -251,9 +260,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -360,6 +377,11 @@ msgstr "Pode encontrar mais informações sobre a iniciativa global Freifunk em
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -96,6 +96,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -114,6 +120,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr "Olá e benvindo à rede "
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -251,9 +260,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -360,6 +377,11 @@ msgstr "Pode encontrar mais informações sobre a iniciativa global Freifunk em
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -97,6 +97,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -115,6 +121,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr ""
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -248,9 +257,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -355,6 +372,11 @@ msgstr ""
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -85,6 +85,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -103,6 +109,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr ""
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -236,9 +245,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -343,6 +360,11 @@ msgstr ""
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""

View file

@ -98,6 +98,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -116,6 +122,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr "Xin chào và chào mừng gia nhập mạng lưới của"
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -252,9 +261,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -359,6 +376,11 @@ msgstr "Bạn có thể tìm thấy thông tin về Freifunk toàn cầu tại "
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""
@ -400,12 +422,3 @@ msgstr "danh sách trắng"
msgid "wireless settings"
msgstr ""

View file

@ -96,6 +96,12 @@ msgstr ""
msgid "Edit index page"
msgstr ""
msgid "Error"
msgstr ""
msgid "Find your coordinates with OpenStreetMap"
msgstr ""
msgid "Freifunk"
msgstr ""
@ -114,6 +120,9 @@ msgstr ""
msgid "Hello and welcome in the network of"
msgstr ""
msgid "Hide OpenStreetMap"
msgstr ""
msgid "Homepage"
msgstr ""
@ -247,9 +256,17 @@ msgstr ""
msgid "Save"
msgstr ""
msgid ""
"Select your location with a mouse click on the map. The map will only show "
"up if you are connected to the Internet."
msgstr ""
msgid "Services"
msgstr ""
msgid "Show OpenStreetMap"
msgstr ""
msgid "Signal"
msgstr ""
@ -354,6 +371,11 @@ msgstr ""
msgid "You can manually edit the selected community profile here."
msgstr ""
msgid ""
"You need to select a profile before you can edit it. To select a profile go "
"to"
msgstr ""
msgid "and fill out all required fields."
msgstr ""
@ -395,5 +417,3 @@ msgstr ""
msgid "wireless settings"
msgstr ""