diff --git a/assets/webconfig/content/dashboard.html b/assets/webconfig/content/dashboard.html index a83ef2e9..6c7bb44e 100644 --- a/assets/webconfig/content/dashboard.html +++ b/assets/webconfig/content/dashboard.html @@ -16,6 +16,20 @@ Status
+ + + + + + + +
+ + Components +
+ + + @@ -28,22 +42,22 @@ - + - + - + - + diff --git a/assets/webconfig/index.html b/assets/webconfig/index.html index e8154e01..747c2ed7 100644 --- a/assets/webconfig/index.html +++ b/assets/webconfig/index.html @@ -207,22 +207,22 @@
  • Dashboard
  • General
  • - Configuration + LED-Instances
  • Capturing Hardware
    • -
  • Network
    • +
  • Network
  • Remote Control
  • Effects Configurator
  • Support
  • System
    • '; - instances_html += ''; - instances_html += ''; + instances_html += ''; + instances_html += ''; instances_html += '
    protoproto unknown
    flatflat unknown
    jsonjson unknown
    websocketwebsocket unknown
    ' + $.i18n('conf_leds_contr_label_contrtype') + '' + window.serverConfig.device.type + '' + $.i18n('conf_leds_contr_label_contrtype') + '' + window.serverConfig.device.type + '
    '; instances_html += ''; @@ -50,28 +50,46 @@ $(document).ready(function () { instances_html += '' + $.i18n('dashboard_componentbox_label_title') + ''; instances_html += ''; - var tab_components = ""; + var instance_components = ""; + var global_components = ""; for (var idx = 0; idx < components.length; idx++) { if (components[idx].name != "ALL") { - var comp_enabled = components[idx].enabled ? "checked" : ""; - const general_comp = "general_comp_" + components[idx].name; - var componentBtn = ''; + if (components[idx].name != "FORWARDER" && components[idx].name != "GRABBER" && components[idx].name != "V4L") { + var comp_enabled = components[idx].enabled ? "checked" : ""; + const general_comp = "general_comp_" + components[idx].name; + var componentBtn = ''; - tab_components += ''; + instance_components += ''; + } else { + var comp_enabled = components[idx].enabled ? "checked" : ""; + const general_comp = "general_comp_" + components[idx].name; + var componentBtn = ''; + + global_components += ''; + } } } - instances_html += '' + tab_components + '
    ' + $.i18n('general_comp_' + components[idx].name) + '' + componentBtn + '
    ' + $.i18n('general_comp_' + components[idx].name) + '' + componentBtn + '
    ' + $.i18n('general_comp_' + components[idx].name) + '' + componentBtn + '
    '; + instances_html += '' + instance_components + ''; instances_html += '
    '; $('.instances').prepend(instances_html); + $('.glob_components').html(global_components); + updateUiOnInstance(window.currentHyperionInstance); updateHyperionInstanceListing(); @@ -83,7 +101,10 @@ $(document).ready(function () { for (var idx = 0; idx < components.length; idx++) { if (components[idx].name != "ALL") { $("#general_comp_" + components[idx].name).bootstrapToggle(); - $("#general_comp_" + components[idx].name).bootstrapToggle(hyperion_enabled ? "enable" : "disable") + + if (components[idx].name != "FORWARDER" && components[idx].name != "GRABBER" && components[idx].name != "V4L") + $("#general_comp_" + components[idx].name).bootstrapToggle(hyperion_enabled ? "enable" : "disable") + $("#general_comp_" + components[idx].name).change(e => { requestSetComponentState(e.currentTarget.id.split('_')[2], e.currentTarget.checked); }); diff --git a/assets/webconfig/js/content_grabber.js b/assets/webconfig/js/content_grabber.js index 246f32e9..d5c15b33 100644 --- a/assets/webconfig/js/content_grabber.js +++ b/assets/webconfig/js/content_grabber.js @@ -182,26 +182,26 @@ $(document).ready(function () { if (window.showOptHelp) { // Instance Capture $('#conf_cont').append(createRow('conf_cont_instCapt')); - $('#conf_cont_instCapt').append(createOptPanel('fa-camera', $.i18n("edt_conf_instCapture_heading_title"), 'editor_container_instCapt', 'btn_submit_instCapt')); + $('#conf_cont_instCapt').append(createOptPanel('fa-camera', $.i18n("edt_conf_instCapture_heading_title"), 'editor_container_instCapt', 'btn_submit_instCapt', 'panel-system')); $('#conf_cont_instCapt').append(createHelpTable(window.schema.instCapture.properties, $.i18n("edt_conf_instCapture_heading_title"))); // Framegrabber $('#conf_cont').append(createRow('conf_cont_fg')); - $('#conf_cont_fg').append(createOptPanel('fa-camera', $.i18n("edt_conf_fg_heading_title"), 'editor_container_fg', 'btn_submit_fg')); + $('#conf_cont_fg').append(createOptPanel('fa-camera', $.i18n("edt_conf_fg_heading_title"), 'editor_container_fg', 'btn_submit_fg', 'panel-system')); $('#conf_cont_fg').append(createHelpTable(window.schema.framegrabber.properties, $.i18n("edt_conf_fg_heading_title"))); // V4L2 - hide if not available if (V4L2_AVAIL) { $('#conf_cont').append(createRow('conf_cont_v4l')); - $('#conf_cont_v4l').append(createOptPanel('fa-camera', $.i18n("edt_conf_v4l2_heading_title"), 'editor_container_v4l2', 'btn_submit_v4l2')); + $('#conf_cont_v4l').append(createOptPanel('fa-camera', $.i18n("edt_conf_v4l2_heading_title"), 'editor_container_v4l2', 'btn_submit_v4l2', 'panel-system')); $('#conf_cont_v4l').append(createHelpTable(window.schema.grabberV4L2.properties, $.i18n("edt_conf_v4l2_heading_title"))); } } else { $('#conf_cont').addClass('row'); - $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_instCapture_heading_title"), 'editor_container_instCapt', 'btn_submit_instCapt')); - $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_fg_heading_title"), 'editor_container_fg', 'btn_submit_fg')); + $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_instCapture_heading_title"), 'editor_container_instCapt', 'btn_submit_instCapt', 'panel-system')); + $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_fg_heading_title"), 'editor_container_fg', 'btn_submit_fg', 'panel-system')); if (V4L2_AVAIL) { - $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_v4l2_heading_title"), 'editor_container_v4l2', 'btn_submit_v4l2')); + $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_v4l2_heading_title"), 'editor_container_v4l2', 'btn_submit_v4l2', 'panel-system')); } } diff --git a/assets/webconfig/js/content_index.js b/assets/webconfig/js/content_index.js index 124ca20c..a2428ef2 100755 --- a/assets/webconfig/js/content_index.js +++ b/assets/webconfig/js/content_index.js @@ -307,12 +307,18 @@ $(document).ready(function () { window.scrollTo(0, 0); }); - $(window).scroll(function(){ + $(window).scroll(function() { if ($(window).scrollTop() > 65) $("#navbar_brand_logo").css("display", "none"); else $("#navbar_brand_logo").css("display", ""); }); + + $('#side-menu li a, #side-menu li ul li a').click(function() { + console.log('test'); + $('#side-menu').find('.active').toggleClass('inactive'); // find all active classes and set inactive; + $(this).addClass('active'); + }); }); function suppressDefaultPwWarning() { @@ -349,7 +355,7 @@ $("#btn_darkmode").off().on("click", function (e) { }); // Menuitem toggle; -function SwitchToMenuItem(target) { +function SwitchToMenuItem(target, item) { document.getElementById(target).click(); // Get