treewide: move templates and libraries not used by the core to luci-compat
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich
parent
7a2fefc671
commit
284918bfaf
39 changed files with 36 additions and 90 deletions
|
|
@ -4,7 +4,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=LuCI support for Adblock
|
||||
LUCI_DEPENDS:=+adblock +luci-lib-jsonc
|
||||
LUCI_DEPENDS:=+luci-compat +adblock +luci-lib-jsonc
|
||||
LUCI_PKGARCH:=all
|
||||
|
||||
include ../../luci.mk
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=LuCI Support for AHCPd
|
||||
LUCI_DEPENDS:=+ahcpd
|
||||
LUCI_DEPENDS:=+luci-compat +ahcpd
|
||||
|
||||
include ../../luci.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=LuCI support for banIP
|
||||
LUCI_DEPENDS:=+banip +luci-lib-jsonc
|
||||
LUCI_DEPENDS:=+luci-compat +banip +luci-lib-jsonc
|
||||
LUCI_PKGARCH:=all
|
||||
|
||||
include ../../luci.mk
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
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_LICENSE:=Apache-2.0
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=Dual Channel Wi-Fi AP Daemon configuration module
|
||||
LUCI_DEPENDS:=+dcwapd
|
||||
LUCI_DEPENDS:=+luci-compat +dcwapd
|
||||
|
||||
include ../../luci.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=LuCI Support for miniDLNA
|
||||
LUCI_DEPENDS:=+minidlna
|
||||
LUCI_DEPENDS:=+luci-compat +minidlna
|
||||
|
||||
include ../../luci.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
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
|
||||
PKG_LICENSE:=GPLv2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=Netlink based bandwidth accounting
|
||||
LUCI_DEPENDS:=+nlbwmon
|
||||
LUCI_DEPENDS:=+luci-compat +nlbwmon
|
||||
|
||||
include ../../luci.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=LuCI Support for OpenConnect VPN
|
||||
LUCI_DEPENDS:=+ocserv +certtool
|
||||
LUCI_DEPENDS:=+luci-compat +ocserv +certtool
|
||||
|
||||
include ../../luci.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
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
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=p910nd - Printer server module
|
||||
LUCI_DEPENDS:=+p910nd
|
||||
LUCI_DEPENDS:=+luci-compat +p910nd
|
||||
|
||||
include ../../luci.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=Roaring Penguin PPPoE Server
|
||||
LUCI_DEPENDS:=+rp-pppoe-server
|
||||
LUCI_DEPENDS:=+luci-compat +rp-pppoe-server
|
||||
|
||||
include ../../luci.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=LuCI Support for shadowsocks-libev
|
||||
LUCI_DEPENDS:=
|
||||
LUCI_DEPENDS:=+luci-compat
|
||||
|
||||
PKG_LICENSE:=Apache-2.0
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
LUCI_TITLE:=LuCI Statistics Application
|
||||
LUCI_DEPENDS:= \
|
||||
+luci-lib-iptparser \
|
||||
+luci-compat +luci-lib-iptparser \
|
||||
+collectd +rrdtool1 +collectd-mod-rrdtool +collectd-mod-iwinfo \
|
||||
+collectd-mod-cpu +collectd-mod-memory \
|
||||
+collectd-mod-interface +collectd-mod-load +collectd-mod-network
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=LuCI support for Travelmate
|
||||
LUCI_DEPENDS:=+travelmate +luci-lib-jsonc
|
||||
LUCI_DEPENDS:=+luci-compat +travelmate +luci-lib-jsonc
|
||||
LUCI_PKGARCH:=all
|
||||
|
||||
include ../../luci.mk
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=Unbound Recursive DNS Resolver Configuration
|
||||
LUCI_DEPENDS:=+unbound-daemon
|
||||
LUCI_DEPENDS:=+luci-compat +unbound-daemon
|
||||
|
||||
include ../../luci.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
LUCI_TITLE:=LuCI Support for VnStat
|
||||
LUCI_DEPENDS:=+vnstat +vnstati
|
||||
LUCI_DEPENDS:=+luci-compat +vnstat +vnstati
|
||||
|
||||
include ../../luci.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -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()%>: 
|
||||
<%
|
||||
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>⇒</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
19
modules/luci-compat/Makefile
Normal 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
|
||||
Loading…
Reference in a new issue