diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Experiment.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Experiment.java
index 0285c5d6fe72d61e958f724754326aab135e4008..2ede628235efec9da8b6c11ec55a8ef0c9f1b954 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Experiment.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/Experiment.java
@@ -118,12 +118,6 @@ public class Experiment extends CloneableEntity
this.startDate = startDate;
}
-// public void setStartDate(String startDate) {
-// Date sDate = new Date();
-//
-// setStartDate(sDate);
-// }
-
public Date getEndDate() {
return endDate;
}
@@ -132,12 +126,6 @@ public class Experiment extends CloneableEntity
this.endDate = endDate;
}
-// public void setEndDate(String endDate) {
-// Date eDate = new Date();
-//
-// setEndDate(eDate);
-// }
-
@XmlTransient
public List<DataFolder> getDataFolderList() {
return dataFolderList;
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml
index 7bb29ad0e6efc8133d419553c626130a3fdc4c4c..06aa0dacfe227e041776b798df1cdb60306b6e79 100644
--- a/src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml
@@ -9,11 +9,10 @@
<c:set var="experimentObject" value="#{experimentController.selected}"/>
- <p:panelGrid columns="3" styleClass="createEntityDetails">
+ <p:panelGrid columns="2" styleClass="createEntityDetails">
<h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="name" value="#{experimentObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
- <p:message for="name"/>
<h:outputLabel for="experimentType" value="Experiment Type" styleClass="entityDataLabel"/>
<p:selectOneMenu id="experimentType" value="#{experimentObject.experimentType}" styleClass="entityDataText">
@@ -23,19 +22,15 @@
itemValue="#{n}"
itemLabel="#{n.name}"/>
</p:selectOneMenu>
- <p:message for="experimentType"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
- <h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>
- <p:message for="description"/>
+ <h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>
<h:outputLabel for="startDate" value="Start Date" styleClass="entityDataLabel"/>
<p:calendar id="startDate" value="#{experimentObject.startDate}" />
- <p:message for="startDate"/>
<h:outputLabel for="endDate" value="End Date" styleClass="entityDataLabel"/>
<p:calendar id="endDate" value="#{experimentObject.endDate}" />
- <p:message for="endDate"/>
</p:panelGrid>
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/experiment/experimentDestroyDialog.xhtml
index 1f8af3d4e1cd827496f65361a74708270105f206..d8272096572de02952cce45ce0607d79f0df1add 100644
--- a/src/java/DmWebPortal/web/views/experiment/experimentDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/experimentDestroyDialog.xhtml
@@ -4,8 +4,8 @@
xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- <p:confirmDialog id="experimentDestroyDialog" message="Destroy experiment #{experimentController.getCurrentEntityInstanceName()}?"
- header="Destroy Experiment" severity="alert" widgetVar="experimentDestroyDialogWidget"
+ <p:confirmDialog id="experimentDestroyDialog" message="Delete experiment #{experimentController.getCurrentEntityInstanceName()}?"
+ header="Delete Experiment" severity="alert" widgetVar="experimentDestroyDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="experimentDestroyDialogWidget.hide()" action="#{experimentController.destroy()}"/>
<p:commandButton value="No" onclick="PF('experimentDestroyDialogWidget').hide()" type="button" />
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml
index 7163ffcdb2f2e681fd60a7b3db9780217b517d9e..24ec5340af08281e8d4780d445e3b3616b72713d 100644
--- a/src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml
@@ -10,15 +10,13 @@
<c:set var="experimentObject" value="#{experimentController.selected}"/>
<c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
- <p:panelGrid columns="3" styleClass="editEntityDetails">
+ <p:panelGrid columns="2" styleClass="editEntityDetails">
<h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="name" value="#{experimentObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
- <p:message for="name"/>
<h:outputLabel for="id" value="Id" styleClass="entityDataLabel"/>
<h:outputText id="id" value="#{experimentObject.id}" title="Id" styleClass="entityDataText"/>
- <p:message for="id"/>
<h:outputLabel for="experimentType" value="Experiment Type" styleClass="entityDataLabel"/>
<p:selectOneMenu id="experimentType" value="#{experimentObject.experimentType}" styleClass="entityDataText">
@@ -28,19 +26,15 @@
itemValue="#{n}"
itemLabel="#{n.name}"/>
</p:selectOneMenu>
- <p:message for="experimentType"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
- <h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>
- <p:message for="description"/>
+ <h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>
<h:outputLabel for="startDate" value="Start Date" styleClass="entityDataLabel"/>
<p:calendar id="startDate" value="#{experimentObject.startDate}" />
- <p:message for="startDate"/>
<h:outputLabel for="endDate" value="End Date" styleClass="entityDataLabel"/>
<p:calendar id="endDate" value="#{experimentObject.endDate}" />
- <p:message for="endDate"/>
</p:panelGrid>
</ui:composition>
diff --git a/src/java/DmWebPortal/web/views/experiment/experimentListDataTable.xhtml b/src/java/DmWebPortal/web/views/experiment/experimentListDataTable.xhtml
index 940327f31ff431e0939817e94039f871b52af84a..fafd0ef0a0a7ccadf5957a9c379d6de255c01562 100644
--- a/src/java/DmWebPortal/web/views/experiment/experimentListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/experimentListDataTable.xhtml
@@ -28,7 +28,7 @@
</p:column>
<p:column sortBy="#{experimentObject.experimentType.name}" headerText="Type"
- filterBy="#{experimentObject.experimentType.name}" filterMatchMode="contains" width="120">
+ filterBy="#{experimentObject.experimentType.name}" filterMatchMode="exact" width="120">
<h:outputText value="#{experimentObject.experimentType.name}"/>
</p:column>
diff --git a/src/java/DmWebPortal/web/views/experiment/view.xhtml b/src/java/DmWebPortal/web/views/experiment/view.xhtml
index b521d96c258d025a7e2f14b258f13c6e025a675c..c6fb37081892d5ce022429762f18f1a5db9c4023 100644
--- a/src/java/DmWebPortal/web/views/experiment/view.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/view.xhtml
@@ -32,6 +32,8 @@
<ui:include src="experimentDestroyDialog.xhtml"/>
</div>
+
+
</h:form>
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/experimentType/experimentTypeCreatePanelGrid.xhtml
index f51940fedf627b25a423f9ce1f7a5bfe5cda4f37..b543b34a2f141fea7884ee07908923885e3a5fb0 100644
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeCreatePanelGrid.xhtml
@@ -8,19 +8,16 @@
<c:set var="experimentTypeObject" value="#{experimentTypeController.selected}"/>
- <p:panelGrid columns="3" styleClass="createEntityDetails">
+ <p:panelGrid columns="2" styleClass="createEntityDetails">
<h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
- <h:inputText id="name" value="#{experimentTypeObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
- <p:message for="name"/>
+ <h:inputText id="name" value="#{experimentTypeObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
- <h:inputText id="description" value="#{experimentTypeObject.description}" title="Description" styleClass="entityDataText"/>
- <p:message for="description"/>
+ <h:inputText id="description" value="#{experimentTypeObject.description}" title="Description" styleClass="entityDataText"/>
<h:outputLabel for="rootDataPath" value="Root Data Path" styleClass="entityDataLabel"/>
<h:inputText id="rootDataPath" value="#{experimentTypeObject.rootDataPath}" title="Root Data Path" styleClass="entityDataText"/>
- <p:message for="rootDataPath"/>
</p:panelGrid>
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
index 50572560f20b5993e6ca56b04a14be7184dae795..11cd4b8f8d02243150ad3f2b6133c8b57f9eefff 100644
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
@@ -4,8 +4,8 @@
xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- <p:confirmDialog id="experimentTypeDestroyDialog" message="Destroy experiment type #{experimentTypeController.getCurrentEntityInstanceName()}?"
- header="Destroy Experiment Type" severity="alert" widgetVar="experimentTypeDestroyDialogWidget"
+ <p:confirmDialog id="experimentTypeDestroyDialog" message="Delete experiment type #{experimentTypeController.getCurrentEntityInstanceName()}?"
+ header="Delete Experiment Type" severity="alert" widgetVar="experimentTypeDestroyDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="experimentTypeDestroyDialogWidget.hide()" action="#{experimentTypeController.destroy()}"/>
<p:commandButton value="No" onclick="PF('experimentTypeDestroyDialogWidget').hide()" type="button" />
diff --git a/src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml
index 451a52760be398cb77f6cb1fbdbcb19eed31f131..d7a00dc095aec0c2fb8097cf102d3abf05d2ea34 100644
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml
@@ -9,23 +9,19 @@
<c:set var="experimentTypeObject" value="#{experimentTypeController.selected}"/>
<c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
- <p:panelGrid columns="3" styleClass="editEntityDetails">
+ <p:panelGrid columns="2" styleClass="editEntityDetails">
<h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
- <h:inputText id="name" value="#{experimentTypeObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
- <p:message for="name"/>
+ <h:inputText id="name" value="#{experimentTypeObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
<h:outputLabel for="id" value="Id" styleClass="entityDataLabel"/>
<h:outputText id="id" value="#{experimentTypeObject.id}" title="Id" styleClass="entityDataText"/>
- <p:message for="id"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
- <h:inputText id="description" value="#{experimentTypeObject.description}" title="Description" styleClass="entityDataText"/>
- <p:message for="description"/>
+ <h:inputText id="description" value="#{experimentTypeObject.description}" title="Description" styleClass="entityDataText"/>
<h:outputLabel for="rootDataPath" value="Root Data Path" styleClass="entityDataLabel"/>
<h:inputText id="rootDataPath" value="#{experimentTypeObject.rootDataPath}" title="Root Data Path" styleClass="entityDataText"/>
- <p:message for="rootDataPath"/>
</p:panelGrid>
</ui:composition>
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
index 5da178680272ceed9a857d0e1adef66f572f917b..98e43f02e8f935fb79e75e274fb0efe015238a35 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeCreatePanelGrid.xhtml
@@ -8,15 +8,13 @@
<c:set var="roleTypeObject" value="#{roleTypeController.selected}"/>
- <p:panelGrid columns="3" styleClass="createEntityDetails">
+ <p:panelGrid columns="2" styleClass="createEntityDetails">
<h:outputLabel for="name" value="Role Name" styleClass="entityDataEmphasizedLabel"/>
- <h:inputText id="name" value="#{roleTypeObject.name}" title="Role Name" required="true" styleClass="entityDataEmphasizedText"/>
- <p:message for="name"/>
+ <h:inputText id="name" value="#{roleTypeObject.name}" title="Role Name" required="true" styleClass="entityDataEmphasizedText"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
- <h:inputText id="description" value="#{roleTypeObject.description}" title="Description" styleClass="entityDataText"/>
- <p:message for="description"/>
+ <h:inputText id="description" value="#{roleTypeObject.description}" title="Description" styleClass="entityDataText"/>
</p:panelGrid>
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml
index 88cc199ae6312f65d23f637dd261f2a03d379a06..9bb96e2b03a8c336760916b6a4b24c0ed018baa5 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeDestroyDialog.xhtml
@@ -4,8 +4,8 @@
xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- <p:confirmDialog id="roleTypeDestroyDialog" message="Destroy role #{roleTypeController.getCurrentEntityInstanceName()}?"
- header="Destroy RoleType" severity="alert" widgetVar="roleTypeDestroyDialogWidget"
+ <p:confirmDialog id="roleTypeDestroyDialog" message="Delete role #{roleTypeController.getCurrentEntityInstanceName()}?"
+ header="Delete RoleType" severity="alert" widgetVar="roleTypeDestroyDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="roleTypeDestroyDialogWidget.hide()" action="#{roleTypeController.destroy()}"/>
<p:commandButton value="No" onclick="PF('roleTypeDestroyDialogWidget').hide()" type="button" />
diff --git a/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
index 0341b7e5084003f21bc5c657a4be0b09316e55e4..7071672da733a33f6253be2e3b179866060c7742 100644
--- a/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/roleType/roleTypeEditPanelGrid.xhtml
@@ -9,19 +9,16 @@
<c:set var="roleTypeObject" value="#{roleTypeController.selected}"/>
<c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
- <p:panelGrid columns="3" styleClass="editEntityDetails">
+ <p:panelGrid columns="2" styleClass="editEntityDetails">
<h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="name" value="#{roleTypeObject.name}" title="Name" required="true" styleClass="entityDataEmphasizedText"/>
- <p:message for="name"/>
<h:outputLabel for="id" value="Id" styleClass="entityDataLabel"/>
<h:outputText id="id" value="#{roleTypeObject.id}" title="Id" styleClass="entityDataText"/>
- <p:message for="id"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
- <h:inputText id="description" value="#{roleTypeObject.description}" title="Description" styleClass="entityDataText"/>
- <p:message for="description"/>
+ <h:inputText id="description" value="#{roleTypeObject.description}" title="Description" styleClass="entityDataText"/>
</p:panelGrid>
</ui:composition>
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml b/src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml
index 080fa58a67f68c40edb21d491d5c8e6daefb941c..afc4fc5972f092aa9759819e49e1ffc78c538aa7 100644
--- a/src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userInfoCreatePanelGrid.xhtml
@@ -8,35 +8,28 @@
<c:set var="userInfoObject" value="#{userInfoController.selected}"/>
- <p:panelGrid columns="3" styleClass="createEntityDetails">
+ <p:panelGrid columns="2" styleClass="createEntityDetails">
<h:outputLabel for="username" value="Username" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="username" value="#{userInfoObject.username}" title="Username" required="true" styleClass="entityDataEmphasizedText"/>
- <p:message for="username"/>
<h:outputLabel for="lastName" value="Last Name" styleClass="entityDataLabel"/>
<h:inputText id="lastName" value="#{userInfoObject.lastName}" title="Last Name" required="true" styleClass="entityDataText"/>
- <p:message for="lastName"/>
<h:outputLabel for="firstName" value="First Name" styleClass="entityDataLabel"/>
- <h:inputText id="firstName" value="#{userInfoObject.firstName}" title="First Name" required="true" styleClass="entityDataText"/>
- <p:message for="firstName"/>
+ <h:inputText id="firstName" value="#{userInfoObject.firstName}" title="First Name" required="true" styleClass="entityDataText"/>
<h:outputLabel for="middleName" value="Middle Name" styleClass="entityDataLabel"/>
<h:inputText id="middleName" value="#{userInfoObject.middleName}" title="Middle Name" styleClass="entityDataText"/>
- <p:message for="middleName"/>
<h:outputLabel for="email" value="Email" styleClass="entityDataLabel"/>
<h:inputText id="email" value="#{userInfoObject.email}" title="Email" styleClass="entityDataText"/>
- <p:message for="email"/>
<h:outputLabel for="password" value="Password" styleClass="entityDataLabel"/>
<p:password id="password" value="#{userInfoObject.password}" title="Password" feedback="true" styleClass="entityDataText"/>
- <p:message for="password"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
- <h:inputText id="description" value="#{userInfoObject.description}" title="Description" styleClass="entityDataText"/>
- <p:message for="description"/>
+ <h:inputText id="description" value="#{userInfoObject.description}" title="Description" styleClass="entityDataText"/>
</p:panelGrid>
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml b/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml
index bd51dce30edd070188d7c2994d87a85f618563f3..39998e9fe36edf2782714910cd9057bb7ce9c683 100644
--- a/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userInfoDestroyDialog.xhtml
@@ -4,8 +4,8 @@
xmlns:p="http://primefaces.org/ui"
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
- <p:confirmDialog id="userInfoDestroyDialog" message="Destroy user #{userInfoController.getCurrentEntityInstanceName()}?"
- header="Destroy User" severity="alert" widgetVar="userInfoDestroyDialogWidget"
+ <p:confirmDialog id="userInfoDestroyDialog" message="Delete user #{userInfoController.getCurrentEntityInstanceName()}?"
+ header="Delete User" severity="alert" widgetVar="userInfoDestroyDialogWidget"
styleClass="dialog">
<p:commandButton value="Yes" oncomplete="userInfoDestroyDialogWidget.hide()" action="#{userInfoController.destroy()}"/>
<p:commandButton value="No" onclick="PF('userInfoDestroyDialogWidget').hide()" type="button" />
diff --git a/src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml b/src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml
index ed3f7724505dcb4b62f870574aa6d88508317cb0..ffc6dabe7c4d54cdecb5d5dca54badd15ca8941e 100644
--- a/src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/userInfoEditPanelGrid.xhtml
@@ -9,43 +9,35 @@
<c:set var="userInfoObject" value="#{userInfoController.selected}"/>
<c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
- <p:panelGrid columns="3" styleClass="editEntityDetails">
+ <p:panelGrid columns="2" styleClass="editEntityDetails">
<h:outputLabel for="username" value="Username" styleClass="entityDataEmphasizedLabel"/>
<h:inputText id="username" value="#{userInfoObject.username}" rendered="#{isFieldWriteable}" title="Username" required="true" styleClass="entityDataEmphasizedText"/>
<h:outputText id="usernameOutput" value="#{userInfoObject.username}" rendered="#{!isFieldWriteable}" title="Username" styleClass="entityDataEmphasizedText"/>
- <p:message for="username"/>
<h:outputLabel for="id" value="Id" styleClass="entityDataLabel"/>
<h:outputText id="id" value="#{userInfoObject.id}" title="Id" styleClass="entityDataText"/>
- <p:message for="id"/>
<h:outputLabel for="lastName" value="Last Name" styleClass="entityDataLabel"/>
<h:inputText id="lastName" value="#{userInfoObject.lastName}" rendered="#{isFieldWriteable}" title="Last Name" required="true" styleClass="entityDataText"/>
<h:outputText id="lastNameOutput" value="#{userInfoObject.lastName}" rendered="#{!isFieldWriteable}" title="Last Name" styleClass="entityDataText"/>
- <p:message for="lastName"/>
<h:outputLabel for="firstName" value="First Name" styleClass="entityDataLabel"/>
<h:inputText id="firstName" value="#{userInfoObject.firstName}" rendered="#{isFieldWriteable}" title="First Name" required="true" styleClass="entityDataText"/>
- <h:outputText id="firstNameOutput" value="#{userInfoObject.firstName}" rendered="#{!isFieldWriteable}" title="First Name" styleClass="entityDataText"/>
- <p:message for="firstName"/>
+ <h:outputText id="firstNameOutput" value="#{userInfoObject.firstName}" rendered="#{!isFieldWriteable}" title="First Name" styleClass="entityDataText"/>
<h:outputLabel for="middleName" value="Middle Name" styleClass="entityDataLabel"/>
<h:inputText id="middleName" value="#{userInfoObject.middleName}" title="Middle Name" rendered="#{isFieldWriteable}" styleClass="entityDataText"/>
<h:outputText id="middleNameOutput" value="#{userInfoObject.middleName}" title="Middle Name" rendered="#{!isFieldWriteable}" styleClass="entityDataText"/>
- <p:message for="middleName"/>
<h:outputLabel for="email" value="Email" styleClass="entityDataLabel"/>
<h:inputText id="email" value="#{userInfoObject.email}" title="Email" styleClass="entityDataText"/>
- <p:message for="email"/>
<h:outputLabel for="password" value="Password" styleClass="entityDataLabel"/>
<p:password id="password" value="#{userInfoController.passwordEntry}" title="Password" feedback="true" styleClass="entityDataText"/>
- <p:message for="password"/>
<h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
- <h:inputText id="description" value="#{userInfoObject.description}" title="Description" styleClass="entityDataText"/>
- <p:message for="description"/>
+ <h:inputText id="description" value="#{userInfoObject.description}" title="Description" styleClass="entityDataText"/>
</p:panelGrid>
</ui:composition>
diff --git a/src/java/DmWebPortal/web/views/userSystemRole/list.xhtml b/src/java/DmWebPortal/web/views/userSystemRole/list.xhtml
index eea8848616e8676744ccb757241de4ec376810f6..ac62d9b47c816db0745216ee9d7e69ca71769abe 100644
--- a/src/java/DmWebPortal/web/views/userSystemRole/list.xhtml
+++ b/src/java/DmWebPortal/web/views/userSystemRole/list.xhtml
@@ -16,7 +16,7 @@
<h:form id="adminListForm">
<div class="actionButton">
- <p:commandButton id="systemRoleAddButton" onclick="PF('systemRoleAddDialogWidget').show();" rendered="#{userSystemRoleController.hasSystemRole(loginController.username)}" icon="ui-icon-plus" >
+ <p:commandButton id="systemRoleAddButton" value="Add" onclick="PF('systemRoleAddDialogWidget').show();" rendered="#{userSystemRoleController.hasSystemRole(loginController.username)}" icon="ui-icon-plus" >
<p:tooltip for="systemRoleAddButton" value="Add new Administrators."/>
</p:commandButton>