Quickfixes in the gui (do not use until next commit)

This commit is contained in:
Martin Schröder 2015-05-27 21:18:01 +02:00 committed by Martin Schröder
parent fc59afff4b
commit 174b5a7e69
4 changed files with 9 additions and 6 deletions

View file

@ -33,13 +33,13 @@
<tr>
<td>
<div class="col-md-2"><i class="fa fa-calendar fa-2x"></i></div>
<div class="col-md-10"><strong>Schedule <a class="label label-{{(wifi.status.schedule.value)?'success':'default'}} pull-right" href="" ng-click="onWIFISchedToggle()">{{wifiSchedStatus | translate}}</a></strong></div>
<div class="col-md-10"><strong><a href="#!/wifi-schedule">Schedule</a> <a class="label label-{{(wifi.status.schedule.value)?'success':'default'}} pull-right" href="" ng-click="onWIFISchedToggle()">{{wifiSchedStatus | translate}}</a></strong></div>
</td>
</tr>
<tr>
<td>
<div class="col-md-2"><i class="fa fa-wifi fa-2x"></i></div>
<div class="col-md-10"><strong>WPS <a class="label label-{{(wifi.status.wps.value)?'success':'default'}} pull-right" href="" ng-click="onWPSToggle()">{{wifiWPSStatus | translate}}</a></strong></div>
<div class="col-md-10"><strong><a href="#!/wifi-wps">WPS</a> <a class="label label-{{(wifi.status.wps.value)?'success':'default'}} pull-right" href="" ng-click="onWPSToggle()">{{wifiWPSStatus | translate}}</a></strong></div>
</td>
</tr>
<tr ng-repeat="client in wireless.clients">
@ -85,7 +85,7 @@
<tr>
<td>
<div class="col-md-2"><i class="fa fa-calendar fa-2x"></i></div>
<div class="col-md-10"><strong>Schedule is on</strong></div>
<div class="col-md-10"><strong><a href="#!/phone-ringing-schedule">Schedule</a> is <a class="label label-{{(wifi.status.wps.value)?'success':'default'}} pull-right" href="" ng-click="onWPSToggle()">{{wifiWPSStatus | translate}}</a></strong></div>
</td>
</tr>
<tr ng-repeat="sip in sipAccounts track by $index">

View file

@ -2,6 +2,6 @@ JUCI.app
.controller("SettingsNetworkCtrl", function($scope, $uci){
$uci.sync("network").done(function(){
$scope.network = $uci.network;
$scope.interfaces = $uci.network['@interface'].filter(function(i){ return i.type.value != ""; });
$scope.interfaces = $uci.network['@interface'].filter(function(i){ return i.type.value != "" && i.is_lan.value == true});
});
});

View file

@ -8,8 +8,11 @@
<luci-config-line title="{{'Ringing Schedule'|translate}}">
<switch id="enabled" name="enabled" ng-model="settings.enabled.value" class="green"></switch>
</luci-config-line>
<luci-config-line title="{{'During this time ringing is '|translate}}">
<switch id="enabled" name="enabled" ng-model="settings.status.value" class="green"></switch>
</luci-config-line>
</luci-config-lines>
<table class="table">
<table class="table" ng-show="settings.enabled.value">
<thead>
<th translate>Day</th>
<th translate>Time</th>

View file

@ -6,7 +6,7 @@ JUCI.app
if(data && data.sip){
var accounts = [];
Object.keys(data.sip).map(function(k){
if(data.sip[k].ip) accounts.push(data.sip[k]);
accounts.push(data.sip[k]);
});
$scope.sipAccounts = accounts;
$scope.$apply();