Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes

7 files changed, 32 insertions, 7 deletions

diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
index 9b5ee3a804..b19a6a07a6 100644
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/cascade.css
@@ -421,6 +421,10 @@ fieldset legend {
 	/* IE6-7 */
 
 }
+form .cbi-tab-descr {
+	line-height: 18px;
+	margin-bottom: 18px;
+}
 
 form .clearfix,
 form .cbi-value {
@@ -1929,9 +1933,9 @@ td.cbi-value-field var {
 	float: left;
 }
 
-.uci-change-legend-label>ins,
-.uci-change-legend-label>del,
-.uci-change-legend-label>var {
+.uci-change-legend-label > ins,
+.uci-change-legend-label > del,
+.uci-change-legend-label > var {
 	float: left;
 	margin-right: 4px;
 	width: 10px;
diff --git a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
index e9d9b61aa2..b74f209045 100644
--- a/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
+++ b/themes/luci-theme-bootstrap/htdocs/luci-static/bootstrap/mobile.css
@@ -1,3 +1,21 @@
 header h3 a, header .brand {
 	display:none !important;
 }
+
+@media screen and (max-device-width: 600px) {
+	#maincontent.container {
+		margin-top: 30px;
+	}
+}
+
+@media screen and (max-device-width: 360px) {
+	#maincontent.container {
+		margin-top: 60px;
+	}
+}
+
+@media screen and (max-device-width: 200px) {
+	#maincontent.container {
+		margin-top: 230px;
+	}
+}
\ No newline at end of file
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 ddefd3b04f..09299e0922 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 e5fb8a12dc..a19f2bb412 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/luasrc/view/themes/freifunk-generic/header.htm b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
index d74916aea1..20a41be855 100644
--- a/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
+++ b/themes/luci-theme-freifunk-generic/luasrc/view/themes/freifunk-generic/header.htm
@@ -10,6 +10,7 @@
 	local util = require "luci.util"
 	local http = require "luci.http"
 	local disp = require "luci.dispatcher"
+	local version = require "luci.version"
 
 	local sysinfo = util.ubus("system", "info") or { }
 	local loadinfo = sysinfo.load or { 0, 0, 0 }
@@ -122,7 +123,7 @@
 			<%end%>
 		</div>
 		<div class="header_right">
-			<%=luci.version.distversion%><br />
+			<%=version.distversion%><br />
 			<%:Load%>: <%="%.2f" % (loadinfo[1] / 65535.0)%> <%="%.2f" % (loadinfo[2] / 65535.0)%> <%="%.2f" % (loadinfo[3] / 65535.0)%><br />
 			<%:Hostname%>: <%=boardinfo.hostname or "?"%><br />
 			<span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
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 131f54e216..017e7f7bad 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 d8dea0467e..aa0ba0c231 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
-