mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2026-03-11 03:28:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added few minor fixes to access lists and pages

Browse source
This commit is contained in:
Martin Schröder 2015-06-01 14:16:06 +02:00
parent 0c5b6031f1
commit 619def4bc2
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
luciexpress/htdocs/plugins/core/widgets/luci.footer.html
View file

@ -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>

2
luciexpress/htdocs/plugins/wifi/pages/wifi.wps.html
View file

@ -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"/>

6
luciexpress/htdocs/plugins/wifi/widgets/uci.wireless.interface.js
View file

@ -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

6
luciexpress/share/acl.d/luci2.json
View file

@ -131,7 +131,8 @@
"pbc",
"showpin",
"stapin",
"status"
"status",
"stop"
],
"router": [
"networks"
@ -163,7 +164,8 @@
"pbc",
"showpin",
"stapin",
"status"
"status",
"stop"
]
},
"uci": [