From e5c50109162761bbe699c20ef2b74edafecb6554 Mon Sep 17 00:00:00 2001 From: Patrykb0802 Date: Wed, 20 Nov 2024 18:21:56 +0100 Subject: [PATCH 1/4] #3036 point name in point properties page has a limited visible length Added style parameter to point name in point properties view --- WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp b/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp index cd11b1f9d..f67d2b342 100644 --- a/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp +++ b/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp @@ -49,7 +49,7 @@ - + From b71834d8294701be839c76fb5db8433348fea39e Mon Sep 17 00:00:00 2001 From: Patrykb0802 Date: Mon, 25 Nov 2024 18:50:30 +0100 Subject: [PATCH 2/4] #3036 point name in point properties page has a limited visible length --- .../WEB-INF/jsp/pointEdit/pointProperties.jsp | 29 ++++++++++++++++++- WebContent/assets/layout.css | 12 ++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp b/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp index f67d2b342..a2e6fabd3 100644 --- a/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp +++ b/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp @@ -24,6 +24,30 @@ if (dataTypeId == <%= DataTypes.NUMERIC %>) show("engineeringUnitsSection"); }); + + document.addEventListener('DOMContentLoaded', () => { + const inputs = document.querySelectorAll('.formLong'); + const tooltip = document.getElementById('tooltip'); + + inputs.forEach(input => { + input.addEventListener('mouseover', (event) => { + const tooltipText = event.target.getAttribute('data-tooltip'); + if (tooltipText) { + tooltip.textContent = tooltipText; + tooltip.style.display = 'block'; + } + }); + + input.addEventListener('mousemove', (event) => { + tooltip.style.left = event.pageX + 10 + 'px'; + tooltip.style.top = event.pageY + 10 + 'px'; + }); + + input.addEventListener('mouseout', () => { + tooltip.style.display = 'none'; + }); + }); + });
@@ -49,7 +73,10 @@ - +
+ " value=""/> +
+
diff --git a/WebContent/assets/layout.css b/WebContent/assets/layout.css index 986caa7a2..828095ab3 100644 --- a/WebContent/assets/layout.css +++ b/WebContent/assets/layout.css @@ -439,4 +439,16 @@ textarea#cssEditor { #viewContent input[type='button'] { text-align: center; vertical-align: middle; +} +.tooltip { + position: absolute; + background: #333; + color: #fff; + padding: 5px 10px; + border-radius: 4px; + font-size: 14px; + white-space: nowrap; + display: none; + pointer-events: none; + z-index: 1000; } \ No newline at end of file From f5d65283f0e310fc1b87639b0d28719242265ed7 Mon Sep 17 00:00:00 2001 From: Kamil Jarmusik Date: Tue, 26 Nov 2024 15:48:23 +0100 Subject: [PATCH 3/4] #3036 point name in point properties page has a limited visible length: - Created css class formLongFieldSizing; - Added attribute title and css class formLongFieldSizing in pointProperties.jsp for name fields; - Set width 60%/40% in dataPointEdit.jsp; - Use c:out in pointProperties.jsp for name and description fields; --- WebContent/WEB-INF/jsp/dataPointEdit.jsp | 4 +-- .../WEB-INF/jsp/pointEdit/pointProperties.jsp | 29 ++----------------- WebContent/assets/layout.css | 16 +++------- 3 files changed, 8 insertions(+), 41 deletions(-) diff --git a/WebContent/WEB-INF/jsp/dataPointEdit.jsp b/WebContent/WEB-INF/jsp/dataPointEdit.jsp index d346185df..3075c6eeb 100644 --- a/WebContent/WEB-INF/jsp/dataPointEdit.jsp +++ b/WebContent/WEB-INF/jsp/dataPointEdit.jsp @@ -69,14 +69,14 @@ - - diff --git a/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp b/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp index a2e6fabd3..565115eb5 100644 --- a/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp +++ b/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp @@ -24,30 +24,6 @@ if (dataTypeId == <%= DataTypes.NUMERIC %>) show("engineeringUnitsSection"); }); - - document.addEventListener('DOMContentLoaded', () => { - const inputs = document.querySelectorAll('.formLong'); - const tooltip = document.getElementById('tooltip'); - - inputs.forEach(input => { - input.addEventListener('mouseover', (event) => { - const tooltipText = event.target.getAttribute('data-tooltip'); - if (tooltipText) { - tooltip.textContent = tooltipText; - tooltip.style.display = 'block'; - } - }); - - input.addEventListener('mousemove', (event) => { - tooltip.style.left = event.pageX + 10 + 'px'; - tooltip.style.top = event.pageY + 10 + 'px'; - }); - - input.addEventListener('mouseout', () => { - tooltip.style.display = 'none'; - }); - }); - });
@@ -74,9 +50,8 @@
-
+ -
@@ -84,7 +59,7 @@ - + diff --git a/WebContent/assets/layout.css b/WebContent/assets/layout.css index 828095ab3..c25239425 100644 --- a/WebContent/assets/layout.css +++ b/WebContent/assets/layout.css @@ -142,6 +142,10 @@ a.rowHeaderLink, a.rowHeaderLink:visited, a.rowHeaderLink:link, a.rowHeaderLink: .formLong { width: 250px; } +.formLongFieldSizing { + min-width: 250px; + field-sizing: content; +} input[type="submit"], input[type="button"] { overflow: visible; } @@ -439,16 +443,4 @@ textarea#cssEditor { #viewContent input[type='button'] { text-align: center; vertical-align: middle; -} -.tooltip { - position: absolute; - background: #333; - color: #fff; - padding: 5px 10px; - border-radius: 4px; - font-size: 14px; - white-space: nowrap; - display: none; - pointer-events: none; - z-index: 1000; } \ No newline at end of file From 696441ce38675ad3fbadb78166402972fdd8a157 Mon Sep 17 00:00:00 2001 From: Kamil Jarmusik Date: Tue, 26 Nov 2024 15:58:54 +0100 Subject: [PATCH 4/4] #3036 point name in point properties page has a limited visible length: - Set max-width is 650px --- WebContent/assets/layout.css | 1 + 1 file changed, 1 insertion(+) diff --git a/WebContent/assets/layout.css b/WebContent/assets/layout.css index c25239425..905f93ca2 100644 --- a/WebContent/assets/layout.css +++ b/WebContent/assets/layout.css @@ -144,6 +144,7 @@ a.rowHeaderLink, a.rowHeaderLink:visited, a.rowHeaderLink:link, a.rowHeaderLink: } .formLongFieldSizing { min-width: 250px; + max-width: 650px; field-sizing: content; } input[type="submit"], input[type="button"] {
+ <%@ include file="/WEB-INF/jsp/pointEdit/pointProperties.jsp" %> <%@ include file="/WEB-INF/jsp/pointEdit/loggingProperties.jsp" %> <%@ include file="/WEB-INF/jsp/pointEdit/eventTextRenderer.jsp"%> <%@ include file="/WEB-INF/jsp/pointEdit/textRenderer.jsp" %> <%@ include file="/WEB-INF/jsp/pointEdit/chartRenderer.jsp" %> + <%@ include file="/WEB-INF/jsp/pointEdit/eventDetectors.jsp" %>
" value=""/>" title=""/>
"/>