From 4654ba92c3999d84b08211f05d2ccb5ea9da731b Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sun, 3 Feb 2019 14:13:35 +0100 Subject: treewide: move freifunk-related packages to separate repo Even Freifunk was one of the major factory to create the LuCI-system, it's now only a very small part of LuCI. LuCI has become a much bigger thing and it seems that it's time to move the packages only relating to Freifunk into it's own feed. On the mailinglist it was discussed [1] and a repo below the general Freifunk team on github was created. This commit removes all packages that will be hosted in the new repo [2] 1 - http://lists.freifunk.net/pipermail/wlannews-freifunk.net/2019-February/004818.html 2 - https://github.com/freifunk/openwrt-packages Signed-off-by: Sven Roederer --- .../htdocs/luci-static/flashing.html | 84 ------------- .../htdocs/luci-static/resources/OSMLatLon.htm | 19 --- .../htdocs/luci-static/resources/flashing.gif | Bin 4261 -> 0 bytes .../luci-static/resources/freifunk-map/hna.gif | Bin 209 -> 0 bytes .../luci-static/resources/freifunk-map/node.gif | Bin 209 -> 0 bytes .../htdocs/luci-static/resources/osm.js | 130 --------------------- 6 files changed, 233 deletions(-) delete mode 100644 modules/luci-mod-freifunk/htdocs/luci-static/flashing.html delete mode 100644 modules/luci-mod-freifunk/htdocs/luci-static/resources/OSMLatLon.htm delete mode 100644 modules/luci-mod-freifunk/htdocs/luci-static/resources/flashing.gif delete mode 100644 modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/hna.gif delete mode 100644 modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/node.gif delete mode 100644 modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js (limited to 'modules/luci-mod-freifunk/htdocs/luci-static') diff --git a/modules/luci-mod-freifunk/htdocs/luci-static/flashing.html b/modules/luci-mod-freifunk/htdocs/luci-static/flashing.html deleted file mode 100644 index f9e882ff30..0000000000 --- a/modules/luci-mod-freifunk/htdocs/luci-static/flashing.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - LuCI - System Upgrade - - - - - - - -
-

Performing Upgrade

- -

- The System is flashing now. The procedure can take up to 25 minutes, - please be patient and wait until this page reloads itself. - -
- - Remaining time (estimated): unknown -

-
- - - diff --git a/modules/luci-mod-freifunk/htdocs/luci-static/resources/OSMLatLon.htm b/modules/luci-mod-freifunk/htdocs/luci-static/resources/OSMLatLon.htm deleted file mode 100644 index 9f017c9e72..0000000000 --- a/modules/luci-mod-freifunk/htdocs/luci-static/resources/OSMLatLon.htm +++ /dev/null @@ -1,19 +0,0 @@ - - - - OpenStreetMap - - - - - -
-
- Map by openstreetmap.org, License CC-BY-SA -      - - Latitude: - Longitude: - -
- diff --git a/modules/luci-mod-freifunk/htdocs/luci-static/resources/flashing.gif b/modules/luci-mod-freifunk/htdocs/luci-static/resources/flashing.gif deleted file mode 100644 index e207fc56a1..0000000000 Binary files a/modules/luci-mod-freifunk/htdocs/luci-static/resources/flashing.gif and /dev/null differ diff --git a/modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/hna.gif b/modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/hna.gif deleted file mode 100644 index 818780d153..0000000000 Binary files a/modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/hna.gif and /dev/null differ diff --git a/modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/node.gif b/modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/node.gif deleted file mode 100644 index f64ab162a4..0000000000 Binary files a/modules/luci-mod-freifunk/htdocs/luci-static/resources/freifunk-map/node.gif and /dev/null differ diff --git a/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js b/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js deleted file mode 100644 index 48ae91cd81..0000000000 --- a/modules/luci-mod-freifunk/htdocs/luci-static/resources/osm.js +++ /dev/null @@ -1,130 +0,0 @@ -var map; -var layer_mapnik; -var layer_tah; -var layer_markers; -var PI = Math.PI; -var latfield = ''; -var lonfield = ''; -var latfield_id=''; -var lonfield_id=''; -var centerlon = 10; -var centerlat = 52; -var zoom = 6; - -function lon2merc(lon) { - return 20037508.34 * lon / 180; -} - -function lat2merc(lat) { - lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / PI; - return 20037508.34 * lat; -} - -function merc2lon(lon) { - return lon*180/20037508.34; -}; - -function merc2lat(lat) { - return Math.atan(Math.exp(lat*PI/20037508.34))*360/PI-90; -}; - -OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { - defaultHandlerOptions: { - 'single': true, - 'double': false, - 'pixelTolerance': 0, - 'stopSingle': false, - 'stopDouble': false - }, - - initialize: function(options) { - this.handlerOptions = OpenLayers.Util.extend( - {}, this.defaultHandlerOptions - ); - OpenLayers.Control.prototype.initialize.apply( - this, arguments - ); - this.handler = new OpenLayers.Handler.Click( - this, { - 'click': this.trigger - }, this.handlerOptions - ); - }, - - trigger: function(e) { - var lonlat = map.getLonLatFromViewPortPx(e.xy); - var lat=merc2lat(lonlat.lat); - var lon=merc2lon(lonlat.lon); - if(parent.document.getElementById(latfield_id)==null){ - latfield=document.getElementById('osmlat'); - }else{ - latfield=parent.document.getElementById(latfield_id); - } - if(parent.document.getElementById(lonfield_id)==null){ - lonfield=document.getElementById('osmlon'); - }else{ - lonfield=parent.document.getElementById(lonfield_id); - } - latfield.value = lat; - lonfield.value = lon; - } -}); - -function init(){ - var field = window.name.substring(0, window.name.lastIndexOf(".")); - if(parent.document.getElementById(field+".latfield")!=null){ - latfield_id = parent.document.getElementById(field+".latfield").value; - document.getElementById('osm').style.display="none"; - } - if(parent.document.getElementById(field+".lonfield")!=null){ - lonfield_id = parent.document.getElementById(field+".lonfield").value; - } - if(parent.document.getElementById(field+".centerlat")!=null){ - centerlat =parseFloat(parent.document.getElementById(field+".centerlat").value); - } - if(parent.document.getElementById(field+".centerlon")!=null){ - centerlon = parseFloat(parent.document.getElementById(field+".centerlon").value); - } - if(parent.document.getElementById(field+".zoom")!=null){ - zoom = parseFloat(parent.document.getElementById(field+".zoom").value); - } -} - -function drawmap() { - OpenLayers.Lang.setCode('de'); - var mapdiv=document.getElementById('map'); - mapdiv.style.height=window.innerHeight+"px"; - mapdiv.style.width=window.innerWidth+"px"; - map = new OpenLayers.Map('map', { - projection: new OpenLayers.Projection("EPSG:900913"), - displayProjection: new OpenLayers.Projection("EPSG:4326"), - controls: [ - new OpenLayers.Control.Navigation(), - new OpenLayers.Control.PanZoomBar()], - maxExtent: - new OpenLayers.Bounds(-20037508.34,-20037508.34, 20037508.34, 20037508.34), - numZoomLevels: 18, - maxResolution: 156543, - units: 'meters' - }); - - layer_mapnik = new OpenLayers.Layer.OSM.Mapnik("Mapnik"); - - map.addLayers([layer_mapnik]); - var y =lat2merc(centerlat); - var x =lon2merc(centerlon); - map.setCenter(new OpenLayers.LonLat(x, y), zoom); - - // Check for geolocation support - if(navigator.geolocation){ - navigator.geolocation.getCurrentPosition(function(position){ - var y =lat2merc(position.coords.latitude); - var x =lon2merc(position.coords.longitude); - map.setCenter(new OpenLayers.LonLat(x, y), '17'); - }); - } - - var click = new OpenLayers.Control.Click(); - map.addControl(click); - click.activate(); -} -- cgit v1.2.3