* luci-0.8: merge translation fixes, theme changes, selective port handling and others

8 files changed, 137 insertions, 12 deletions

diff --git a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
index 93b0a32eaf..6c0e282c5f 100644
--- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
+++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/cascade.css
@@ -448,14 +448,14 @@ input.cbi-input-user {
 	background: url('../resources/cbi/user.gif') no-repeat scroll 1px center;
 	background-color: inherit;
 	color: #000000;
-	padding-left: 17px;
+	text-indent: 17px;
 }
 
 input.cbi-input-password {
 	background: url('../resources/cbi/key.gif') no-repeat scroll 1px center;
 	background-color: inherit;
 	color: #000000;
-	padding-left: 17px;
+	text-indent: 17px;
 }
 
 input.cbi-input-find {
diff --git a/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css b/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css
index d65da4a19d..1c951854b5 100644
--- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css
+++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie6.css
@@ -51,6 +51,12 @@
 	width: 50% !important;
 }
 
+* html .cbi-input-user,
+* html .cbi-input-password {
+	text-indent: 0 !important;
+	padding-left: 1.5em !important;
+}
+
 * html .cbi-section legend {
 	background-color: #ffffff;
 	color: #555555;
diff --git a/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css b/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css
index c410f11ff6..67ed9fb816 100644
--- a/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css
+++ b/themes/openwrt-light/htdocs/luci-static/openwrt-light/ie7.css
@@ -11,3 +11,10 @@ table.cbi-section-table td .cbi-input-text,
 table.cbi-section-table td .cbi-input-select {
 	width: 95% !important;
 }
+
+.cbi-input-user,
+.cbi-input-password {
+	text-indent: 0 !important;
+	padding-left: 1.5em !important;
+	width: 18.5em !important;
+}
diff --git a/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight b/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight
index b797a0073a..c2322a4b46 100755
--- a/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight
+++ b/themes/openwrt-light/root/etc/uci-defaults/luci-theme-openwrtlight
@@ -1,6 +1,6 @@
 #!/bin/sh
 uci batch <<-EOF
-	set luci.themes.OpenWRT_Light=/luci-static/openwrt-light
+	set luci.themes.OpenWrt_Light=/luci-static/openwrt-light
         commit luci
 EOF
 	
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
index d83733ff30..2c0004cbb6 100644
--- a/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
@@ -333,6 +333,15 @@ html #menubar a:visited.warning {
 	width: 11.5em;
 }
 
+textarea#syslog {
+	width: 98%;
+	height: 450px;
+	border: 3px solid #cccccc;
+	padding: 5px;
+	font-family: monospace;
+	overflow: auto;
+}
+
 #maincontent {
 	clear: both;
 	width: 80%;
@@ -347,16 +356,22 @@ html #menubar a:visited.warning {
 }
 
 #maincontent h2 {
-	margin: 0.25em 0 0.5em 0;
 	font-size: 150%;
-	font-weight: normal;
+	font-family: Trebuchet MS, Verdana, sans-serif;
+	font-weight: bold;
+	margin: 0.25em 0 0.7em 0;
+	border-bottom: 1px solid;
+	padding-top: 10px;
+	padding-bottom: 4px;
 }
 
 #maincontent h3 {
-	margin: 0.5em 0;
-	font-size: 120%;
-	font-weight: normal;
-	text-decoration: underline;
+	margin: 0.5em 0 1.1em 0;
+	font-size: 125%;
+	font-weight: bold;
+	font-style: italic;
+	font-family: Trebuchet MS, Verdana, sans-serif;
+	color: #27408B;
 }
 
 #maincontent p {
@@ -455,14 +470,14 @@ input.cbi-input-user {
 	background: url('../resources/cbi/user.gif') no-repeat scroll 1px center;
 	background-color: inherit;
 	color: #000000;
-	padding-left: 17px;
+	text-indent: 17px;
 }
 
 input.cbi-input-password {
 	background: url('../resources/cbi/key.gif') no-repeat scroll 1px center;
 	background-color: inherit;
 	color: #000000;
-	padding-left: 17px;
+	text-indent: 17px;
 }
 
 input.cbi-input-find {
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css
new file mode 100644
index 0000000000..1c951854b5
--- /dev/null
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie6.css
@@ -0,0 +1,77 @@
+/* obligatory IE6 Voodoo Code */
+
+* html body {
+	padding-left: 50% !important;
+}
+
+* html div#header {
+	margin-left: -100% !important;
+}
+
+* html div#menubar {
+	margin-left: -100% !important;
+	width: 200% !important;
+}
+
+* html ul.dropdowns li ul {
+	width: 10em;
+}
+
+* html ul.dropdowns li li {
+	clear: both;
+	float: left;
+}
+
+* html ul.dropdowns li li {
+	width: 100%;
+}
+
+* html ul.dropdowns li li a {
+	height: 1%;
+}
+
+* html div#maincontent {
+	margin-left: -80% !important;
+	width: 160% !important;
+}
+
+* html div.cbi-value-description {
+	width: auto !important;
+}
+
+* html div.cbi-value-field {
+	margin-left: 0 !important;
+	width: 100% !important;
+}
+
+* html .cbi-input-text,
+* html .cbi-input-user,
+* html .cbi-input-select,
+* html .cbi-input-password {
+	width: 50% !important;
+}
+
+* html .cbi-input-user,
+* html .cbi-input-password {
+	text-indent: 0 !important;
+	padding-left: 1.5em !important;
+}
+
+* html .cbi-section legend {
+	background-color: #ffffff;
+	color: #555555;
+}
+
+* html table.cbi-section-table td .cbi-input-text,
+* html table.cbi-section-table td .cbi-input-select {
+	width: 100% !important;
+}
+
+* html div.cbi-page-actions {
+	text-align: right !important;
+}
+
+* html div.cbi-value-field input,
+* html div.cbi-value-field select {
+	font-size: 90% !important;
+}
diff --git a/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css
new file mode 100644
index 0000000000..67ed9fb816
--- /dev/null
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/ie7.css
@@ -0,0 +1,20 @@
+div.cbi-value-field {
+	margin-left: 0 !important;
+}
+
+.cbi-section legend {
+	background-color: #ffffff;
+	color: #555555;
+}
+
+table.cbi-section-table td .cbi-input-text,
+table.cbi-section-table td .cbi-input-select {
+	width: 95% !important;
+}
+
+.cbi-input-user,
+.cbi-input-password {
+	text-indent: 0 !important;
+	padding-left: 1.5em !important;
+	width: 18.5em !important;
+}
diff --git a/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt b/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt
index a8bef6c92d..d8dea0467e 100755
--- a/themes/openwrt.org/root/etc/uci-defaults/luci-theme-openwrt
+++ b/themes/openwrt.org/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.themes.OpenWrt=/luci-static/openwrt.org
         commit luci
 EOF