luci-0.10: merge r8125

2 files changed, 10 insertions, 2 deletions

diff --git a/modules/admin-core/luasrc/controller/admin/servicectl.lua b/modules/admin-core/luasrc/controller/admin/servicectl.lua
index 83f07d7f27..ccd54da764 100644
--- a/modules/admin-core/luasrc/controller/admin/servicectl.lua
+++ b/modules/admin-core/luasrc/controller/admin/servicectl.lua
@@ -38,7 +38,7 @@ function action_restart()
 		local service
 		local services = { }
 
-		for service in luci.dispatcher.context.requestpath[3]:gmatch("%w+") do
+		for service in luci.dispatcher.context.requestpath[3]:gmatch("[%w_-]+") do
 			services[#services+1] = service
 		end
 
diff --git a/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css b/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css
index 2bdd347779..95e6a075e4 100644
--- a/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt/htdocs/luci-static/openwrt.org/cascade.css
@@ -720,6 +720,10 @@ td.cbi-value-error {
 	padding: 3px;
 }
 
+.cbi-value-field var {
+	color: #2222FF;
+}
+
 ul.cbi-tabmenu {
 	padding: 3px 0;
 	margin-left: 0 !important;
@@ -772,8 +776,12 @@ div.cbi-tab-descr {
 	padding: 0.5em 0.5em 0.5em 2em;
 }
 
+.left {
+	text-align: left !important;
+}
+
 .right {
-	text-align: right;
+	text-align: right !important;
 }
 
 .luci {