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 <christian.schoenebeck@gmail.com>

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 ddefd3b04fd42c80dac2e7831a20c65d041b54b0..09299e09221c8d9cdd753f08c435afdbe341718a 100755 (executable)
--- 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 e5fb8a12dcc5ffa5bc1e3a9bd0d6c8d198bc2aa1..a19f2bb412ec52e3fbac83333822490803bbd446 100755 (executable)
--- 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 131f54e216f42038613bb3cec536aa8297f209b8..017e7f7bad87543a374b336d50ee388e8a548416 100644 (file)
--- 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 d8dea0467e4866856127f8866e58ef5de6f7c0b8..aa0ba0c231d884f4e1a65c0ad4ffc938b6777ac2 100755 (executable)
--- 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
-