Compare revisions

dc2b9dc3 · dc2b9dc3 · dc2b9dc3 · dc2b9dc3 · dc2b9dc3 · dc2b9dc3
--- a/src/java/DmWebPortal/web/resources/images/ApsStorageRing.png
+++ b/src/java/DmWebPortal/web/resources/images/ApsStorageRing.png
--- a/src/java/DmWebPortal/web/resources/js/experimentType/list.filter.js
+++ b/src/java/DmWebPortal/web/resources/js/experimentType/list.filter.js
+
+jQuery(document).ready(function() {
+    experimentTypeListWidget.filter();
+});
--- a/src/java/DmWebPortal/web/resources/js/userInfo/list.filter.js
+++ b/src/java/DmWebPortal/web/resources/js/userInfo/list.filter.js
+
+jQuery(document).ready(function() {
+    userInfoListWidget.filter();
+});
\ No newline at end of file
--- a/src/java/DmWebPortal/web/templates/contentViewTemplate4x3.xhtml
+++ b/src/java/DmWebPortal/web/templates/contentViewTemplate4x3.xhtml
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:h="http://java.sun.com/jsf/html"
+      xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+    <h:head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <link href="../../resources/css/portal.css" rel="stylesheet" type="text/css" />
+        <title>Data Management System Portal</title>
+    </h:head>
+
+    <h:body>
+
+        <div id="top" class="topContent">
+            <div id="topLeft" class="topLeftContent">
+                <ui:insert name="topLeft">
+                    <h:graphicImage alt="ANL Logo" url="../../resources/images/AnlLogo167x75.png"/>
+                </ui:insert>
+            </div>
+            <div>
+                <div id="topRight" class="topRightContent">
+                    <ui:insert name="topRight">
+                        <h:outputText value="Username: #{loginController.displayUsername()}"/>
+                        <br/>
+
+                        <h:outputText value="Role: #{loginController.displayRole()}"/>
+
+                    </ui:insert>
+                </div>
+                <div id="topCenter" class="topCenterContent">
+                    <ui:insert name="topCenter">
+                        <h1>Data Management System Portal</h1>
+                    </ui:insert>
+                </div>
+            </div>
+        </div>
+
+        <ui:fragment>
+            <div id="menu" class="menuContent">
+                <div id="menuLeft" class="menuLeftContent">
+                    <ui:insert name="menuLeft">
+                        <p:menubar/>
+                    </ui:insert>
+                </div>
+                <div>
+                    <div id="menuRight" class="menuRightContent">
+                        <ui:insert name="menuRight">
+                        </ui:insert>
+                    </div>
+                    <div id="menuCenter" class="menuCenterContent">
+                        <ui:insert name="menuCenter">
+                            <h:form prependId="false">
+                                <p:menubar>
+                                    <p:menuitem value="Home" url="/faces/views/home.xhtml" icon="ui-icon-home"/>
+                                    <p:menuitem value="Experiment Types" url="/faces/views/experimentType/list.xhtml"/>
+                                    <p:menuitem value="Users" url="/faces/views/userInfo/list.xhtml"/>
+                                    <p:menuitem value="Login" onclick="loginDialog.show()" rendered="#{!loginController.loggedIn}" icon="ui-icon-person"/>
+                                    <p:menuitem value="Logout" action="#{loginController.logout()}" rendered="#{loginController.loggedIn}" icon="ui-icon-close"/>                                </p:menubar>
+                            </h:form>
+                        </ui:insert>
+                    </div>
+                </div>
+            </div>
+
+            <div id="middle" class="middleContent">
+                <div id="middleLeft" class="middleLeftContent">
+                    <ui:insert name="middleLeft">
+                    </ui:insert>
+                </div>
+                <div>
+                    <div id="middleRight" class="middleRightContent">
+                        <ui:insert name="middleRight">
+                        </ui:insert>
+                    </div>
+                    <div id="middleCenter" class="middleCenterContent">
+                        <ui:insert name="middleCenter">
+                        </ui:insert>
+                    </div>
+                </div>
+            </div>
+        </ui:fragment>
+
+        <ui:fragment>
+            <div id="bottom" class="bottomContent">
+                <ui:insert name="bottom">
+                    <h:form prependId="false">
+                        <p:growl id="messages" showDetail="true" autoUpdate="true"/>
+                    </h:form>
+                </ui:insert>
+            </div>
+        </ui:fragment>
+
+        <h:form id="loginForm">
+            <p:dialog id="loginDialog" styleClass="dialog" header="Login" widgetVar="loginDialog">
+                <h:panelGrid styleClass="loginInput">
+                    <div class="dialog">
+                        <div>
+                            <p:inputText id="username" value="#{loginController.username}" title="Username"/>
+                            <p:watermark for="username" value="Username"/>
+                            <p:password id="password" value="#{loginController.password}" title="Password"/>
+                            <p:watermark for="password" value="Password"/>
+                        </div>
+
+                        <f:facet name="footer">
+                            <p:commandButton id="loginButton" value="Login" action="#{loginController.login}" oncomplete="loginDialog.hide()"/>
+                        </f:facet>
+                    </div>
+                </h:panelGrid>
+            </p:dialog>
+        </h:form>
+    </h:body>
+
+</html>
--- a/src/java/DmWebPortal/web/templates/loginViewTemplate.xhtml
+++ b/src/java/DmWebPortal/web/templates/loginViewTemplate.xhtml
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html">
+
+    <h:head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+        <link href="../resources/css/login.css" rel="stylesheet" type="text/css" />
+        <title>Data Management System Login</title>
+
+    </h:head>
+
+    <h:body>
+        <div id="top" class="topContent">
+            <div id="topLeft" class="topLeftContent">
+                <ui:insert name="topLeft">
+                    <h:graphicImage alt="ANL Logo" url="../resources/images/AnlLogo167x75.png"/>
+                </ui:insert>
+            </div>
+            <div>
+                <div id="topRight" class="topRightContent">
+                    <ui:insert name="topRight"/>
+                </div>
+                <div id="topCenter" class="topCenterContent">
+                    <ui:insert name="topCenter">
+                        <h1>Data Management System Portal</h1>
+                    </ui:insert>
+                </div>
+            </div>
+        </div>
+
+        <div id="bottom" class="bottomContent">
+            <ui:insert name="bottom">
+            </ui:insert>
+        </div>
+
+
+    </h:body>
+
+</html>
--- a/src/java/DmWebPortal/web/views/common/commonListActionButtons.xhtml
+++ b/src/java/DmWebPortal/web/views/common/commonListActionButtons.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+
+    <c:set var="entityTypeName" value="#{entityController.entityTypeName}"/>
+    <c:set var="displayAddButton" value="#{loginController.loggedIn}"/>
+
+    <div class="actionButton">
+        <p:commandButton id="#{entityTypeName}AddButton" action="#{entityController.prepareCreate()}" rendered="#{displayAddButton}" value="Add" alt="Add new #{entityTypeName}" icon="ui-icon-plus">
+            <p:tooltip for="#{entityTypeName}AddButton" value="Create new #{entityController.displayEntityTypeName}."/>
+        </p:commandButton>
+        
+        <p:commandButton id="#{entityTypeName}ResetFiltersButton" action="#{entityController.resetList()}" alt="Clear Filters" icon="ui-icon-refresh" styleClass="actionButtonRight">
+            <p:tooltip for="#{entityTypeName}ResetFiltersButton" value="Reset list filters."/>
+        </p:commandButton>
+
+        <p:commandButton id="#{entityTypeName}NoOp" style="visibility:hidden" value="NoOp"/>
+        <p:defaultCommand target="#{entityTypeName}NoOp"/>
+    </div>
+
+</ui:composition>
--- a/src/java/DmWebPortal/web/views/experimentType/create.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/create.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+                template="../../templates/contentViewTemplate4x3.xhtml">
+
+    <ui:define name="middleCenter">
+        <div class="pageTitle">
+            <h1>Add Experiment Type</h1>
+        </div>
+
+        <h:form id="addExperimentTypeForm">
+
+            <ui:include src="experimentTypeCreatePanelGrid.xhtml"/>
+
+            <p/>
+            <div class="actionButton">
+                <p:commandButton action="#{experimentTypeController.create()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
+                <p:commandButton action="#{experimentTypeController.prepareList()}" immediate="true" value="Cancel" alt="Cancel" icon="ui-icon-cancel"/>
+            </div>
+        </h:form>
+
+    </ui:define>
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/experimentType/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/edit.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+                template="../../templates/contentViewTemplate4x3.xhtml">
+
+    <ui:define name="middleCenter">
+        <h:form id="editExperimentTypeForm">
+
+            <div class="middleCenterLeftContent">
+                <div class="pageTitle">
+                    <h1>Edit Experiment Type</h1>
+                </div>
+
+                <ui:include src="experimentTypeEditPanelGrid.xhtml"/>
+                <p/>
+                <div class="actionButton">
+                    <p:commandButton action="#{experimentTypeController.update()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
+                    <p:commandButton action="#{experimentTypeController.prepareList()}" immediate="true" value="Done" alt="Done" icon="ui-icon-arrowreturnthick-1-w"/>
+                </div>
+            </div>
+
+        </h:form>
+
+    </ui:define>
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeCreatePanelGrid.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+
+    <c:set var="experimentTypeObject" value="#{experimentTypeController.selected}"/>
+
+    <p:panelGrid columns="3" 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:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
+        <h:inputText id="description" value="#{experimentTypeObject.description}" title="Description" styleClass="entityDataText"/>
+        <p:message for="description"/>        
+
+        <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>
+
+
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeDestroyDialog.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                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"
+                     styleClass="dialog">
+        <p:commandButton value="Yes" oncomplete="experimentTypeDestroyDialogWidget.hide()" action="#{experimentTypeController.destroy()}"/>
+        <p:commandButton value="No" onclick="experimentTypeDestroyDialogWidget.hide()" type="button" />
+    </p:confirmDialog>  
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeEditPanelGrid.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+
+    <c:set var="experimentTypeObject" value="#{experimentTypeController.selected}"/>
+    <c:set var="isFieldWriteable" value="#{loginController.loggedIn}"/>
+
+    <p:panelGrid columns="3" 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: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: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>
+
+
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeListDataTable.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+
+    <p:dataTable id="experimentTypeListDataTable"                              
+                 var="experimentTypeObject" 
+                 value="#{experimentTypeController.listDataModel}" 
+                 filteredValue="#{experimentTypeController.filteredObjectList}"
+                 paginator="true" 
+                 paginatorAlwaysVisible="false" 
+                 rows="25"
+                 binding="#{experimentTypeController.listDataTable}"
+                 widgetVar="experimentTypeListWidget" 
+                 emptyMessage="No experiment types found.">
+
+        <p:column sortBy="#{experimentTypeObject.id}" headerText="Id">
+            <h:outputText value="#{experimentTypeObject.id}"/>
+        </p:column>
+
+        <p:column sortBy="#{experimentTypeObject.name}" headerText="Name" 
+                  filterBy="#{experimentTypeObject.name}" filterMatchMode="contains">
+            <h:outputText value="#{experimentTypeObject.name}"/>
+        </p:column>
+
+        <p:column sortBy="#{experimentTypeObject.description}" headerText="Description" 
+                  filterBy="#{experimentTypeObject.description}" filterMatchMode="contains">
+            <h:outputText value="#{experimentTypeObject.description}"/>
+        </p:column>
+
+        <p:column sortBy="#{experimentTypeObject.rootDataPath}" headerText="Root Data Path" 
+                  filterBy="#{experimentTypeObject.rootDataPath}" filterMatchMode="contains">
+            <h:outputText value="#{experimentTypeObject.rootDataPath}"/>
+        </p:column>
+        
+        <c:set var="isEntityWriteable" value="#{loginController.loggedIn}"/>
+        <p:column headerText="Actions">
+            <div class="actionLink">
+                <p:commandLink action="#{experimentTypeController.prepareView(experimentTypeObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
+                <p:commandLink action="#{experimentTypeController.prepareEdit(experimentTypeObject)}" rendered="#{isEntityWriteable}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
+                <p:commandLink oncomplete="experimentTypeDestroyDialogWidget.show()" rendered="#{loginController.loggedIn}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
+                    <f:setPropertyActionListener value="#{experimentTypeObject}" target="#{experimentTypeController.current}"/>
+                </p:commandLink>
+            </div>
+        </p:column>
+    </p:dataTable>
+
+</ui:composition>
--- a/src/java/DmWebPortal/web/views/experimentType/experimentTypeViewPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/experimentTypeViewPanelGrid.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core">
+
+    <c:set var="experimentTypeObject" value="#{experimentTypeController.selected}"/>
+
+    <p:panelGrid columns="2" styleClass="viewEntityDetails">
+
+        <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
+        <h:outputText id="name" value="#{experimentTypeObject.name}" title="Name" styleClass="entityDataEmphasizedText"/>
+
+        <h:outputLabel for="id" value="Id" styleClass="entityDataLabel"/>
+        <h:outputText id="id" value="#{experimentTypeObject.id}" title="Id" styleClass="entityDataText"/>
+
+        <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
+        <h:outputText id="description" value="#{experimentTypeObject.description}" title="Description" styleClass="entityDataText"/>
+ 
+        <h:outputLabel for="rootDataPath" value="Root Data Path" styleClass="entityDataLabel"/>
+        <h:outputText id="rootDataPath" value="#{experimentTypeObject.rootDataPath}" title="Root Data Path" styleClass="entityDataText"/>
+        
+    </p:panelGrid>
+
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/experimentType/list.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/list.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+                template="../../templates/contentViewTemplate4x3.xhtml">
+
+    <ui:define name="middleCenter">
+        <div class="pageTitle">
+            <h1>Experiment Types</h1>
+        </div>
+
+        <h:form id="viewExperimentTypeListForm">
+            <c:set var="entityController" value="#{experimentTypeController}"/>
+            <ui:include src="../common/commonListActionButtons.xhtml"/>
+
+            <h:panelGroup>  
+                <ui:include src="experimentTypeListDataTable.xhtml"/>
+            </h:panelGroup>
+
+            <ui:include src="experimentTypeDestroyDialog.xhtml"/>
+
+            <h:outputScript library="js/experimentType" name="list.filter.js" rendered="#{loginController.loggedIn}"/>
+
+        </h:form>
+
+    </ui:define>
+</ui:composition>
--- a/src/java/DmWebPortal/web/views/experimentType/view.xhtml
+++ b/src/java/DmWebPortal/web/views/experimentType/view.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+                template="../../templates/contentViewTemplate4x3.xhtml">
+
+    <ui:define name="middleCenter">
+        <h:form id="viewExperimentTypeForm">
+
+            <div class="middleCenterLeftContent">
+                <div class="pageTitle">
+                    <h1>Experiment Type Details</h1>
+                </div>
+
+                <ui:include src="experimentTypeViewPanelGrid.xhtml"/>
+                
+                <p/>
+                    <c:set var="experimentTypeObject" value="#{experimentTypeController.selected}"/>
+                <c:set var="isEntityWriteable" value="#{loginController.loggedIn}"/>
+                <div class="actionButton">
+                    <p:commandButton action="#{experimentTypeController.prepareEdit(experimentTypeObject)}" rendered="#{isEntityWriteable}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
+                    <p:commandButton onclick="PF('experimentTypeDestroyDialogWidget').show();" rendered="#{loginController.loggedIn}" value="Delete" alt="Delete" icon="ui-icon-trash">
+                        <f:setPropertyActionListener value="#{experimentTypeObject}" target="#{experimentTypeController.current}"/>
+                    </p:commandButton>  
+                    <p:commandButton action="#{experimentTypeController.prepareList()}" value="Done" alt="Done" icon="ui-icon-arrowreturnthick-1-w"/>
+                </div>
+
+                <ui:include src="experimentTypeDestroyDialog.xhtml"/>
+                
+            </div>
+
+        </h:form>
+
+    </ui:define>
+
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/home.xhtml
+++ b/src/java/DmWebPortal/web/views/home.xhtml
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:ui="http://java.sun.com/jsf/facelets"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:f="http://xmlns.jcp.org/jsf/core">
+
+    <ui:composition template="../templates/contentViewTemplate4x3.xhtml">
+        <ui:define name="middleCenter">
+
+            <div class="homePage">
+
+                <div class="pageTitle">
+                    <h1>Data Management Portal Home</h1>
+                </div>
+
+                <div class="sectionText"> 
+                    The primary goal of the Data Management project is to move data...
+                    <p/>
+                </div>
+
+                <div class="sectionTitle">
+                    <h2>System At A Glance</h2>
+                </div>    
+
+                <h:form id="systemSummaryForm">
+                    <p:growl id="messages" showDetail="true" autoUpdate="true"/>
+                    <p:panelGrid columns="2">
+                        <h:outputLabel for="nRegisteredUsers" value="Number of Registered Users" styleClass="entityDataLabel"/>
+                        <h:outputText id="nRegisteredUsers" value="#{userInfoController.items.getRowCount()}" title="Number of Registered Users" styleClass="entityDataText"/>
+
+                    </p:panelGrid>
+                </h:form>
+            </div>
+
+
+        </ui:define>
+    </ui:composition>
+</ui:composition>
+
--- a/src/java/DmWebPortal/web/views/login.xhtml
+++ b/src/java/DmWebPortal/web/views/login.xhtml
+<?xml version='1.0' encoding='UTF-8' ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:p="http://primefaces.org/ui"
+      xmlns:h="http://java.sun.com/jsf/html">
+
+    <h:body>
+        <ui:composition template="../templates/loginViewTemplate.xhtml">
+            <ui:define name="bottom">
+                <h:form id="loginForm">
+                    <p:growl id="messages" showDetail="true" autoUpdate="true"/>
+                    <div class="login">
+                        <div>
+                            <p:inputText id="username" value="#{loginController.username}" title="Username"/>
+                            <p:watermark for="username" value="Username"/>
+                        </div>
+                        <div>
+                            <p:password id="password" value="#{loginController.password}" title="Password"/>
+                            <p:watermark for="password" value="Password"/>
+                        </div>
+                        <p/>
+                        <div>
+                            <p:commandButton value="Login" action="#{loginController.login()}" />
+                        </div>
+                    </div>
+                </h:form>
+            </ui:define>
+        </ui:composition>
+    </h:body>
+</html>
--- a/src/java/DmWebPortal/web/views/userInfo/create.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/create.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+                template="../../templates/contentViewTemplate4x3.xhtml">
+
+    <ui:define name="middleCenter">
+        <div class="pageTitle">
+            <h1>Add User</h1>
+        </div>
+
+        <h:form id="addUserInfoForm">
+
+            <ui:include src="userInfoCreatePanelGrid.xhtml"/>
+
+            <p/>
+            <div class="actionButton">
+                <p:commandButton action="#{userInfoController.create()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
+                <p:commandButton action="#{userInfoController.prepareList()}" immediate="true" value="Cancel" alt="Cancel" icon="ui-icon-cancel"/>
+            </div>
+        </h:form>
+
+    </ui:define>
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/userInfo/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/edit.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+                template="../../templates/contentViewTemplate4x3.xhtml">
+
+    <ui:define name="middleCenter">
+        <h:form id="editUserInfoForm">
+
+            <div class="middleCenterLeftContent">
+                <div class="pageTitle">
+                    <h1>Edit User</h1>
+                </div>
+
+                <ui:include src="userInfoEditPanelGrid.xhtml"/>
+                <p/>
+                <div class="actionButton">
+                    <p:commandButton action="#{userInfoController.update()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
+                    <p:commandButton action="#{userInfoController.prepareList()}" immediate="true" value="Done" alt="Done" icon="ui-icon-arrowreturnthick-1-w"/>
+                </div>
+            </div>
+            <div class="middleCenterRightContent">
+<!--                <p:accordionPanel multiple="true">
+                    <p:tab title="Settings">
+
+                        <ui:include src="../userSetting/edit.xhtml"/>
+
+                    </p:tab>
+                </p:accordionPanel>-->
+            </div>
+        </h:form>
+
+    </ui:define>
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/userInfo/list.xhtml
+++ b/src/java/DmWebPortal/web/views/userInfo/list.xhtml
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="http://java.sun.com/jsf/html"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:f="http://java.sun.com/jsf/core"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets"
+                xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"
+                template="../../templates/contentViewTemplate4x3.xhtml">
+
+    <ui:define name="middleCenter">
+        <div class="pageTitle">
+            <h1>Registered Users</h1>
+        </div>
+
+        <h:form id="viewUserInfoListForm">
+            <c:set var="entityController" value="#{userInfoController}"/>
+            <ui:include src="../common/commonListActionButtons.xhtml"/>
+
+            <h:panelGroup>  
+                <ui:include src="userInfoListDataTable.xhtml"/>
+            </h:panelGroup>
+
+            <ui:include src="userInfoDestroyDialog.xhtml"/>
+
+            <h:outputScript library="js/userInfo" name="list.filter.js" rendered="#{loginController.loggedIn}"/>
+
+        </h:form>
+
+    </ui:define>
+</ui:composition>
No results found