From 174b5a7e697d3a3ec560ad8bf4b285153ccb2a46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Schr=C3=B6der?= <martin.schroder@inteno.se>
Date: Wed, 27 May 2015 21:18:01 +0200
Subject: [PATCH] Quickfixes in the gui (do not use until next commit)

---
 luciexpress/htdocs/plugins/core/pages/overview.html         | 6 +++---
 .../htdocs/plugins/internet/pages/settings.network.js       | 2 +-
 .../htdocs/plugins/phone/pages/phone.ringing_schedule.html  | 5 ++++-
 .../htdocs/plugins/status/pages/status.status.voice.js      | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/luciexpress/htdocs/plugins/core/pages/overview.html b/luciexpress/htdocs/plugins/core/pages/overview.html
index 99f82cfec..b4e6ca5fe 100644
--- a/luciexpress/htdocs/plugins/core/pages/overview.html
+++ b/luciexpress/htdocs/plugins/core/pages/overview.html
@@ -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">
diff --git a/luciexpress/htdocs/plugins/internet/pages/settings.network.js b/luciexpress/htdocs/plugins/internet/pages/settings.network.js
index 1ddd6de0c..9a61e0496 100644
--- a/luciexpress/htdocs/plugins/internet/pages/settings.network.js
+++ b/luciexpress/htdocs/plugins/internet/pages/settings.network.js
@@ -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}); 
 	}); 
 }); 
diff --git a/luciexpress/htdocs/plugins/phone/pages/phone.ringing_schedule.html b/luciexpress/htdocs/plugins/phone/pages/phone.ringing_schedule.html
index 242c3a565..f2c6032ee 100644
--- a/luciexpress/htdocs/plugins/phone/pages/phone.ringing_schedule.html
+++ b/luciexpress/htdocs/plugins/phone/pages/phone.ringing_schedule.html
@@ -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>
diff --git a/luciexpress/htdocs/plugins/status/pages/status.status.voice.js b/luciexpress/htdocs/plugins/status/pages/status.status.voice.js
index 1e2b80133..bd0421c10 100644
--- a/luciexpress/htdocs/plugins/status/pages/status.status.voice.js
+++ b/luciexpress/htdocs/plugins/status/pages/status.status.voice.js
@@ -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();