Merge pull request #3053 from SCADA-LTS/feature/#3036_point_name_in_p…

…oint_properties_page_has_a_limited_visible_length #3036 point name in point properties page has a limited visible length
SCADA-LTS · Nov 27, 2024 · 358f13c · 358f13c
2 parents bda0e41 + 696441c
commit 358f13c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/WebContent/WEB-INF/jsp/dataPointEdit.jsp b/WebContent/WEB-INF/jsp/dataPointEdit.jsp
@@ -69,14 +69,14 @@
     <input type="hidden" id="taskName" name="asdf" value=""/>
     <table width="100%" cellpadding="0" cellspacing="0">
       <tr>
-        <td valign="top">
+        <td valign="top" width="60%">
           <%@ 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" %>
         </td>
-        <td valign="top">
+        <td valign="top" width="40%">
           <%@ include file="/WEB-INF/jsp/pointEdit/eventDetectors.jsp" %>
         </td>
       </tr>

diff --git a/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp b/WebContent/WEB-INF/jsp/pointEdit/pointProperties.jsp
@@ -49,15 +49,17 @@
     <spring:bind path="form.name">
       <tr>
         <td class="formLabelRequired"><spring:message code="pointEdit.props.name"/></td>
-        <td class="formField"><input type="text" name="name" value="${status.value}"/></td>
+        <div>
+        <td class="formField"><input type="text" class="formLongFieldSizing" name="name" value="<c:out value="${status.value}"/>" title="<c:out value="${status.value}"/>"/></td>
+        </div>
         <c:if test="${error.name != null}"><td class="formError"><spring:message code="${error.name}"/></td></c:if>
       </tr>
     </spring:bind>
 
     <spring:bind path="form.description">
       <tr>
         <td class="formLabelRequired"><spring:message code="pointEdit.props.description"/></td>
-        <td class="formField"><input type="text" class="formLong" name="description" value="${status.value}"/></td>
+        <td class="formField"><input type="text" class="formLong" name="description" value="<c:out value="${status.value}"/>"/></td>
         <c:if test="${error.description != null}"><td class="formError"><spring:message code="${error.description}"/></td></c:if>
       </tr>
     </spring:bind>

diff --git a/WebContent/assets/layout.css b/WebContent/assets/layout.css
@@ -142,6 +142,11 @@ a.rowHeaderLink, a.rowHeaderLink:visited, a.rowHeaderLink:link, a.rowHeaderLink:
 .formLong {
 	width: 250px;
 }
+.formLongFieldSizing {
+	min-width: 250px;
+	max-width: 650px;
+    field-sizing: content;
+}
 input[type="submit"], input[type="button"] {
 	overflow: visible;
 }