diff options
| author | Sven Roederer <freifunk@it-solutions.geroedel.de> | 2019-02-03 14:13:35 +0100 |
|---|---|---|
| committer | Sven Roederer <freifunk@it-solutions.geroedel.de> | 2019-02-13 21:23:34 +0100 |
| commit | 4654ba92c3999d84b08211f05d2ccb5ea9da731b (patch) | |
| tree | 06cedf8e8badc0ce584d8bd5e97fab7476c81549 /modules/luci-mod-freifunk/luasrc/view/freifunk-map | |
| parent | eda8f02dac3caa4d0f52cd1e860d7a392c295df3 (diff) | |
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 <freifunk@it-solutions.geroedel.de>
Diffstat (limited to 'modules/luci-mod-freifunk/luasrc/view/freifunk-map')
| -rw-r--r-- | modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm | 29 | ||||
| -rw-r--r-- | modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm | 118 |
2 files changed, 0 insertions, 147 deletions
diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm deleted file mode 100644 index bd936ac705..0000000000 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/frame.htm +++ /dev/null @@ -1,29 +0,0 @@ -<%+header%> - -<% - local has_latlon = false - local uci = require "luci.model.uci".cursor() - uci:foreach("olsrd", "LoadPlugin", function(s) - if s.library == "olsrd_nameservice" and s.latlon_file then - has_latlon = true - end - end) -%> - -<% if has_latlon then %> - <iframe style="width:100%; height:640px; border:none" src="<%=url("freifunk/map/content")%>"></iframe> - <h3><%:Legend%>:</h3> - <ul> - <li><strong><span style="color:#00cc00"><%:Green%></span></strong>:<%:Very good (ETX < 2)%></li> - <li><strong><span style="color:#ffcb05"><%:Yellow%></span></strong>:<%:Good (2 < ETX < 4)%></li> - <li><strong><span style="color:#ff6600"><%:Orange%></span></strong>:<%:Still usable (4 < ETX < 10)%></li> - <li><strong><span style="color:#bb3333"><%:Red%></span></strong>:<%:Bad (ETX > 10)%></li> - </ul> - -<% else %> - <h2><%:Map Error%></h2> - <p><%_The OLSRd service is not configured to capture position data from the network.<br /> - Please make sure that the nameservice plugin is properly configured and that the <em>latlon_file</em> option is enabled.%></p> -<% end %> -<%+footer%> - diff --git a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm b/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm deleted file mode 100644 index f69401d6e3..0000000000 --- a/modules/luci-mod-freifunk/luasrc/view/freifunk-map/map.htm +++ /dev/null @@ -1,118 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> -<html> - <head> - <title>Map</title> - </head> - - <body style="margin:0"> - <script src="//dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=6.1&s=1" type="text/javascript"></script> - <script type="text/javascript"> - var alias = new Array; - var points = new Array; - var unkpos = new Array; - var lineid = 0; - onload=new Function("if(null!=window.ffmapinit)ffmapinit();"); - - function Mid(mainip,aliasip) - { - alias[aliasip]=mainip; - } - - function Node(mainip,lat,lon,ishna,hnaip,name) - { - points[mainip] = new VELatLong(lat, lon); - map.AddPushpin(new VEPushpin(mainip, points[mainip], - '<%=luci.config.main.resourcebase%>/freifunk-map/'+(ishna?'hna':'node')+'.gif', 'Node:'+name, - '<br><img src="<%=luci.config.main.resourcebase%>/freifunk-map/'+(ishna?'hna':'node')+'.gif">'+ - '<br>IP:'+mainip+'<br>DefGW:'+hnaip)); - } - - function Self(mainip,lat,lon,ishna,hnaip,name) - { - //map.SetDashboardSize(VEDashboardSize.Small); - map.LoadMap(new VELatLong(lat, lon), 15, VEMapStyle.Hybrid); - map.SetScaleBarDistanceUnit(VEDistanceUnit.Kilometers); - map.ShowMiniMap(14, 474); - Node(mainip,lat,lon,ishna,hnaip,name); - } - - function Link(fromip,toip,lq,nlq,etx) - { - if (0==lineid && null!=window.ffmapstatic) ffmapstatic(); - if (null != alias[toip]) toip = alias[toip]; - if (null != alias[fromip]) fromip = alias[fromip]; - if (null != points[fromip] && null != points[toip]) - { - var color; - var red = 240; - var green = 0; - var blue = 0; - var w = 1 - - if (etx < 100) {red=252;green=102;blue=0;w=2}; - if (etx < 10) {red=255;green=203;blue=5;w=3}; - if (etx < 4) {red=240;green=255;blue=0;w=4}; - if (etx < 2) {red=0;green=204;blue=0;w=5}; - if (etx < 1) {red=80;green=0;blue=0;w=1}; - - map.AddPolyline(new VEPolyline('id'+lineid, [points[fromip], points[toip]], - new VEColor(red, green, blue, 0.5), w)); - - - } - else - { - if (null == points[toip]) unkpos[toip] = ''; - if (null == points[fromip]) unkpos[fromip] = ''; - } - lineid++; - } - - function PLink(fromip,toip,lq,nlq,etx,lata,lona,ishnaa,latb,lonb,ishnab) - { - Link(fromip,toip,lq,nlq,etx); - } - - function ffmapinit() - { - if(null!=window.map)map.Dispose(); - - var INFINITE = 99.99; - - map = new VEMap('ffmap'); - <% - local fd - local uci = require "luci.model.uci".cursor() - - uci:foreach("olsrd", "LoadPlugin", function(s) - if s.library == "olsrd_nameservice" and s.latlon_file then - fd = io.open(s.latlon_file) - end - end) - - if fd then - local data = fd:read("*a") - fd:close() - - if data then - local line - for line in data:gmatch("[^\n]+") do - if line:match(";$") then - write(line .. "\n") - else - break - end - end - end - end - %> - } - - function ffgoto(ip) - { - map.SetCenter(points[ip]); - } - </script> - <div id="ffmap" style="position:relative; width:100%; height:640px;"></div> - </body> -</html> |