working on editor

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>4beta2.7</version>
+	<version>4beta2.8</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>

src/main/resources/public/scripts/app.js

@@ -10,9 +10,6 @@ app.config (function ($routeProvider) {
 	}).when ('/logs', {
 		templateUrl: 'views/logs.html',
 		controller: 'LogsController'		
-	}).when ('/editor', {
-		templateUrl: 'views/editor.html',
-		controller: 'EditController'		
 	}).when ('/editdevice', {
 		templateUrl: 'views/editdevice.html',
 		controller: 'EditController'		
@@ -2079,6 +2076,8 @@ app.controller('EditController', function ($scope, $location, $http, bridgeServi
 	$scope.clearDevice = function () {
 		bridgeService.clearDevice();
 		$scope.onDevices = null;
+		$scope.dimDevices = null;
+		$scope.offDevices = null;
 	};
 
 	$scope.addDevice = function () {

src/main/resources/public/views/configuration.html

@@ -19,7 +19,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/editor.html

@@ -17,8 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation" class="active"><a href="#/editor">Manual
+	<li role="presentation" class="active"><a href="#/editdevice">Add/Edit</a></li>
-			Add</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/haldevice.html

@@ -16,7 +16,7 @@
 			Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/harmonyactivity.html

@@ -17,7 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/harmonydevice.html

@@ -17,7 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/hassdevice.html

@@ -17,7 +17,7 @@
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li role="presentation" class="active"><a href="#/hassdevices">HomeAssistant
 			Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/huedevice.html

@@ -17,7 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/logs.html

@@ -17,7 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/mqttpublish.html

@@ -11,7 +11,7 @@
 	<li ng-if="bridge.showHal" role="presentation"><a href="#/haldevices">HAL Devices</a></li>
 	<li role="presentation" class="active"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/nestactions.html

@@ -17,7 +17,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/system.html

@@ -18,7 +18,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/veradevice.html

@@ -16,7 +16,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">

src/main/resources/public/views/verascene.html

@@ -16,7 +16,7 @@
 		href="#/haldevices">HAL Devices</a></li>
 	<li ng-if="bridge.showMqtt" role="presentation"><a href="#/mqttmessages">MQTT Messages</a></li>
 	<li ng-if="bridge.showHass" role="presentation"><a href="#/hassdevices">HomeAssistant Devices</a></li>
-	<li role="presentation"><a href="#/editor">Manual Add</a></li>
+	<li role="presentation"><a href="#/editdevice">Add/Edit</a></li>
 </ul>
 
 <div class="panel panel-default">