diff options
6 files changed, 13 insertions, 4 deletions
diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm index e88ca7f58a..c211a39514 100644 --- a/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm +++ b/applications/luci-statistics/luasrc/view/admin_statistics/networkplugins.htm @@ -9,7 +9,7 @@ about open tcp connections, interface traffic, iptables rules etc.%></p> <ul> <% for plugin, desc in pairs(plugins) do %> <% if luci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %> - <li><a href="/cgi-bin/luci/admin/statistics/network/<%=plugin%>"><%=desc%></a></li> + <li><a href="<%=controller%>/admin/statistics/collectd/network/<%=plugin%>"><%=desc%></a></li> <% end %> <% end %> </ul> diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm index c7945f16e4..c2f36f2b86 100644 --- a/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm +++ b/applications/luci-statistics/luasrc/view/admin_statistics/outputplugins.htm @@ -10,7 +10,7 @@ and to transmit the data over the network to other collectd instances.%></p> <ul> <% for plugin, desc in pairs(plugins) do %> <% if luci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %> - <li><a href="/cgi-bin/luci/admin/statistics/output/<%=plugin%>"><%=desc%></a></li> + <li><a href="<%=controller%>/admin/statistics/collectd/output/<%=plugin%>"><%=desc%></a></li> <% end %> <% end %> </ul> diff --git a/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm b/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm index 8c1f714e68..dcedea6b89 100644 --- a/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm +++ b/applications/luci-statistics/luasrc/view/admin_statistics/systemplugins.htm @@ -6,7 +6,7 @@ <ul> <% for plugin, desc in pairs(plugins) do %> <% if luci.fs.isfile("/usr/lib/collectd/" .. plugin .. ".so") then %> - <li><a href="/cgi-bin/luci/admin/statistics/system/<%=plugin%>"><%=desc%></a></li> + <li><a href="<%=controller%>/admin/statistics/collectd/system/<%=plugin%>"><%=desc%></a></li> <% end %> <% end %> </ul> diff --git a/libs/web/root/etc/config/luci b/libs/web/root/etc/config/luci index 0b05d8439b..3e1e7db4f0 100644 --- a/libs/web/root/etc/config/luci +++ b/libs/web/root/etc/config/luci @@ -41,4 +41,3 @@ config internal template config internal themes option OpenWRT "/luci-static/openwrt.org" - option Fledermaus "/luci-static/fledermaus" diff --git a/themes/fledermaus/ipkg/postinst b/themes/fledermaus/ipkg/postinst new file mode 100755 index 0000000000..1951df5765 --- /dev/null +++ b/themes/fledermaus/ipkg/postinst @@ -0,0 +1,4 @@ +#!/bin/sh +[ -n "${IPKG_INSTROOT}" ] || { + ( . /etc/uci-defaults/luci-theme-fledermaus ) && rm -f /etc/uci-defaults/luci-theme-fledermaus +} diff --git a/themes/fledermaus/root/etc/uci-defaults/luci-theme-fledermaus b/themes/fledermaus/root/etc/uci-defaults/luci-theme-fledermaus new file mode 100755 index 0000000000..83e472b633 --- /dev/null +++ b/themes/fledermaus/root/etc/uci-defaults/luci-theme-fledermaus @@ -0,0 +1,6 @@ +#!/bin/sh +uci batch <<-EOF + set luci.themes.Fledermaus=/luci-static/fledermaus + commit luci +EOF + |