From 98e0c2abd35936bf155282da9834f15763f4c372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Schr=C3=B6der?= <martin.schroder@inteno.se>
Date: Thu, 28 May 2015 15:03:29 +0200
Subject: [PATCH] Added static dhcp

---
 .../widgets/uci.network.interface.edit.html      | 16 +++++++++-------
 .../widgets/uci.network.interface.edit.js        |  6 ++++++
 2 files changed, 15 insertions(+), 7 deletions(-)

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 e04dbd3de..afdb520ce 100644
--- a/luciexpress/htdocs/plugins/internet/widgets/uci.network.interface.edit.html
+++ b/luciexpress/htdocs/plugins/internet/widgets/uci.network.interface.edit.html
@@ -40,6 +40,7 @@
 			</luci-config-lines>
 			<div ng-show="dhcp.ignore.value">
 				<hr/>
+				<h3 translate>Static DHCP</h3>
 				<table class="table">
 					<thead>
 						<th translate>Device Name</th>
@@ -57,20 +58,21 @@
 						<td>
 							<input type="text" class="form-control" ng-model="host.ip.value"/>
 						</td>
-						<td>
-							<button class="btn btn-default" ng-click="onAddExistingHost()"><i class="fa fa-plus"></i></button>
+						<td style="white-space: nowrap">
+							<!--<button class="btn btn-default" style="display: inline-block; float: none;" ng-click="onAddExistingHost()"><i class="fa fa-plus"></i></button>-->
+							<button class="btn btn-default" style="display: inline-block; float: none;" ng-click="onRemoveStaticDHCP(host)"><i class="fa fa-trash-o"></i></button>
 						</td>
 					</tr>
 					<tr>
-						<td colspan="3"></td>
-						<td >
+						<td colspan="2"></td>
+						<td style="text-align: right;">
+							<luci-select ng-model="existingHost" ng-items="hosts" on-change="onAddExistingHost()" placeholder="{{'Add existing host'|translate}}"/>
+						</td>
+						<td style="text-align: right;">
 							<button class="btn btn-default" ng-click="onAddStaticDHCP()"><i class="fa fa-plus"></i></button>
 						</td>
 					</tr>
 				</table>
-				<div class="pull-right">
-					<luci-select ng-model="existingHost" ng-items="hosts" on-change="onAddExistingHost()" placeholder="{{'Add existing host'|translate}}"/>
-				</div>
 			</div>
 		</div>
 	</div>
diff --git a/luciexpress/htdocs/plugins/internet/widgets/uci.network.interface.edit.js b/luciexpress/htdocs/plugins/internet/widgets/uci.network.interface.edit.js
index fd316e833..f02efb2e5 100644
--- a/luciexpress/htdocs/plugins/internet/widgets/uci.network.interface.edit.js
+++ b/luciexpress/htdocs/plugins/internet/widgets/uci.network.interface.edit.js
@@ -45,6 +45,12 @@ JUCI.app
 			$scope.$apply(); 
 		}); 
 	}
+	$scope.onRemoveStaticDHCP = function(host){
+		if(!host) return; 
+		host.$delete().done(function(){
+			$scope.$apply(); 
+		}); 
+	}
 	$scope.onAddExistingHost = function(){
 		var item = $scope.existingHost; 
 		$uci.dhcp.create({