Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: move templates and libraries not used by the core to luci-compat

Browse source 
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2019-11-03 17:49:58 +01:00
parent 7a2fefc671
commit 284918bfaf
39 changed files with 36 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-adblock/Makefile
View file

@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for Adblock LUCI_TITLE:=LuCI support for Adblock
LUCI_DEPENDS:=+adblock +luci-lib-jsonc LUCI_DEPENDS:=+luci-compat +adblock +luci-lib-jsonc
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-ahcp/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI Support for AHCPd LUCI_TITLE:=LuCI Support for AHCPd
LUCI_DEPENDS:=+ahcpd LUCI_DEPENDS:=+luci-compat +ahcpd
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-banip/Makefile
View file

@ -4,7 +4,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for banIP LUCI_TITLE:=LuCI support for banIP
LUCI_DEPENDS:=+banip +luci-lib-jsonc LUCI_DEPENDS:=+luci-compat +banip +luci-lib-jsonc
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-bcp38/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=BCP38 LuCI interface LUCI_TITLE:=BCP38 LuCI interface
LUCI_DEPENDS:=+luci-mod-admin-full +bcp38 LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +bcp38
PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk> PKG_MAINTAINER:=Toke Høiland-Jørgensen <toke@toke.dk>
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0

2
applications/luci-app-dcwapd/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=Dual Channel Wi-Fi AP Daemon configuration module LUCI_TITLE:=Dual Channel Wi-Fi AP Daemon configuration module
LUCI_DEPENDS:=+dcwapd LUCI_DEPENDS:=+luci-compat +dcwapd
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-minidlna/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI Support for miniDLNA LUCI_TITLE:=LuCI Support for miniDLNA
LUCI_DEPENDS:=+minidlna LUCI_DEPENDS:=+luci-compat +minidlna
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-mwan3/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for the MWAN3 multiwan hotplug script LUCI_TITLE:=LuCI support for the MWAN3 multiwan hotplug script
LUCI_DEPENDS:=+mwan3 +libuci-lua +luci-mod-admin-full +luci-app-firewall +luci-lib-nixio LUCI_DEPENDS:=+luci-compat +mwan3 +libuci-lua +luci-mod-admin-full +luci-app-firewall +luci-lib-nixio
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_LICENSE:=GPLv2 PKG_LICENSE:=GPLv2

2
applications/luci-app-nlbwmon/Makefile
View file

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=Netlink based bandwidth accounting LUCI_TITLE:=Netlink based bandwidth accounting
LUCI_DEPENDS:=+nlbwmon LUCI_DEPENDS:=+luci-compat +nlbwmon
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-ocserv/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI Support for OpenConnect VPN LUCI_TITLE:=LuCI Support for OpenConnect VPN
LUCI_DEPENDS:=+ocserv +certtool LUCI_DEPENDS:=+luci-compat +ocserv +certtool
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-olsr/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=OLSR configuration and status module LUCI_TITLE:=OLSR configuration and status module
LUCI_DEPENDS:=+olsrd +olsrd-mod-jsoninfo +luci-lib-json LUCI_DEPENDS:=+luci-compat +olsrd +olsrd-mod-jsoninfo +luci-lib-json
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-p910nd/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=p910nd - Printer server module LUCI_TITLE:=p910nd - Printer server module
LUCI_DEPENDS:=+p910nd LUCI_DEPENDS:=+luci-compat +p910nd
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-rp-pppoe-server/Makefile
View file

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=Roaring Penguin PPPoE Server LUCI_TITLE:=Roaring Penguin PPPoE Server
LUCI_DEPENDS:=+rp-pppoe-server LUCI_DEPENDS:=+luci-compat +rp-pppoe-server
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-shadowsocks-libev/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI Support for shadowsocks-libev LUCI_TITLE:=LuCI Support for shadowsocks-libev
LUCI_DEPENDS:= LUCI_DEPENDS:=+luci-compat
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0

2
applications/luci-app-statistics/Makefile
View file

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI Statistics Application LUCI_TITLE:=LuCI Statistics Application
LUCI_DEPENDS:= \ LUCI_DEPENDS:= \
+luci-lib-iptparser \ +luci-compat +luci-lib-iptparser \
+collectd +rrdtool1 +collectd-mod-rrdtool +collectd-mod-iwinfo \ +collectd +rrdtool1 +collectd-mod-rrdtool +collectd-mod-iwinfo \
+collectd-mod-cpu +collectd-mod-memory \ +collectd-mod-cpu +collectd-mod-memory \
+collectd-mod-interface +collectd-mod-load +collectd-mod-network +collectd-mod-interface +collectd-mod-load +collectd-mod-network

2
applications/luci-app-travelmate/Makefile
View file

@ -5,7 +5,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI support for Travelmate LUCI_TITLE:=LuCI support for Travelmate
LUCI_DEPENDS:=+travelmate +luci-lib-jsonc LUCI_DEPENDS:=+luci-compat +travelmate +luci-lib-jsonc
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-unbound/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=Unbound Recursive DNS Resolver Configuration LUCI_TITLE:=Unbound Recursive DNS Resolver Configuration
LUCI_DEPENDS:=+unbound-daemon LUCI_DEPENDS:=+luci-compat +unbound-daemon
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-vnstat/Makefile
View file

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI Support for VnStat LUCI_TITLE:=LuCI Support for VnStat
LUCI_DEPENDS:=+vnstat +vnstati LUCI_DEPENDS:=+luci-compat +vnstat +vnstati
include ../../luci.mk include ../../luci.mk

73
modules/luci-base/luasrc/view/cbi/firewall_zoneforwards.htm
View file

@ -1,73 +0,0 @@
<%+cbi/valueheader%>
<%-
local utl = require "luci.util"
local fwm = require "luci.model.firewall".init()
local nwm = require "luci.model.network".init()
local zone, fwd, fz
local value = self:formvalue(section)
if not value or value == "-" then
value = self:cfgvalue(section) or self.default
end
local def = fwm:get_defaults()
local zone = fwm:get_zone(value)
local empty = true
local function render_zone(zone)
-%>
<label class="zonebadge" style="background-color:<%=zone:get_color()%>">
<strong><%=zone:name()%></strong>
<div class="cbi-tooltip">
<%-
local zempty = true
for _, net in ipairs(zone:get_networks()) do
net = nwm:get_network(net)
if net then
zempty = false
-%>
<span class="ifacebadge<% if net:name() == self.network then %> ifacebadge-active<% end %>"><%=net:name()%>:&#160;
<%
local nempty = true
for _, iface in ipairs(net:is_bridge() and net:get_interfaces() or { net:get_interface() }) do
nempty = false
%>
<img<%=attr("title", iface:get_i18n())%> src="<%=resource%>/icons/<%=iface:type()%><%=iface:is_up() and "" or "_disabled"%>.png" />
<% end %>
<% if nempty then %><em><%:(empty)%></em><% end %>
</span>
<%- end end -%>
<% if zempty then %><span class="ifacebadge"><em><%:(empty)%></em></span><% end %>
</div>
</label>
<%-
end
-%>
<% if zone then %>
<div class="zone-forwards">
<div class="zone-src">
<%=render_zone(zone)%>
</div>
<span>&#8658;</span>
<div class="zone-dest">
<%
for _, fwd in ipairs(zone:get_forwardings_by("src")) do
fz = fwd:dest_zone()
if fz then
empty = false
render_zone(fz)
end
end
if empty then
%>
<label class="zonebadge zonebadge-empty">
<strong><%=def:forward():upper()%></strong>
</label>
<% end %>
</div>
</div>
<% end %>
<%+cbi/valuefooter%>

19
modules/luci-compat/Makefile Normal file
View file

@ -0,0 +1,19 @@
#
# Copyright (C) 2019 Jo-Philipp Wich <jo@mein.io>
#
# This is free software, licensed under the Apache License, Version 2.0 .
#
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-compat
LUCI_TYPE:=mod
LUCI_BASENAME:=compat
LUCI_TITLE:=LuCI compatibility libraries
LUCI_DEPENDS:=+luci-base
include ../../luci.mk
# call BuildPackage - OpenWrt buildroot signature

0
modules/luci-base/luasrc/model/network.lua → modules/luci-compat/luasrc/model/network.lua
View file

0
protocols/luci-proto-3g/luasrc/model/network/proto_3g.lua → modules/luci-compat/luasrc/model/network/proto_3g.lua
View file

0
protocols/luci-proto-ipv6/luasrc/model/network/proto_4x6.lua → modules/luci-compat/luasrc/model/network/proto_4x6.lua
View file

0
protocols/luci-proto-ipv6/luasrc/model/network/proto_6x4.lua → modules/luci-compat/luasrc/model/network/proto_6x4.lua
View file

0
protocols/luci-proto-ipv6/luasrc/model/network/proto_dhcpv6.lua → modules/luci-compat/luasrc/model/network/proto_dhcpv6.lua
View file

0
protocols/luci-proto-hnet/luasrc/model/network/proto_hnet.lua → modules/luci-compat/luasrc/model/network/proto_hnet.lua
View file

0
protocols/luci-proto-ipip/luasrc/model/network/proto_ipip.lua → modules/luci-compat/luasrc/model/network/proto_ipip.lua
View file

0
protocols/luci-proto-modemmanager/luasrc/model/network/proto_modemmanager.lua → modules/luci-compat/luasrc/model/network/proto_modemmanager.lua
View file

0
protocols/luci-proto-ncm/luasrc/model/network/proto_ncm.lua → modules/luci-compat/luasrc/model/network/proto_ncm.lua
View file

0
protocols/luci-proto-openconnect/luasrc/model/network/proto_openconnect.lua → modules/luci-compat/luasrc/model/network/proto_openconnect.lua
View file

0
protocols/luci-proto-ppp/luasrc/model/network/proto_ppp.lua → modules/luci-compat/luasrc/model/network/proto_ppp.lua
View file

0
protocols/luci-proto-pppossh/luasrc/model/network/proto_pppossh.lua → modules/luci-compat/luasrc/model/network/proto_pppossh.lua
View file

0
protocols/luci-proto-qmi/luasrc/model/network/proto_qmi.lua → modules/luci-compat/luasrc/model/network/proto_qmi.lua
View file

0
protocols/luci-proto-relay/luasrc/model/network/proto_relay.lua → modules/luci-compat/luasrc/model/network/proto_relay.lua
View file

0
protocols/luci-proto-vpnc/luasrc/model/network/proto_vpnc.lua → modules/luci-compat/luasrc/model/network/proto_vpnc.lua
View file

0
protocols/luci-proto-wireguard/luasrc/model/network/proto_wireguard.lua → modules/luci-compat/luasrc/model/network/proto_wireguard.lua
View file

0
modules/luci-base/luasrc/view/cbi/firewall_zonelist.htm → modules/luci-compat/luasrc/view/cbi/firewall_zonelist.htm
View file

0
modules/luci-base/luasrc/view/cbi/network_ifacelist.htm → modules/luci-compat/luasrc/view/cbi/network_ifacelist.htm
View file

0
modules/luci-base/luasrc/view/cbi/network_netinfo.htm → modules/luci-compat/luasrc/view/cbi/network_netinfo.htm
View file

0
modules/luci-base/luasrc/view/cbi/network_netlist.htm → modules/luci-compat/luasrc/view/cbi/network_netlist.htm
View file