From 82611afa252fe8333974b755080af5dd272f6c4b Mon Sep 17 00:00:00 2001
From: redPanther <redPanther@users.noreply.github.com>
Date: Sat, 10 Sep 2016 23:30:05 +0200
Subject: [PATCH] webui: some editor style tweaks (#234)

* initial support for leddevice options

* fix schema and editor init

* fix led editor labels and schema

* add some led schemas

* led config: insert current values. not yet perfect, but it works

* tune editor style
---
 assets/webconfig/content/generalconf.html       |  2 +-
 assets/webconfig/content/leds.html              |  2 +-
 assets/webconfig/js/content_generalconf.js      | 11 +++++++++--
 assets/webconfig/js/content_grabber.js          | 10 +++++++++-
 assets/webconfig/js/content_leds.js             |  9 ++++++++-
 libsrc/leddevice/schemas/schema-philipshue.json |  7 +++++--
 6 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/assets/webconfig/content/generalconf.html b/assets/webconfig/content/generalconf.html
index 5778fd1f..71a717d8 100644
--- a/assets/webconfig/content/generalconf.html
+++ b/assets/webconfig/content/generalconf.html
@@ -7,7 +7,7 @@
 			</div>
 			<hr>
 			<div class="col-lg-12">
-				<div id='editor_holder'></div>
+				<div id='editor_container'></div>
 				<button id='btn_submit'>Submit (console.log)</button>
 			</div>
 		</div>
diff --git a/assets/webconfig/content/leds.html b/assets/webconfig/content/leds.html
index 11792abd..1712f0cc 100644
--- a/assets/webconfig/content/leds.html
+++ b/assets/webconfig/content/leds.html
@@ -45,13 +45,13 @@
 		<div id="menu_controller" class="tab-pane fade in active" style="padding-top:10px">
 			<div class="panel panel-primary">
 					<div class="panel-heading form-group" style="font-size:90%;white-space:nowrap;">
+						<button id='btn_submit' class="btn btn-success"	style="float:right">Save Settings</button>
 						<label for="leddevices">Controller Type</label>
 						<select id="leddevices" class="form-control" style="color:black;width:auto;margin-left:10px;display:inline-block" />
 					</div>
 					<div class="panel-body">
 					<div id="ledDeviceOptions">
 						<div id='editor_container'></div>
-						<button id='btn_submit'>Submit (console.log)</button>
 					</div>
 					
 					
diff --git a/assets/webconfig/js/content_generalconf.js b/assets/webconfig/js/content_generalconf.js
index 3daf9d6c..e9d0bd18 100644
--- a/assets/webconfig/js/content_generalconf.js
+++ b/assets/webconfig/js/content_generalconf.js
@@ -37,17 +37,18 @@ $(hyperion).one("cmd-config-getschema", function(event) {
 	udpListener = schema.udpListener;
 	webConfig = schema.webConfig;
 
-	var element = document.getElementById('editor_holder');
+	var element = document.getElementById('editor_container');
 
 	var general_conf_editor = new JSONEditor(element,{
 		theme: 'bootstrap3',
+		iconlib: "fontawesome4",
 		disable_collapse: 'true',
 		form_name_root: 'sa',
 		disable_edit_json: 'true',
 		disable_properties: 'true',
 		no_additional_properties: 'true',
 		schema: {
-			title:' ',
+			title:'',
 			properties: {
 				/*blackborderdetector,
 				color,
@@ -66,6 +67,12 @@ $(hyperion).one("cmd-config-getschema", function(event) {
 		}
 	});
 
+// 	$('#editor_container .well').css("background-color","white");
+// 	$('#editor_container .well').css("border","none");
+// 	$('#editor_container .well').css("box-shadow","none");
+	$('#editor_container .btn').addClass("btn-primary");
+	$('#editor_container h3').first().remove();
+	
 	//Called everytime a Input Field is changed = No need for save button
 	general_conf_editor.off().on('change',function() {
 		console.log(JSON.stringify(general_conf_editor.getValue()));
diff --git a/assets/webconfig/js/content_grabber.js b/assets/webconfig/js/content_grabber.js
index 49495b53..f6d2234b 100644
--- a/assets/webconfig/js/content_grabber.js
+++ b/assets/webconfig/js/content_grabber.js
@@ -30,19 +30,27 @@ $(hyperion).one("cmd-config-getschema", function(event) {
 	
 	var grabber_conf_editor = new JSONEditor(element,{
 		theme: 'bootstrap3',
+		iconlib: "fontawesome4",
 		disable_collapse: 'true',
 		form_name_root: 'sa',
 		disable_edit_json: 'true',
 		disable_properties: 'true',
 		no_additional_properties: 'true',
 		schema: {
-			title:' ',
+			title:'',
 			properties: {
 				schema_framegrabber,
 				schema_grabberv4l2,
 			}
 		}
 	});
+	
+	$('#editor_container .well').css("background-color","white");
+	$('#editor_container .well').css("border","none");
+	$('#editor_container .well').css("box-shadow","none");
+	$('#editor_container .btn').addClass("btn-primary");
+	$('#editor_container h3').first().remove();
+
 });
 
 
diff --git a/assets/webconfig/js/content_leds.js b/assets/webconfig/js/content_leds.js
index 6a81ca68..60ac0f1c 100644
--- a/assets/webconfig/js/content_leds.js
+++ b/assets/webconfig/js/content_leds.js
@@ -130,6 +130,7 @@ $(document).ready(function() {
 	
 		var grabber_conf_editor = new JSONEditor(element,{
 			theme: 'bootstrap3',
+			iconlib: "fontawesome4",
 			disable_collapse: 'true',
 			form_name_root: 'sa',
 			disable_edit_json: 'true',
@@ -162,7 +163,13 @@ $(document).ready(function() {
 			};
 			grabber_conf_editor.getEditor("root.specificOptions").setValue( values_specific );
 		};
-		
+	
+		$('#editor_container .well').css("background-color","white");
+		$('#editor_container .well').css("border","none");
+		$('#editor_container .well').css("box-shadow","none");
+		$('#editor_container .btn').addClass("btn-primary");
+		$('#editor_container h3').first().remove();
+
 		if ($(this).val() == "philipshue")
 		{
 			$("#huebridge").show();
diff --git a/libsrc/leddevice/schemas/schema-philipshue.json b/libsrc/leddevice/schemas/schema-philipshue.json
index c0a444a0..2ac74497 100644
--- a/libsrc/leddevice/schemas/schema-philipshue.json
+++ b/libsrc/leddevice/schemas/schema-philipshue.json
@@ -12,8 +12,11 @@
 			"default": "newdeveloper"
 		},
 		"lightIds": {
-			"type": "integer",
-			"title":"Light ids"
+			"type": "array",
+			"title":"Light ids",
+			"items": {
+				"type" : "integer"
+			}
 		},
 		"transitiontime": {
 			"type": "integer",