From 7fef5391908bdb11e1d5f1c1ce88afde7b5b7d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Schr=C3=B6der?= <martin.schroder@inteno.se>
Date: Wed, 27 May 2015 12:58:26 +0200
Subject: [PATCH] Fixed status page

---
 .../plugins/internet/pages/settings.network.html    |  9 ++++++---
 .../widgets/uci.network.interface.edit.html         | 13 +++++--------
 .../htdocs/plugins/status/pages/status.status.js    |  8 +++-----
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/luciexpress/htdocs/plugins/internet/pages/settings.network.html b/luciexpress/htdocs/plugins/internet/pages/settings.network.html
index c64256cbc..124c1be3b 100644
--- a/luciexpress/htdocs/plugins/internet/pages/settings.network.html
+++ b/luciexpress/htdocs/plugins/internet/pages/settings.network.html
@@ -3,8 +3,11 @@
 		<luci-config-heading>{{ 'Network Settings' | translate }}</luci-config-heading>
 		<luci-config-info>{{ 'settings.network.info' | translate }}</luci-config-info>
 		<p translate ng-hide="network">Missing uci config boardpanel.</p>
-		<div ng-repeat="interface in interfaces">
-			<uci-network-interface-edit ng-model="interface"></uci-network-interface-edit>
-		</div>
+		<luci-config-section>
+			<div ng-repeat="interface in interfaces">
+				<uci-network-interface-edit ng-model="interface"></uci-network-interface-edit>
+			</div>
+		</luci-config-section>
+		<luci-config-apply></luci-config-apply>
 	</div>
 </luci-layout-with-sidebar>
diff --git a/luciexpress/htdocs/plugins/internet/widgets/uci.network.interface.edit.html b/luciexpress/htdocs/plugins/internet/widgets/uci.network.interface.edit.html
index 7c6a5a86f..41816bd0a 100644
--- a/luciexpress/htdocs/plugins/internet/widgets/uci.network.interface.edit.html
+++ b/luciexpress/htdocs/plugins/internet/widgets/uci.network.interface.edit.html
@@ -8,28 +8,25 @@
 				</span>
 			</div>
 			<h3 class="panel-title" style="font-size: 1.5em; padding-top: 0.4em; font-weight: bold; font-family: 'vodafont';">
-				{{interface.hostname.value}} ({{interface.type.value}})
+				{{interface[".name"]}}
 			</h3>
 			<div style="clear: both;"></div>
 		</div>
 		<div class="panel-body " ng-show="expanded" >
 			<luci-config-lines>
-				<luci-config-line title="{{'Hostname'|translate}}">
+				<!--<luci-config-line title="{{'Hostname'|translate}}">
 					<input class="form-control" ng-model="interface.hostname.value" ></input>
-				</luci-config-line>
+				</luci-config-line>-->
 				<luci-config-line title="{{'DHCP'|translate}}">
 					<switch ng-model="dhcp.ignore.value" class="green" inverted></switch>
 				</luci-config-line>
-				<luci-config-line title="{{'IP Address'|translate}}" ng-show="interface.proto.value == 'static'">
+				<luci-config-line title="{{'IP Address'|translate}}" ng-show="dhcp.ignore.value">
 					<input class="form-control" ng-model="interface.ipaddr.value" ></input>
 				</luci-config-line>
-				<luci-config-line title="{{'Netmask'|translate}}" ng-show="interface.proto.value == 'static'">
+				<luci-config-line title="{{'Netmask'|translate}}" ng-show="dhcp.ignore.value">
 					<input class="form-control" ng-model="interface.netmask.value" ></input>
 				</luci-config-line>
 			</luci-config-lines>
 		</div>
-		<div class="panel-footer" ng-show="expanded">
-			<luci-config-apply></luci-config-apply>
-		</div>
 	</div>
 </div>
diff --git a/luciexpress/htdocs/plugins/status/pages/status.status.js b/luciexpress/htdocs/plugins/status/pages/status.status.js
index 79ad8bfcb..a59fa42a0 100644
--- a/luciexpress/htdocs/plugins/status/pages/status.status.js
+++ b/luciexpress/htdocs/plugins/status/pages/status.status.js
@@ -22,13 +22,11 @@ JUCI.app
 					{ name: gettext("Internet"), value: $config.wan_interface }, 
 					{ name: gettext("Voice"), value: $config.voice_interface }, 
 					{ name: gettext("IPTV"), value: $config.iptv_interface }
-				]
-				.filter(function(x){ return x.value != "" })
-				.forEach(function(x, c){ 
-					if(x.interface) {
+				].forEach(function(x, c){ 
+					if(x.value) {
 						sections.push({
 							"name": x.name, 
-							"interface": _interfaces.find(function(i){ return i.interface == x.value; })
+							"interface": _interfaces.find(function(i){ return i.interface === x.value; })
 						});  
 					}
 				});