diff options
author | Jo-Philipp Wich <jow@openwrt.org> | 2014-12-03 15:17:05 +0100 |
---|---|---|
committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-01-08 16:26:20 +0100 |
commit | 1bb4822dca6113f73e3bc89e2acf15935e6f8e92 (patch) | |
tree | 35e16f100466e4e00657199b38bb3d87d52bf73f /applications/luci-freifunk-widgets/luasrc/view/freifunk | |
parent | 9edd0e46c3f880727738ce8ca6ff1c8b85f99ef4 (diff) |
Rework LuCI build system
* Rename subdirectories to their repective OpenWrt package names
* Make each LuCI module its own standalone package
* Deploy a shared luci.mk which is used by each module Makefile
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
Diffstat (limited to 'applications/luci-freifunk-widgets/luasrc/view/freifunk')
5 files changed, 0 insertions, 240 deletions
diff --git a/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm b/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/clear/main.htm deleted file mode 100644 index df01839f44..0000000000 --- a/applications/luci-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-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm b/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/html/main.htm deleted file mode 100644 index 87ad5b6292..0000000000 --- a/applications/luci-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 "luci.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-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm b/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/iframe/main.htm deleted file mode 100644 index f0d89d7425..0000000000 --- a/applications/luci-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-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm b/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/rssfeed/main.htm deleted file mode 100644 index 08fc550ecd..0000000000 --- a/applications/luci-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 "luci.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 = luci.fs.mtime(cachefile) 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-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm b/applications/luci-freifunk-widgets/luasrc/view/freifunk/widgets/search/main.htm deleted file mode 100644 index e319f15fbc..0000000000 --- a/applications/luci-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="<%=luci.dispatcher.build_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> |