diff --git a/docs/img/WORKFLOWS/workflows.png b/docs/img/WORKFLOWS/workflows.png index df1bab6c..ad86ac70 100755 Binary files a/docs/img/WORKFLOWS/workflows.png and b/docs/img/WORKFLOWS/workflows.png differ diff --git a/front/css/app.css b/front/css/app.css index 68057e05..9558c7a1 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -1517,10 +1517,9 @@ input[readonly] { /* AdminLTE overrides */ #networkTree .box { - border-top:1px; + /* border-top:1px; */ border-top-color:grey; padding:0px; - padding-top:6px; margin:0px; align-items:center; border-radius:20px; @@ -1528,7 +1527,7 @@ input[readonly] { /* display:flex; */ flex-direction:column; justify-content:center; - display: inline-grid; + /* display: inline-grid; */ } .helpIcon { @@ -1577,17 +1576,16 @@ input[readonly] { width: auto; } + #networkTree .netCollapse { - display: block; position: absolute; - margin-left: 170px; - font-size: large; - left: -15px; + right: 0; + margin-right: -3px; } #networkTree .highlightedNode { - border: solid; + /* border: solid; */ border-color:cyan; } #networkTree .netStatus-Off-line i, @@ -1598,7 +1596,6 @@ input[readonly] { .spanNetworkTree { display: inline-block; - /* width: 135px; */ white-space: nowrap; overflow: hidden !important; text-overflow: ellipsis; @@ -1614,6 +1611,11 @@ input[readonly] { /* margin-left: 0.2em; */ } +.networkTable .networkNodeTabHeaders a { + display: block; + height: 3em; +} + .networkTable .icon { /* padding-left:2em; */ width:2em; @@ -1632,7 +1634,6 @@ input[readonly] { .networkNodeTabHeaders { - max-width: 200px; text-overflow: ellipsis; overflow: hidden; text-wrap: nowrap; @@ -1710,13 +1711,6 @@ input[readonly] { padding-top: 20px; } - -.login-page .login-custom -{ - width:480px; - -} - /*Hidden special button*/ @media (max-width: 365px) { @@ -1975,6 +1969,7 @@ input[readonly] { right: 0.1em; } + .workflows .remove-condition { z-index: 1; diff --git a/front/devices.php b/front/devices.php index 29b29ef8..a7b07aa7 100755 --- a/front/devices.php +++ b/front/devices.php @@ -74,10 +74,10 @@
-
+

-
+
diff --git a/front/index.php b/front/index.php index 291d3277..b9be1d13 100755 --- a/front/index.php +++ b/front/index.php @@ -92,10 +92,8 @@ if (isset ($_SESSION["login"]) == FALSE || $_SESSION["login"] != 1) - - - - + + @@ -112,7 +110,7 @@ switch ($UI_THEME) { ?> - + + ${collapseExpandHtml}`; }, mainAxisNodeSpacing: 'auto', - secondaryAxisNodeSpacing: 0.3, - nodeHeight: nodeHeight.toString(), + // secondaryAxisNodeSpacing: 0.3, + nodeHeight: nodeHeightPx, + nodeWidth: nodeWidthPx, marginTop: '5', isHorizontal : true, hasZoom: true, @@ -811,8 +831,8 @@ function initTree(myHierarchy) hasFlatData: false, relationnalField: "children", linkWidth: (nodeData) => 3, - linkColor: (nodeData) => "#ffcc80", - onNodeClick: (nodeData) => handleNodeClick(nodeData), + linkColor: (nodeData) => "#ffcc80" + // onNodeClick: (nodeData) => handleNodeClick(nodeData), }); console.log(deviceListGlobal); diff --git a/front/php/templates/footer.php b/front/php/templates/footer.php index a6402881..16169163 100755 --- a/front/php/templates/footer.php +++ b/front/php/templates/footer.php @@ -30,7 +30,7 @@
| | - | + | | | : | Version: diff --git a/front/php/templates/header.php b/front/php/templates/header.php index 889124d4..5305752a 100755 --- a/front/php/templates/header.php +++ b/front/php/templates/header.php @@ -59,10 +59,7 @@ - - - - + @@ -421,20 +418,15 @@ -
  • +
  • -
      +
      • -
        - -
        • -
      • -
      • @@ -443,6 +435,11 @@
      + +
    • + +
      • +
    • diff --git a/front/php/templates/language/ca_ca.json b/front/php/templates/language/ca_ca.json old mode 100644 new mode 100755 index 8cb3a069..41d95def --- a/front/php/templates/language/ca_ca.json +++ b/front/php/templates/language/ca_ca.json @@ -736,4 +736,4 @@ "settings_update_item_warning": "Actualitza el valor sota. Sigues curós de seguir el format anterior. No hi ha validació.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Deseu els canvis primer abans de comprovar la configuració." -} +} \ No newline at end of file diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json old mode 100644 new mode 100755 index 64a1746f..629a80a7 --- a/front/php/templates/language/de_de.json +++ b/front/php/templates/language/de_de.json @@ -817,4 +817,4 @@ "settings_update_item_warning": "", "test_event_icon": "", "test_event_tooltip": "Speichere die Änderungen, bevor Sie die Einstellungen testen." -} +} \ No newline at end of file diff --git a/front/php/templates/language/es_es.json b/front/php/templates/language/es_es.json old mode 100644 new mode 100755 index 6400db7b..490403d7 --- a/front/php/templates/language/es_es.json +++ b/front/php/templates/language/es_es.json @@ -815,4 +815,4 @@ "settings_update_item_warning": "Actualice el valor a continuación. Tenga cuidado de seguir el formato anterior. O la validación no se realiza.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Guarda tus cambios antes de probar nuevos ajustes." -} +} \ No newline at end of file diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json old mode 100644 new mode 100755 index 0942c30a..04b85df7 --- a/front/php/templates/language/fr_fr.json +++ b/front/php/templates/language/fr_fr.json @@ -736,4 +736,4 @@ "settings_update_item_warning": "Mettre à jour la valeur ci-dessous. Veillez à bien suivre le même format qu'auparavant. Il n'y a pas de pas de contrôle.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Enregistrer d'abord vos modifications avant de tester vôtre paramétrage." -} +} \ No newline at end of file diff --git a/front/php/templates/language/it_it.json b/front/php/templates/language/it_it.json old mode 100644 new mode 100755 index bc58d120..6545327d --- a/front/php/templates/language/it_it.json +++ b/front/php/templates/language/it_it.json @@ -736,4 +736,4 @@ "settings_update_item_warning": "Aggiorna il valore qui sotto. Fai attenzione a seguire il formato precedente. La convalida non viene eseguita.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Salva le modifiche prima di provare le nuove impostazioni." -} +} \ No newline at end of file diff --git a/front/php/templates/language/nb_no.json b/front/php/templates/language/nb_no.json old mode 100644 new mode 100755 index ca06c5ec..cd6b5940 --- a/front/php/templates/language/nb_no.json +++ b/front/php/templates/language/nb_no.json @@ -736,4 +736,4 @@ "settings_update_item_warning": "Oppdater verdien nedenfor. Pass på å følge forrige format. Validering etterpå utføres ikke.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Lagre endringene først, før du tester innstillingene dine." -} +} \ No newline at end of file diff --git a/front/php/templates/language/pl_pl.json b/front/php/templates/language/pl_pl.json old mode 100644 new mode 100755 index 7b48023f..3c3e1c21 --- a/front/php/templates/language/pl_pl.json +++ b/front/php/templates/language/pl_pl.json @@ -736,4 +736,4 @@ "settings_update_item_warning": "Zaktualizuj poniższą wartość. Zachowaj ostrożność i postępuj zgodnie z poprzednim formatem. Walidacja nie jest wykonywana.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Zapisz zmiany zanim będziesz testować swoje ustawienia." -} +} \ No newline at end of file diff --git a/front/php/templates/language/pt_br.json b/front/php/templates/language/pt_br.json old mode 100644 new mode 100755 diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json old mode 100644 new mode 100755 index a89b23bc..3910b2cb --- a/front/php/templates/language/ru_ru.json +++ b/front/php/templates/language/ru_ru.json @@ -736,4 +736,4 @@ "settings_update_item_warning": "Обновить значение ниже. Будьте осторожны, следуя предыдущему формату. Проверка не выполняется.", "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Сначала сохраните изменения, прежде чем проверять настройки." -} +} \ No newline at end of file diff --git a/front/php/templates/language/uk_ua.json b/front/php/templates/language/uk_ua.json old mode 100644 new mode 100755 index e4a41bc0..981ae743 --- a/front/php/templates/language/uk_ua.json +++ b/front/php/templates/language/uk_ua.json @@ -736,4 +736,4 @@ "settings_update_item_warning": "Оновіть значення нижче. Слідкуйте за попереднім форматом. Перевірка не виконана.", "test_event_icon": "fa-vial-circle- check", "test_event_tooltip": "Перш ніж перевіряти налаштування, збережіть зміни." -} +} \ No newline at end of file diff --git a/front/php/templates/language/zh_cn.json b/front/php/templates/language/zh_cn.json old mode 100644 new mode 100755 index c5bc6870..bd235f3f --- a/front/php/templates/language/zh_cn.json +++ b/front/php/templates/language/zh_cn.json @@ -736,4 +736,4 @@ "settings_update_item_warning": "更新下面的值。请注意遵循先前的格式。未执行验证。", "test_event_icon": "", "test_event_tooltip": "在测试设置之前，请先保存更改。" -} +} \ No newline at end of file diff --git a/front/workflowsCore.php b/front/workflowsCore.php index acdab582..2675fee9 100755 --- a/front/workflowsCore.php +++ b/front/workflowsCore.php @@ -11,19 +11,19 @@
    • -
    +
    -
    +
    -
    +
    @@ -108,6 +108,8 @@ function renderWorkflows() { // Generate UI for a single workflow function generateWorkflowUI(wf, wfIndex) { + let wfEnabled = (wf?.enabled ?? "No") == "Yes"; + let $wfContainer = $("
    ", { class: "workflow-card panel col-sm-12 col-sx-12", id: `wf-${wfIndex}-container` @@ -121,6 +123,11 @@ function generateWorkflowUI(wf, wfIndex) { } ) + let $wfEnabledIcon = $("", { + class: `alignRight fa-regular ${wfEnabled ? "fa-dot-circle" : "fa-circle" }` + }); + + let $wfHeaderLink = $("", { "class": "pointer ", @@ -137,7 +144,7 @@ function generateWorkflowUI(wf, wfIndex) { } ).text(wf.name) - $wfContainer.append($wfHeaderLink.append($wfLinkWrap.append($wfHeaderHeading))); + $wfContainer.append($wfHeaderLink.append($wfLinkWrap.append($wfHeaderHeading.append($wfEnabledIcon)))); // Collapsible panel start @@ -157,7 +164,7 @@ function generateWorkflowUI(wf, wfIndex) { `[${wfIndex}].enabled`, getString("WF_Enabled"), wfEnabledOptions, - wf?.enabled ?? "No", + wfEnabled ? "Yes" :"No", `wf-${wfIndex}-enabled` ); @@ -210,9 +217,10 @@ function generateWorkflowUI(wf, wfIndex) { class: "fa-solid fa-bolt bckg-icon-2-line" }); + $triggerSection.append($triggerIcon); $triggerSection.append($triggerTypeDropdown); $triggerSection.append($eventTypeDropdown); - $triggerSection.append($triggerIcon); + $wfCollapsiblePanel.append($triggerSection); // Conditions @@ -323,11 +331,13 @@ function generateWorkflowUI(wf, wfIndex) { $actionRemoveButtonWrap.append($actionRemoveButton); let $actionIcon = $("", { - class: `fa-solid fa-person-running fa-flip-horizontal bckg-icon-${numberOfLines}-line ` - }); + class: `fa-solid fa-person-running fa-flip-horizontal bckg-icon-${numberOfLines}-line ` + }); + + $actionEl.prepend($actionIcon) $actionElWrap.append($actionEl) - $actionElWrap.append($actionIcon) + $actionElWrap.append($actionRemoveButtonWrap) $actionsContainer.append($actionElWrap);