From 619def4bc2bc70743f2dd70a0bf89cdb415a0e13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Schr=C3=B6der?= <mkschreder.uk@gmail.com>
Date: Mon, 1 Jun 2015 14:16:06 +0200
Subject: [PATCH] Added few minor fixes to access lists and pages

---
 luciexpress/htdocs/plugins/core/widgets/luci.footer.html    | 4 ++--
 luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html         | 2 +-
 .../htdocs/plugins/wifi/widgets/uci.wireless.interface.js   | 6 ++++--
 luciexpress/share/acl.d/luci2.json                          | 6 ++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/luciexpress/htdocs/plugins/core/widgets/luci.footer.html b/luciexpress/htdocs/plugins/core/widgets/luci.footer.html
index dd6198dd1..f2722cd70 100644
--- a/luciexpress/htdocs/plugins/core/widgets/luci.footer.html
+++ b/luciexpress/htdocs/plugins/core/widgets/luci.footer.html
@@ -2,14 +2,14 @@
 	<div id="language-info" >
 		<div id="language-switcher-list" >
 			<span ng-repeat="lang in languages">
-				<a style="text-decoration: {{isActiveLanguage(lang)?'underline':'none'}}; color: inherit;" href="" ng-click="setLanguage(lang)">{{lang.title}}</a>{{$last ? '' : ' | '}}
+				<a style="text-decoration: {{isActiveLanguage(lang)?'underline':'none'}}; color: inherit;" href="" ng-click="setLanguage(lang)">{{lang.title|translate}}</a>{{$last ? '' : ' | '}}
 			</span>
 		</div>
 		<div style="float: right;">
 			<!--<juci-theme-picker></juci-theme-picker>-->
 		</div>
 		<div id="info">
-			WAN IP Address: {{wanip||'Not connected'}} | Firmware version: {{firmware}}
+			WAN IP Address: {{wanip}} | Firmware version: {{firmware}}
 		</div>
 		
 	</div>
diff --git a/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html b/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html
index 968409faf..2e7137433 100644
--- a/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html
+++ b/luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html
@@ -63,7 +63,7 @@
 				</luci-config-lines>
 			</luci-config-section>
 		</luci-config>
-		<modal title="{{'Attempting to Pair'|translate}}" ng-show="progress != 0 && progress != 2 && progress < 10" dismiss-label="Cancel" on-dismiss="onCancelWPS()">
+		<modal title="{{'Attempting to Pair'|translate}}" ng-show="progress > 0 && progress != 2 && progress < 8" dismiss-label="Cancel" on-dismiss="onCancelWPS()">
 			<div style="text-align: center;">
 				<div ng-show="progress != 0" >
 					<i class="fa fa-spinner fa-spin fa-3x"/>
diff --git a/luciexpress/htdocs/plugins/wifi/widgets/uci.wireless.interface.js b/luciexpress/htdocs/plugins/wifi/widgets/uci.wireless.interface.js
index 158088164..8f7a56ece 100644
--- a/luciexpress/htdocs/plugins/wifi/widgets/uci.wireless.interface.js
+++ b/luciexpress/htdocs/plugins/wifi/widgets/uci.wireless.interface.js
@@ -10,7 +10,7 @@ $juci.module("wifi")
 		replace: true, 
 		require: "^ngModel"
 	 };  
-}).controller("WifiInterfaceController", function($scope, $uci, gettext){
+}).controller("WifiInterfaceController", function($scope, $uci, $tr, gettext){
 	$scope.errors = []; 
 	$scope.$on("error", function(ev, err){
 		ev.stopPropagation(); 
@@ -18,7 +18,9 @@ $juci.module("wifi")
 	}); 
 	$scope.$watch("interface", function(value){
 		try {
-			$scope.cryptoChoices = $scope.interface.encryption.schema.allow;
+			$scope.cryptoChoices = $scope.interface.encryption.schema.allow.map(function(x){
+				return { label: $tr("wifi.enc."+x), value: x };
+			}); 
 		} catch(e) {} 
 		$scope.devices = $uci.wireless["@wifi-device"].map(function(x){
 			// TODO: this should be a uci "displayname" or something
diff --git a/luciexpress/share/acl.d/luci2.json b/luciexpress/share/acl.d/luci2.json
index 94fa6b739..d1e347fa3 100644
--- a/luciexpress/share/acl.d/luci2.json
+++ b/luciexpress/share/acl.d/luci2.json
@@ -131,7 +131,8 @@
 					"pbc",
 					"showpin",
 					"stapin", 
-					"status"
+					"status", 
+					"stop"
 				], 
 				"router": [
 					"networks"
@@ -163,7 +164,8 @@
 					"pbc",
 					"showpin",
 					"stapin", 
-					"status"
+					"status",
+					"stop"
 				]
 			},
 			"uci": [