frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

webui: some editor style tweaks (#234)

Browse Source 
* 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
This commit is contained in:
redPanther 2016-09-10 23:30:05 +02:00 committed by GitHub
parent 8aff421850
commit 82611afa25
6 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/webconfig/content/generalconf.html
View File

@ -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>

2
assets/webconfig/content/leds.html
View File

@ -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>

11
assets/webconfig/js/content_generalconf.js
View File

@ -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()));

10
assets/webconfig/js/content_grabber.js
View File

@ -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();
});

7
assets/webconfig/js/content_leds.js
View File

@ -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',
@ -163,6 +164,12 @@ $(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();

7
libsrc/leddevice/schemas/schema-philipshue.json
View File

@ -12,8 +12,11 @@
"default": "newdeveloper"
},
"lightIds": {
"type": "integer",
"title":"Light ids"
"type": "array",
"title":"Light ids",
"items": {
"type" : "integer"
}
},
"transitiontime": {
"type": "integer",