From 55ab4e4ce221091480f8c693ceefb1d0ac32c18f Mon Sep 17 00:00:00 2001 From: Christian Schoenebeck Date: Mon, 19 Jan 2015 21:08:03 +0100 Subject: [PATCH] luci-themes: luci.main.mediaurlbase not set correctly Currently by default theme Bootstrap is installed but luci.main.mediaurlbase (it holds the current active theme) still has openwrt.org set. I did not find the mechanism how LuCI starts Bootstrap theme but the installation should set luci.main.mediaurlbase correctly. Signed-off-by: Christian Schoenebeck --- themes/luci-theme-bootstrap/root/etc/uci-defaults/luci-theme-bootstrap | 1 + .../root/etc/uci-defaults/luci-theme-freifunk-bno | 2 +- .../root/etc/uci-defaults/luci-theme-freifunk-generic | 3 ++- themes/luci-theme-openwrt/root/etc/uci-defaults/luci-theme-openwrt | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/themes/luci-theme-bootstrap/root/etc/uci-defaults/luci-theme-bootstrap b/themes/luci-theme-bootstrap/root/etc/uci-defaults/luci-theme-bootstrap index ddefd3b04..09299e092 100755 --- a/themes/luci-theme-bootstrap/root/etc/uci-defaults/luci-theme-bootstrap +++ b/themes/luci-theme-bootstrap/root/etc/uci-defaults/luci-theme-bootstrap @@ -1,6 +1,7 @@ #!/bin/sh uci batch <<-EOF set luci.themes.Bootstrap=/luci-static/bootstrap + set luci.main.mediaurlbase=/luci-static/bootstrap commit luci EOF exit 0 diff --git a/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno b/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno index e5fb8a12d..a19f2bb41 100755 --- a/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno +++ b/themes/luci-theme-freifunk-bno/root/etc/uci-defaults/luci-theme-freifunk-bno @@ -1,6 +1,6 @@ #!/bin/sh uci batch <<-EOF set luci.themes.Freifunk_BNO=/luci-static/freifunk-bno + set luci.main.mediaurlbase=/luci-static/freifunk-bno commit luci EOF - diff --git a/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic b/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic index 131f54e21..017e7f7ba 100644 --- a/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic +++ b/themes/luci-theme-freifunk-generic/root/etc/uci-defaults/luci-theme-freifunk-generic @@ -1,4 +1,5 @@ uci batch <<-EOF - set luci.themes.Freifunk_Generic=/luci-static/freifunk-generic + set luci.themes.Freifunk_Generic=/luci-static/freifunk-generic + set luci.main.mediaurlbase=/luci-static/freifunk-generic commit luci EOF diff --git a/themes/luci-theme-openwrt/root/etc/uci-defaults/luci-theme-openwrt b/themes/luci-theme-openwrt/root/etc/uci-defaults/luci-theme-openwrt index d8dea0467..aa0ba0c23 100755 --- a/themes/luci-theme-openwrt/root/etc/uci-defaults/luci-theme-openwrt +++ b/themes/luci-theme-openwrt/root/etc/uci-defaults/luci-theme-openwrt @@ -1,6 +1,6 @@ #!/bin/sh uci batch <<-EOF set luci.themes.OpenWrt=/luci-static/openwrt.org + set luci.main.mediaurlbase=/luci-static/openwrt.org commit luci EOF - -- 2.11.0