diff options
Diffstat (limited to 'themes')
7 files changed, 43 insertions, 22 deletions
diff --git a/themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap b/themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap index 09299e0922..b5161843fe 100755 --- a/themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap +++ b/themes/luci-theme-bootstrap/root/etc/uci-defaults/30_luci-theme-bootstrap @@ -1,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF - set luci.themes.Bootstrap=/luci-static/bootstrap - set luci.main.mediaurlbase=/luci-static/bootstrap - commit luci -EOF + +if [ "$PKG_UPGRADE" != 1 ]; then + uci batch <<-EOF + set luci.themes.Bootstrap=/luci-static/bootstrap + set luci.main.mediaurlbase=/luci-static/bootstrap + commit luci + EOF +fi + exit 0 diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css index 2a88ef3750..8a41e8c0cf 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -2089,6 +2089,10 @@ label > input[type="radio"] { vertical-align: bottom; } +label[data-index][data-depends] { + padding-right: 2em; +} + .showSide { display: none; } diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm index f463ef5cb2..9521314e1f 100644 --- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm +++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm @@ -219,7 +219,7 @@ </div> </header> <div class="main"> - <div style="" class="loading"><span><div class="loading-img"></div>Loading...</span></div> + <div style="" class="loading"><span><div class="loading-img"></div><%:Collecting data...%></span></div> <div class="main-left"> <% render_topmenu() %> </div> diff --git a/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material b/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material index b01337821c..96ab461859 100755 --- a/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material +++ b/themes/luci-theme-material/root/etc/uci-defaults/30_luci-theme-material @@ -1,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF - set luci.themes.Material=/luci-static/material - set luci.main.mediaurlbase=/luci-static/material - commit luci -EOF + +if [ "$PKG_UPGRADE" != 1 ]; then + uci batch <<-EOF + set luci.themes.Material=/luci-static/material + set luci.main.mediaurlbase=/luci-static/material + commit luci + EOF +fi + exit 0 diff --git a/themes/luci-theme-openwrt/root/etc/uci-defaults/30_luci-theme-openwrt b/themes/luci-theme-openwrt/root/etc/uci-defaults/30_luci-theme-openwrt index aa0ba0c231..77e2f6064b 100755 --- a/themes/luci-theme-openwrt/root/etc/uci-defaults/30_luci-theme-openwrt +++ b/themes/luci-theme-openwrt/root/etc/uci-defaults/30_luci-theme-openwrt @@ -1,6 +1,11 @@ #!/bin/sh -uci batch <<-EOF - set luci.themes.OpenWrt=/luci-static/openwrt.org - set luci.main.mediaurlbase=/luci-static/openwrt.org - commit luci -EOF + +if [ "$PKG_UPGRADE" != 1 ]; then + uci batch <<-EOF + set luci.themes.OpenWrt=/luci-static/openwrt.org + set luci.main.mediaurlbase=/luci-static/openwrt.org + commit luci + EOF +fi + +exit 0 diff --git a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js index 886e175cc4..bef272760a 100755 --- a/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js +++ b/themes/luci-theme-rosy/htdocs/luci-static/rosy/js/script.js @@ -276,6 +276,6 @@ }); - $('#cbi-network-switch_vlan .table').wrap('#vlan_table'); + $('#cbi-network-switch_vlan .table').wrap('<div id="vlan_table"></div>'); })(window, jQuery); diff --git a/themes/luci-theme-rosy/root/etc/uci-defaults/30_luci-theme-rosy b/themes/luci-theme-rosy/root/etc/uci-defaults/30_luci-theme-rosy index 2657a29779..ab0299a9c3 100755 --- a/themes/luci-theme-rosy/root/etc/uci-defaults/30_luci-theme-rosy +++ b/themes/luci-theme-rosy/root/etc/uci-defaults/30_luci-theme-rosy @@ -1,7 +1,11 @@ #!/bin/sh -uci batch <<-EOF - set luci.themes.Rosy=/luci-static/rosy - set luci.main.mediaurlbase=/luci-static/rosy - commit luci -EOF + +if [ "$PKG_UPGRADE" != 1 ]; then + uci batch <<-EOF + set luci.themes.Rosy=/luci-static/rosy + set luci.main.mediaurlbase=/luci-static/rosy + commit luci + EOF +fi + exit 0 |