From 15214949becfeca16da948351bc45f45dad6d6fb Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Mon, 6 Dec 2021 22:13:16 -0500 Subject: [PATCH 1/4] Adjust text for Error 0 Error 0 was previously: "URL not well formed" But actually , this wasn't the exact reason why an error 0 can be returned. Error 0 means that no server are reachable to even respond. So I have replaced it by "Server not found". --- scripts/system/create/modules/brokenURLReport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/create/modules/brokenURLReport.js b/scripts/system/create/modules/brokenURLReport.js index c3a6eba8cd..c04612bb27 100644 --- a/scripts/system/create/modules/brokenURLReport.js +++ b/scripts/system/create/modules/brokenURLReport.js @@ -31,7 +31,7 @@ function brokenURLReportRequestUrlValidityCheck(no) { function brokenURLReportGetResponseStatus() { if (brokenURLReportHttpRequest.status === 0 || brokenURLReportHttpRequest.status > 299) { if (brokenURLReportHttpRequest.status === 0) { - brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = "0 - URL not well-formed"; + brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = "0 - Server not found"; } else { brokenURLReportUrlList[brokenURLReportProcessedUrlNo].validity = brokenURLReportHttpRequest.status + " - " + brokenURLReportHttpRequest.statusText; } From 005869f414874d61d2e0d8870d951a02ca4e1f91 Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Mon, 6 Dec 2021 23:05:33 -0500 Subject: [PATCH 2/4] Css for Add All Zones button Complementary CSS for the "Add All Zones" button. --- scripts/system/html/css/edit-style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/system/html/css/edit-style.css b/scripts/system/html/css/edit-style.css index d912cd5d4c..62c58a5676 100644 --- a/scripts/system/html/css/edit-style.css +++ b/scripts/system/html/css/edit-style.css @@ -2029,6 +2029,10 @@ div.zoneSelectListFooter { text-align: right; } +.forceAlignRight { + float: right; +} + #menuBackgroundOverlay{ background-color:transparent; position:fixed; From 43bf840b943f17d68472ceeef01b4a040f3ed9a2 Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Mon, 6 Dec 2021 23:11:30 -0500 Subject: [PATCH 3/4] "Add All Zones" button This adds a "Add All Zones" button to the multiple zones selector used for RenderWithZones. This addresses the Issue # 775 --- .../html/js/entityProperties.js | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js index 5a20ae6f20..bb38e10a82 100644 --- a/scripts/system/create/entityProperties/html/js/entityProperties.js +++ b/scripts/system/create/entityProperties/html/js/entityProperties.js @@ -3722,6 +3722,25 @@ function addZoneToZonesSelection(propertyId, id) { document.getElementById("zones-select-selector-list-panel-" + propertyId).style.display = "none"; } +function addAllZonesToZonesSelection (propertyId) { + let hiddenField = document.getElementById(propertyId); + if (JSON.stringify(hiddenField.value) === '"undefined"') { + hiddenField.value = "[]"; + } + let selectedZones = JSON.parse(hiddenField.value); + let i; + for (i = 0; i < zonesList.length; i++) { + if (!selectedZones.includes(zonesList[i].id)) { + selectedZones.push(zonesList[i].id); + } + } + hiddenField.value = JSON.stringify(selectedZones); + displaySelectedZones(propertyId, true); + let propertyName = propertyId.replace("property-", ""); + updateProperty(propertyName, selectedZones, false); + document.getElementById("zones-select-selector-list-panel-" + propertyId).style.display = "none"; +} + function removeZoneFromZonesSelection(propertyId, zoneId) { let hiddenField = document.getElementById(propertyId); if (JSON.stringify(hiddenField.value) === '"undefined"') { @@ -3813,7 +3832,10 @@ function setZonesSelectionData(element, isEditable) { zoneSelector += ""; zoneSelector += "
"; - zoneSelector += "
Select the Zone to add:
"; + zoneSelector += "
Select the Zone to add:"; + zoneSelector += ""; + zoneSelector += "
"; zoneSelector += "
"; let i, name; for (i = 0; i < zonesList.length; i++) { From 13897a38644bc4fb0f635eadf8a0cac04d2b231b Mon Sep 17 00:00:00 2001 From: Alezia Kurdis <60075796+AleziaKurdis@users.noreply.github.com> Date: Tue, 7 Dec 2021 21:34:04 -0500 Subject: [PATCH 4/4] Reduce redundant code. Reduce redundant code. --- .../html/js/entityProperties.js | 33 +++++++------------ 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/scripts/system/create/entityProperties/html/js/entityProperties.js b/scripts/system/create/entityProperties/html/js/entityProperties.js index bb38e10a82..85c7b378da 100644 --- a/scripts/system/create/entityProperties/html/js/entityProperties.js +++ b/scripts/system/create/entityProperties/html/js/entityProperties.js @@ -3712,33 +3712,22 @@ function addZoneToZonesSelection(propertyId, id) { hiddenField.value = "[]"; } let selectedZones = JSON.parse(hiddenField.value); - if (!selectedZones.includes(id)) { - selectedZones.push(id); - } - hiddenField.value = JSON.stringify(selectedZones); - displaySelectedZones(propertyId, true); - let propertyName = propertyId.replace("property-", ""); - updateProperty(propertyName, selectedZones, false); - document.getElementById("zones-select-selector-list-panel-" + propertyId).style.display = "none"; -} - -function addAllZonesToZonesSelection (propertyId) { - let hiddenField = document.getElementById(propertyId); - if (JSON.stringify(hiddenField.value) === '"undefined"') { - hiddenField.value = "[]"; - } - let selectedZones = JSON.parse(hiddenField.value); - let i; - for (i = 0; i < zonesList.length; i++) { - if (!selectedZones.includes(zonesList[i].id)) { - selectedZones.push(zonesList[i].id); + if (id === "ALL") { + for (let i = 0; i < zonesList.length; i++) { + if (!selectedZones.includes(zonesList[i].id)) { + selectedZones.push(zonesList[i].id); + } + } + } else { + if (!selectedZones.includes(id)) { + selectedZones.push(id); } } hiddenField.value = JSON.stringify(selectedZones); displaySelectedZones(propertyId, true); let propertyName = propertyId.replace("property-", ""); updateProperty(propertyName, selectedZones, false); - document.getElementById("zones-select-selector-list-panel-" + propertyId).style.display = "none"; + document.getElementById("zones-select-selector-list-panel-" + propertyId).style.display = "none"; } function removeZoneFromZonesSelection(propertyId, zoneId) { @@ -3834,7 +3823,7 @@ function setZonesSelectionData(element, isEditable) { zoneSelector += "
"; zoneSelector += "
Select the Zone to add:"; zoneSelector += ""; + zoneSelector += "onClick='addZoneToZonesSelection(" + '"' + element.id + '", "ALL"' + ");'>"; zoneSelector += "
"; zoneSelector += "
"; let i, name;