Index: src/main/webapp/WEB-INF/views/html/dataset/responsibleParty/addResponsiblePartyForm.jsp IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/views/html/dataset/responsibleParty/addResponsiblePartyForm.jsp (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/webapp/WEB-INF/views/html/dataset/responsibleParty/addResponsiblePartyForm.jsp (date 1563482475417) @@ -7,7 +7,7 @@ -
+
${dataset.title}
@@ -39,15 +39,9 @@
-
- - - - Individual and/or Organization name are required.
-
-
+ + +
Format: First_name (optional) Middle_initial. Last_name
Examples: @@ -58,24 +52,9 @@
-
- - - - Organization and/or Individual name are required.
-
-
- -
- - -
- + + Index: src/main/webapp/WEB-INF/views/html/group/addRegistrationGroupForm.jsp IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/views/html/group/addRegistrationGroupForm.jsp (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/webapp/WEB-INF/views/html/group/addRegistrationGroupForm.jsp (date 1563479175199) @@ -20,25 +20,13 @@ -
- - -
+ + -
- - -
+ -
- - + +
Index: src/main/webapp/WEB-INF/tags/browse/input-row.tag IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/tags/browse/input-row.tag (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/webapp/WEB-INF/tags/browse/input-row.tag (date 1563478433261) @@ -18,5 +18,6 @@ ${fieldExample }
+ Index: src/main/webapp/WEB-INF/tags/common/form-errors.tag IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/tags/common/form-errors.tag (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/webapp/WEB-INF/tags/common/form-errors.tag (date 1563478433261) @@ -11,7 +11,7 @@
    -
  • +
Index: src/main/webapp/WEB-INF/tags/input/textfield.tag IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/tags/input/textfield.tag (date 1563478433263) +++ src/main/webapp/WEB-INF/tags/input/textfield.tag (date 1563478433263) @@ -0,0 +1,10 @@ +<%@ include file="/WEB-INF/views/html/common/include.jsp" %> +<%@ attribute name="fieldName" required="true" type="java.lang.String" %> +<%@ attribute name="fieldPath" required="true" type="java.lang.String" %> +<%@ attribute name="fieldExample" required="false" type="java.lang.String" %> +<%@ attribute name="fieldHelp" required="false" type="java.lang.String" %> +<%@ attribute name="isRequired" required="false" type="java.lang.Boolean" %> + descriptive_row_table_bottom_row">
class="required">${fieldName}:
+ +
${fieldHelp}${fieldExample }
+
Index: src/main/webapp/WEB-INF/views/html/dataset/responsibleParty/editResponsiblePartyForm.jsp IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/views/html/dataset/responsibleParty/editResponsiblePartyForm.jsp (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/webapp/WEB-INF/views/html/dataset/responsibleParty/editResponsiblePartyForm.jsp (date 1563482524642) @@ -39,14 +39,11 @@ + + + +
- - - - Individual and/or Organization name are required.
-
Format: first_name (optional) middle_initial. last_name
Examples: @@ -57,22 +54,9 @@
-
- - - - Organization and/or Individual name are required.
-
-
- -
- - -
+ + + @@ -84,8 +68,6 @@ - -
<%-- body --%> Index: src/main/webapp/WEB-INF/tags/input/textarea.tag IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/tags/input/textarea.tag (date 1563478433263) +++ src/main/webapp/WEB-INF/tags/input/textarea.tag (date 1563478433263) @@ -0,0 +1,12 @@ +<%@ include file="/WEB-INF/views/html/common/include.jsp" %> +<%@ attribute name="fieldName" required="true" type="java.lang.String" %> +<%@ attribute name="fieldPath" required="true" type="java.lang.String" %> +<%@ attribute name="fieldExample" required="false" type="java.lang.String" %> +<%@ attribute name="fieldHelp" required="false" type="java.lang.String" %> +<%@ attribute name="isRequired" required="false" type="java.lang.Boolean" %> +
class="required">${fieldName}:
+ descriptive_row_table_bottom_row">
+ + +
${fieldHelp}${fieldExample }
+
Index: src/main/webapp/WEB-INF/tags/input/option.tag IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/tags/input/option.tag (date 1563478433262) +++ src/main/webapp/WEB-INF/tags/input/option.tag (date 1563478433262) @@ -0,0 +1,12 @@ +<%@ include file="/WEB-INF/views/html/common/include.jsp" %> +<%@ attribute name="fieldName" required="true" type="java.lang.String" %> +<%@ attribute name="fieldPath" required="true" type="java.lang.String" %> +<%@ attribute name="fieldItems" required="true" type="java.util.Collection" %> +<%@ attribute name="fieldItemLabel" required="true" type="java.lang.String" %> +<%@ attribute name="fieldExample" required="false" type="java.lang.String" %> +<%@ attribute name="fieldHelp" required="false" type="java.lang.String" %> +<%@ attribute name="isRequired" required="false" type="java.lang.Boolean" %> + descriptive_row_table_bottom_row">
class="required">${fieldName}:
+ +
${fieldHelp}${fieldExample }
+
Index: src/main/webapp/WEB-INF/views/html/repo/dataset/edit-dataset.jsp IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/views/html/repo/dataset/edit-dataset.jsp (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/webapp/WEB-INF/views/html/repo/dataset/edit-dataset.jsp (date 1563481081431) @@ -9,6 +9,8 @@ + <%-- --%> +
@@ -20,12 +22,8 @@ -
- - -
+ + @@ -51,97 +49,53 @@ itemLabel="displayText" itemValue="identifier" multiple="true" size="10" data-placeholder="Select Science Keywords" id="scienceKeywords" class="selectize-select form-control"/> - -
+
+
-
- - -
Format: YYYY-MM-DD, YYYY-MM-DD HH:MI:SS, or YYYY-MM-DD HH:MI:SS.SSS
-
+ -
- - -
Format: YYYY-MM-DD, YYYY-MM-DD HH:MI:SS, or YYYY-MM-DD HH:MI:SS.SSS
-
+
-
+ <%-- Note: The errorCode is the name of the Validation annotation --%> + +
-
- - -
Range: [-90, +90]
-
+ + +
-
- - -
Range: [-90, +90]
-
-
+ + +
+ - -
-
- - -
Range: [-180, +180]
-
+
-
- - -
Range: [-180, +180]
-
+
- -
- -
-
-
- - -
Number (E.g., 3 or 3.54)
-
-
-
-
- - -
Units (E.g., Meters Per Second)
-
-
-
+
+ + + + + + +

Index: src/main/webapp/WEB-INF/views/html/ac/root/editAccountSummary.jsp IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/views/html/ac/root/editAccountSummary.jsp (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/webapp/WEB-INF/views/html/ac/root/editAccountSummary.jsp (date 1563482097051) @@ -23,16 +23,18 @@

Required fields are marked with an asterisk *

-
" method="POST" > - + + + +
-

${command.userName}

+

${userName}

@@ -41,7 +43,7 @@ Status
-

${command.status}

+

${status}

@@ -50,33 +52,20 @@ OpenId
-

${command.openId}

+

${openId}

-
- - -
-
- - -
+ -
- - -
+ + + - + +
Index: src/main/webapp/WEB-INF/views/html/common/include.jsp IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/views/html/common/include.jsp (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/webapp/WEB-INF/views/html/common/include.jsp (date 1563478433264) @@ -12,4 +12,5 @@ <%@taglib prefix="narccapProject" tagdir="/WEB-INF/tags/narccapProject" %> <%@taglib prefix="common" tagdir="/WEB-INF/tags/common" %> <%@taglib prefix="gateway" uri="gateway_tags" %> -<%@taglib prefix="togglz" uri="http://togglz.org/taglib" %> \ No newline at end of file +<%@taglib prefix="togglz" uri="http://togglz.org/taglib" %> +<%@taglib prefix="input" tagdir="/WEB-INF/tags/input" %> Index: src/main/webapp/WEB-INF/tags/common/object-form-error.tag IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/tags/common/object-form-error.tag (date 1563478433262) +++ src/main/webapp/WEB-INF/tags/common/object-form-error.tag (date 1563478433262) @@ -0,0 +1,15 @@ +<%@tag body-content="empty" %> +<%@ include file="/WEB-INF/views/html/common/include.jsp" %> + +<%@ attribute name="modelAttribute" required="true" type="java.lang.String" %> +<%@ attribute name="errorCode" required="true" type="java.lang.String" %> + + + + +
+ +
+
+
+
Index: src/main/webapp/WEB-INF/views/html/ac/user/changeUserAccountInfoForm.jsp IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/views/html/ac/user/changeUserAccountInfoForm.jsp (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/webapp/WEB-INF/views/html/ac/user/changeUserAccountInfoForm.jsp (date 1563479386100) @@ -19,26 +19,11 @@ -
- - -
+ -
- - -
+ -
- - -
+
Index: src/main/java/sgf/gateway/web/controllers/dataset/command/DatasetCommand.java IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/java/sgf/gateway/web/controllers/dataset/command/DatasetCommand.java (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/java/sgf/gateway/web/controllers/dataset/command/DatasetCommand.java (date 1563478433259) @@ -30,14 +30,14 @@ private String identifier; - @NotBlank(groups = Required.class, message = "Title is required") + @NotBlank(groups = Required.class, message = "Title is required.") private String title; @NotBlank(groups = Required.class, message = "Short Name is required.") @ShortNameCharacters(groups = Data.class, message = "Short Name may only contain the letters a-z, A-Z, numbers, and the characters: $ - _ . ! * ' ( ) ,") private String shortName; - @NotBlank(groups = Required.class, message = "Description is required") + @NotBlank(groups = Required.class, message = "Description is required.") private String description; private String doiString; Index: src/main/webapp/WEB-INF/tags/browse/input-textarea.tag IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/WEB-INF/tags/browse/input-textarea.tag (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/webapp/WEB-INF/tags/browse/input-textarea.tag (date 1563478433261) @@ -23,4 +23,5 @@ ${fieldExample } + \ No newline at end of file Index: src/main/webapp/themes/repo/style.css IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- src/main/webapp/themes/repo/style.css (revision d4f45063a1c3f7e1afbe04bc78b66b61cefdd879) +++ src/main/webapp/themes/repo/style.css (date 1563478433281) @@ -464,4 +464,14 @@ .radio { padding-bottom: 5px; padding-top: 5px; -} \ No newline at end of file +} + +.form_error:before { + font-family: FontAwesome; + content: "\f071\00a0"; +} + +.form_error { + color: #ff4100; + } +