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 /applications/luci-app-freifunk-widgets | |
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 'applications/luci-app-freifunk-widgets')
16 files changed, 0 insertions, 528 deletions
diff --git a/applications/luci-app-freifunk-widgets/Makefile b/applications/luci-app-freifunk-widgets/Makefile deleted file mode 100644 index d748827ba3..0000000000 --- a/applications/luci-app-freifunk-widgets/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -# -# Copyright (C) 2008-2014 The LuCI Team <luci@lists.subsignal.org> -# -# This is free software, licensed under the Apache License, Version 2.0 . -# - -include $(TOPDIR)/rules.mk - -LUCI_TITLE:=Widgets for the Freifunk index page -LUCI_DEPENDS:=+luci-mod-freifunk - -include ../../luci.mk - -# call BuildPackage - OpenWrt buildroot signature diff --git a/applications/luci-app-freifunk-widgets/luasrc/controller/freifunk/widgets.lua b/applications/luci-app-freifunk-widgets/luasrc/controller/freifunk/widgets.lua deleted file mode 100644 index 37104fc215..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/controller/freifunk/widgets.lua +++ /dev/null @@ -1,35 +0,0 @@ --- Copyright 2012 Manuel Munz <freifunk at somakoma de> --- Licensed to the public under the Apache License 2.0. - -local require = require -module "luci.controller.freifunk.widgets" - - -function index() - - local page = node("admin", "freifunk", "widgets") - page.target = cbi("freifunk/widgets/widgets_overview") - page.title = _("Widgets") - page.i18n = "widgets" - page.order = 30 - - local page = node("admin", "freifunk", "widgets", "widget") - page.target = cbi("freifunk/widgets/widget") - page.leaf = true - - local page = node("freifunk", "search_redirect") - page.target = call("search_redirect") - page.leaf = true -end - -function search_redirect() - local dsp = require "luci.dispatcher" - local http = require "luci.http" - local engine = http.formvalue("engine") - local searchterms = http.formvalue("searchterms") or "" - if engine then - http.redirect(engine .. searchterms) - else - http.redirect(dsp.build_url()) - end -end diff --git a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/heightwidth.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/heightwidth.lua deleted file mode 100644 index fc23f4bdbc..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/heightwidth.lua +++ /dev/null @@ -1,16 +0,0 @@ --- Copyright 2012 Manuel Munz <freifunk at somakoma dot de> --- Licensed to the public under the Apache License 2.0. - -local map, section = ... - -local width = wdg:option(Value, "width", translate("Width")) -width.rmempty = true - ---[[ -local height = wdg:option(Value, "height", translate("Height")) -height.rmempty = true -height.optional = true -]]-- - -local pr = wdg:option(Value, "paddingright", translate("Padding right")) -pr.rmempty = true diff --git a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/html.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/html.lua deleted file mode 100644 index adeffa965d..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/html.lua +++ /dev/null @@ -1,31 +0,0 @@ --- Copyright 2012 Manuel Munz <freifunk at somakoma dot de> --- Licensed to the public under the Apache License 2.0. - -local map, section = ... -local utl = require "luci.util" -local fs = require "nixio.fs" -local file = "/usr/share/customtext/" .. arg[1] .. ".html" - -local form, ferr = loadfile(utl.libpath() .. "/model/cbi/freifunk/widgets/heightwidth.lua") -if form then - setfenv(form, getfenv(1))(m, wdg) -end - -t = wdg:option(TextValue, "_text") -t.rmempty = true -t.rows = 20 - - -function t.cfgvalue() - return fs.readfile(file) or "" -end - -function t.write(self, section, value) - return fs.writefile(file, value) -end - -function t.remove(self, section) - return fs.unlink(file) -end - - diff --git a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/iframe.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/iframe.lua deleted file mode 100644 index 68ab06d885..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/iframe.lua +++ /dev/null @@ -1,13 +0,0 @@ --- Copyright 2012 Manuel Munz <freifunk at somakoma dot de> --- Licensed to the public under the Apache License 2.0. - -local map, section = ... -local utl = require "luci.util" - -local form, ferr = loadfile(utl.libpath() .. "/model/cbi/freifunk/widgets/heightwidth.lua") -if form then - setfenv(form, getfenv(1))(m, wdg) -end - -local url = wdg:option(Value, "url", translate("URL")) -url.default = "http://www.freifunk.net" diff --git a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/rssfeed.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/rssfeed.lua deleted file mode 100644 index 68fa3be7b6..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/rssfeed.lua +++ /dev/null @@ -1,25 +0,0 @@ --- Copyright 2012 Manuel Munz <freifunk at somakoma dot de> --- Licensed to the public under the Apache License 2.0. - -local map, section = ... -local utl = require "luci.util" - -local form, ferr = loadfile(utl.libpath() .. "/model/cbi/freifunk/widgets/heightwidth.lua") -if form then - setfenv(form, getfenv(1))(m, wdg) -end - -local url = wdg:option(Value, "url", translate("URL")) -url.default = "http://global.freifunk.net/rss/all/rss.xml" - -local max = wdg:option(Value, "max", translate("Maximal entries to show")) -max.rmempty = true -max.default = "10" -max.datatype = "integer" - -local cache = wdg:option(Value, "cache", translate("Cache Time"), translate("Cache downloaded feed for that many seconds.")) -cache.rmempty = true -cache.default = "3600" -cache.datatype = "integer" - - diff --git a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/search.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/search.lua deleted file mode 100644 index a02748924b..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/search.lua +++ /dev/null @@ -1,15 +0,0 @@ --- Copyright 2012 Manuel Munz <freifunk at somakoma dot de> --- Licensed to the public under the Apache License 2.0. - -local map, section = ... -local utl = require "luci.util" - -local form, ferr = loadfile(utl.libpath() .. "/model/cbi/freifunk/widgets/heightwidth.lua") -if form then - setfenv(form, getfenv(1))(m, wdg) -end - -local engine = wdg:option(DynamicList, "engine", translate("Search Engine"), - translate("Use the form Name|URL, where URL must be a full URL to the search engine " .. - "including the query GET parameter, e.g. 'Google|http://www.google.de/search?q='") - ) diff --git a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widget.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widget.lua deleted file mode 100644 index 7b6cd89961..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widget.lua +++ /dev/null @@ -1,37 +0,0 @@ --- Copyright 2012 Manuel Munz <freifunk at somakoma dot de> --- Licensed to the public under the Apache License 2.0. - -local uci = require "luci.model.uci".cursor() -local dsp = require "luci.dispatcher" -local utl = require "luci.util" -local widget = uci:get("freifunk-widgets", arg[1], "template") -local title = uci:get("freifunk-widgets", arg[1], "title") or "" - -m = Map("freifunk-widgets", translate("Widget")) -m.redirect = luci.dispatcher.build_url("admin/freifunk/widgets") - -if not arg[1] or m.uci:get("freifunk-widgets", arg[1]) ~= "widget" then - luci.http.redirect(m.redirect) - return -end - -wdg = m:section(NamedSection, arg[1], "widget", translate("Widget") .. " " .. title) -wdg.anonymous = true -wdg.addremove = false - -local en = wdg:option(Flag, "enabled", translate("Enable")) -en.rmempty = false - -local title = wdg:option(Value, "title", translate("Title")) -title.rmempty = true - -local form = loadfile( - utl.libpath() .. "/model/cbi/freifunk/widgets/%s.lua" % widget -) - -if form then - setfenv(form, getfenv(1))(m, wdg) -end - -return m - diff --git a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua b/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua deleted file mode 100644 index 076d8e08cb..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/model/cbi/freifunk/widgets/widgets_overview.lua +++ /dev/null @@ -1,68 +0,0 @@ --- Copyright 2012 Manuel Munz <freifunk at somakoma dot de> --- Licensed to the public under the Apache License 2.0. - -local uci = require "luci.model.uci".cursor() -local fs = require "nixio.fs" -local utl = require "luci.util" -m = Map("freifunk-widgets", translate("Widgets"), - translate("Configure installed widgets.")) - -wdg = m:section(TypedSection, "widget", translate("Widgets")) -wdg.addremove = true -wdg.extedit = luci.dispatcher.build_url("admin/freifunk/widgets/widget/%s") -wdg.template = "cbi/tblsection" -wdg.sortable = true - ---[[ -function wdg.create(...) - local sid = TypedSection.create(...) - luci.http.redirect(wdg.extedit % sid) -end -]]-- - -local en = wdg:option(Flag, "enabled", translate("Enable")) -en.rmempty = false ---en.default = "0" -function en.cfgvalue(self, section) - return Flag.cfgvalue(self, section) or "0" -end - -local tmpl = wdg:option(ListValue, "template", translate("Template")) -local file -for file in fs.dir("/usr/lib/lua/luci/view/freifunk/widgets/") do - if file ~= "." and file ~= ".." then - tmpl:value(file) - end -end - -local title = wdg:option(Value, "title", translate("Title")) -title.rmempty = true - -local width = wdg:option(Value, "width", translate("Width")) -width.rmempty = true - -local height = wdg:option(Value, "height", translate("Height")) -height.rmempty = true - -local pr = wdg:option(Value, "paddingright", translate("Padding right")) -pr.rmempty = true - -function m.on_commit(self) - -- clean custom text files whose config has been deleted - local dir = "/usr/share/customtext/" - local active = {} - uci:foreach("freifunk-widgets", "widget", function(s) - if s["template"] == "html" then - table.insert(active, s[".name"]) - end - end ) - local file - for file in fs.dir(dir) do - local filename = string.gsub(file, ".html", "") - if not utl.contains(active, filename) then - fs.unlink(dir .. file) - end - end -end - -return m diff --git a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm deleted file mode 100644 index df01839f44..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm +++ /dev/null @@ -1,15 +0,0 @@ -<% ---[[ -LuCI - Lua Configuration Interface - -Copyright 2012 Manuel Munz <freifunk at somakoma dot de> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -]]-- -%> -<div style="clear:both"></div> diff --git a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm deleted file mode 100644 index 46e063b24f..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm +++ /dev/null @@ -1,42 +0,0 @@ -<% ---[[ -LuCI - Lua Configuration Interface - -Copyright 2012 Manuel Munz <freifunk at somakoma dot de> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -]]-- - ---local utl = require "luci.util" -local fs = require "nixio.fs" -local title = data.title -local name = data['.name'] -local file = "/usr/share/customtext/" .. name .. ".html" -local text = fs.readfile(file) -local width = data.width or "100%" -local pr = data.paddingright or "0" -if type(width) == "number" then - width = width .. "px" -end - -%> - -<div id="<%=name%>" style="width:<%=width%>;float:left"> - <div style="padding-right: <%=pr%>"> - <% if title then %> - <h2><%=title%></h2> - <% end %> - <% if text then %> - <%=text%> - <%else%> - <%:Could not load the custom text from%> "<%=file%>!" - <%end%> - - <%=data.text%> - </div> -</div> diff --git a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm deleted file mode 100644 index f0d89d7425..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm +++ /dev/null @@ -1,45 +0,0 @@ -<% ---[[ -LuCI - Lua Configuration Interface - -Copyright 2012 Manuel Munz <freifunk at somakoma dot de> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -]]-- - -local url = data['url'] -local name = data['.name'] -local title = data['title'] or "No title set" -local height = data['height'] or "400px" -if type(height) == "number" then - height = height .. "px" -end -local width = data['width'] or "100%" -if type(width) == "number" then - width = width .. "px" -end - -%> - -<div id="<%=name%>" style="width:<%=width%>;float:left;"> -<h2><%=title%></h2> - -<% if not url then %> - -<%:No url set.%> - -<% else %> -<div style="height:<%=height%>;min-height:<%=height%>"> -<object type="text/html" data="<%=url%>" width="100%" height="<%=height%>" name="widget_<%=name%>" id="widget_<%=name%>"> -<param name="src" value="<%=url%>" /> -<%:Sorry, your browser doesn't support the object tag and cannot display this page:%><br /> -<a href="<%=url%>"><%=url%></a> -</object> -</div> -</div> -<%end%> diff --git a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm deleted file mode 100644 index ff81ba8a67..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm +++ /dev/null @@ -1,84 +0,0 @@ -<% ---[[ -LuCI - Lua Configuration Interface - -Copyright 2012 Manuel Munz <freifunk at somakoma dot de> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -]]-- - -local sys = require "luci.sys" -local utl = require "luci.util" -local fs = require "nixio.fs" -local i18n = require "luci.i18n" -local url = data.url -local title = data.title or i18n.translate("RSS") -local max = tonumber(data.max) or 10 -local rss -local pr = data.paddingright or "0" -local output = {} -local width = data.width or "100%" -if type(width) == "number" then - width = width .. "px" -end -local name = data['.name'] -local cachetime = tonumber(data.cache) or 3600 -cachefile = "/tmp/" .. name .. ".cache" -%> -<div id="<%=name%>" style="width:<%=width%>;float:left"> - <div style="padding-right: <%=pr%>"> - <h2><%=title%></h2> - - <% if not url then %> - <%:No url found in config%> - <% else - local mtime = fs.stat(cachefile, "mtime") or 0 - local now = os.time() - expire = mtime + cachetime - - if not fs.access(cachefile) or expire < now then - rss = sys.httpget(url) - if #rss == 0 then - %> - <%:Could not get rss data from%> <a href="<%=url%>"><%=url%></a> - <% - else - local count = 0 - for item in string.gmatch(rss, "<item>(.-)</item>") do - if count < max then - local title = item:match("<title>(.-)</title>") - local link = item:match("<link>(.-)</link>") - local desc = item:match("<description>(.-)</description>") or "" - if title and link then - table.insert(output, { title = utl.pcdata(title), link = utl.pcdata(link) }) - end - count = count + 1 - end - end - if count > 0 then - local file = io.open(cachefile, "w") - file:write(utl.serialize_data(output)) - file:close() - end - end - else - local file = assert(io.open(cachefile)) - output = utl.restore_data(file:read'*a') - end - end - - if #output > 0 then - %> - <ul> - <% for k, v in ipairs(output) do %> - <li><a href="<%=v.link%>"><%=v.title%></a></li> - <% end %> - </ul> - <%end%> - </div> -</div> diff --git a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm b/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm deleted file mode 100644 index f2e2fb9069..0000000000 --- a/applications/luci-app-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm +++ /dev/null @@ -1,54 +0,0 @@ -<% ---[[ -LuCI - Lua Configuration Interface - -Copyright 2012 Manuel Munz <freifunk at somakoma dot de> - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -]]-- -local utl = require "luci.util" -local title = luci.i18n.translate(data.title or "Search") -local name = data['.name'] -local width = data.width or "100%" - -if type(width) == "number" then - width = width .. "px" -end - -local engines = {} -if type(data.engine) == "table" then - engines = data.engine -else - for k, v in ipairs(string.split(data.engine, " ")) do - table.insert(engines, v) - end -end -%> - -<div id="<%=name%>" style="width:<%=width%>;float:left"> - <h2><%=title%></h2> - <div id="form_<%=name%>"> - <form name="searchform" id="search_<%=name%>" action="<%=url('freifunk/search_redirect')%>"> - <input type="text" name="searchterms" style="margin-bottom:15px; width: 90%"><br /> - <% - local checked = " checked" - for k, v in ipairs(engines) do - local e = utl.split(v, "|") - local name = e[1] - local url = e[2] - if name and url then - %> - <input name="engine" type="radio" value="<%=url%>"<%=checked%>> <%=name%><br /> - <% end - checked = "" - end -%> - <input type="submit" name="SearchSubmit" value="Search" style="margin-top: 15px"> - </form> - </div> -</div> diff --git a/applications/luci-app-freifunk-widgets/root/etc/config/freifunk-widgets b/applications/luci-app-freifunk-widgets/root/etc/config/freifunk-widgets deleted file mode 100644 index 5a9f3254fa..0000000000 --- a/applications/luci-app-freifunk-widgets/root/etc/config/freifunk-widgets +++ /dev/null @@ -1,33 +0,0 @@ -config widget 'example_iframe' - option template 'iframe' - option url 'http://www.freifunk.net' - option title 'Freifunk Homepage' - option height '500px' - option width '100%' - option enabled '0' - -config widget 'example_rss' - option template 'rssfeed' - option url 'http://global.freifunk.net/rss/all/rss.xml' - option max '10' - option cache '3600' - option enabled '0' - option title 'Globaler Freifunk RSS Feed' - -config widget 'example_search' - option template 'search' - option enabled '0' - option title 'Search' - list engine 'Google|http://www.google.de/search?q=' - list engine 'Freifunk Wiki|http://wiki.freifunk.net/index.php?search=' - option width '50%' - option paddingright '8%' - -config widget 'example_customtext' - option template 'html' - option width '50%' - option enabled '0' - -config widget 'example_clear' - option enabled '0' - option template 'clear' diff --git a/applications/luci-app-freifunk-widgets/root/lib/upgrade/keep.d/freifunk-widgets b/applications/luci-app-freifunk-widgets/root/lib/upgrade/keep.d/freifunk-widgets deleted file mode 100644 index ce5537ac20..0000000000 --- a/applications/luci-app-freifunk-widgets/root/lib/upgrade/keep.d/freifunk-widgets +++ /dev/null @@ -1 +0,0 @@ -/usr/share/customtext |