From: Jo-Philipp Wich Date: Sun, 8 Feb 2015 18:57:20 +0000 (+0100) Subject: Merge pull request #302 from chris5560/master X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=76dfdc1b1e7a62b363954f01f71f5a1e77d5249a;hp=6b1b7336f04dfe894476cd8918586cbdb318431b Merge pull request #302 from chris5560/master luci-themes: luci.main.mediaurlbase not set correctly --- 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 -