Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/java/DmWebPortal/nbproject/project.properties

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/UserSystemRolePK.java

@@ -74,7 +74,7 @@ public class UserSystemRolePK implements Serializable {
 
     @Override
     public String toString() {
-        return "gov.anl.aps.dm.portal.model.entities2.UserSystemRolePK[ userId=" + userId + ", roleTypeId=" + roleTypeId + " ]";
+        return "gov.anl.aps.dm.portal.model.entities.UserSystemRolePK[ userId=" + userId + ", roleTypeId=" + roleTypeId + " ]";
     }
     
 }

src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/model/entities/UsersLastUpdate.java

-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package gov.anl.aps.dm.portal.model.entities;
-
-import java.util.Date;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-import javax.validation.constraints.NotNull;
-import javax.xml.bind.annotation.XmlRootElement;
-
-/**
- *
- * @author sveseli
- */
-@Entity
-@Table(name = "users_last_update")
-@XmlRootElement
-@NamedQueries({
-    @NamedQuery(name = "UsersLastUpdate.findAll", query = "SELECT u FROM UsersLastUpdate u")
-    , @NamedQuery(name = "UsersLastUpdate.findById", query = "SELECT u FROM UsersLastUpdate u WHERE u.id = :id")
-    , @NamedQuery(name = "UsersLastUpdate.findByLastUpdate", query = "SELECT u FROM UsersLastUpdate u WHERE u.lastUpdate = :lastUpdate")})
-public class UsersLastUpdate extends DmEntity {
-
-    @Id
-    @Basic(optional = false)
-    @NotNull
-    private Integer id;
-    @Column(name = "last_update")
-    @Temporal(TemporalType.DATE)
-    private Date lastUpdate;
-
-    public UsersLastUpdate() {
-    }
-
-    public UsersLastUpdate(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Date getLastUpdate() {
-        return lastUpdate;
-    }
-
-    public void setLastUpdate(Date lastUpdate) {
-        this.lastUpdate = lastUpdate;
-    }
-
-    @Override
-    public int hashCode() {
-        int hash = 0;
-        hash += (id != null ? id.hashCode() : 0);
-        return hash;
-    }
-
-    @Override
-    public boolean equals(Object object) {
-        // TODO: Warning - this method won't work in the case the id fields are not set
-        if (!(object instanceof UsersLastUpdate)) {
-            return false;
-        }
-        UsersLastUpdate other = (UsersLastUpdate) object;
-        if ((this.id == null && other.id != null) || (this.id != null && !this.id.equals(other.id))) {
-            return false;
-        }
-        return true;
-    }
-
-    @Override
-    public String toString() {
-        return "gov.anl.aps.dm.portal.model.entities2.UsersLastUpdate[ id=" + id + " ]";
-    }
-    
-}

src/java/DmWebPortal/web/resources/js/storage/loadFilters.js

+jQuery(document).ready(function() {
+    PF('storageListWidget').filter();   
+});

src/java/DmWebPortal/web/templates/menubarTemplate.xhtml

@@ -9,6 +9,7 @@
         <p:menuitem value="Experiments" url="/views/experiment/list.xhtml"/> 
         <p:menuitem value="Experiment Stations" url="/views/experimentStation/list.xhtml"/>
         <p:menuitem value="Experiment Types" url="/views/experimentType/list.xhtml"/>
+        <p:menuitem value="Storage Systems" url="/views/storage/list.xhtml"/>
         <p:menuitem value="Role Types" url="/views/roleType/list.xhtml"/>
         <p:menuitem value="Users" url="/views/userInfo/list.xhtml"/>
         <p:menuitem value="Logout" action="#{loginController.logout()}" icon="ui-icon-close"/>

src/java/DmWebPortal/web/views/experiment/private/experimentCreatePanelGrid.xhtml

@@ -13,6 +13,16 @@
         <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
         <h:inputText id="name" value="#{experimentObject.name}" title="Name" styleClass="entityDataEmphasizedInputText"/>
 
+        <h:outputLabel for="experimentStation" value="Experiment Station" styleClass="entityDataLabel"/>
+        <p:selectOneMenu id="experimentStation" value="#{experimentObject.experimentStation}" styleClass="entityDataInputText">
+            <f:selectItem itemLabel="Select Station" itemValue="" noSelectionOption="true" />
+            <f:selectItems value="#{experimentStationController.getAvailableExperimentStations()}" 
+                           var="experimentStation"
+                           itemValue="#{experimentStation}"
+                           itemLabel="#{experimentStation.name}"
+                           itemDescription="#{experimentStation.description}" />
+        </p:selectOneMenu>
+
         <h:outputLabel for="experimentType" value="Experiment Type" styleClass="entityDataLabel"/>
         <p:selectOneMenu id="experimentType" value="#{experimentObject.experimentType}" styleClass="entityDataInputText">
             <f:selectItem itemLabel="Select Type" itemValue="" noSelectionOption="true" />
@@ -22,20 +32,23 @@
                            itemLabel="#{experimentType.name}"
                            itemDescription="#{experimentType.description}" />
         </p:selectOneMenu>
-
-        <h:outputLabel for="experimentStation" value="Experiment Station" styleClass="entityDataLabel"/>
-        <p:selectOneMenu id="experimentStation" value="#{experimentObject.experimentStation}" styleClass="entityDataInputText">
-            <f:selectItem itemLabel="Select Station" itemValue="" noSelectionOption="true" />
-            <f:selectItems value="#{experimentStationController.getAvailableExperimentStations()}" 
-                           var="experimentStation"
-                           itemValue="#{experimentStation}"
-                           itemLabel="#{experimentStation.name}"
-                           itemDescription="#{experimentStation.description}" />
+        
+        <h:outputLabel for="primaryStorage" value="Primary Storage" styleClass="entityDataLabel"/>
+        <p:selectOneMenu id="primaryStorage" value="#{experimentObject.primaryStorage}" styleClass="entityDataInputText">
+            <f:selectItem itemLabel="Select Type" itemValue="" noSelectionOption="true" />
+            <f:selectItems value="#{storageController.getAvailableItems()}" 
+                           var="storage"
+                           itemValue="#{storage}"
+                           itemLabel="#{storage.name}"
+                           itemDescription="#{storage.description}" />
         </p:selectOneMenu>
         
         <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
         <h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataInputText"/>      
 
+        <h:outputLabel for="rootPath" value="Storage Root Path" styleClass="entityDataLabel"/>
+        <h:inputText id="rootPath" value="#{experimentObject.rootPath}" title="Storage Root Path" styleClass="entityDataInputText"/>      
+        
         <h:outputLabel for="startDate" value="Start Date"/>
         <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DateTimePattern}" />
         

src/java/DmWebPortal/web/views/experiment/private/experimentEditPanelGrid.xhtml

@@ -3,6 +3,7 @@
 <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">
 
     <ui:param name="experimentObject" value="#{experimentController.current}"/>
@@ -11,16 +12,36 @@
 
         <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
         <h:outputText id="name" value="#{experimentObject.name}" title="Name" styleClass="entityDataEmphasizedText"/>
-
-        <h:outputLabel for="experimentType" value="Type" styleClass="entityDataLabel"/>
-        <h:outputText id="experimentType" value="#{experimentObject.experimentType.name}" title="Type" styleClass="entityDataText"/>
-
+        
         <h:outputLabel for="experimentStation" value="Station" styleClass="entityDataLabel"/>
         <h:outputText id="experimentStation" value="#{experimentObject.experimentStation.name}" title="Station" styleClass="entityDataText"/>
+ 
+        <h:outputLabel for="experimentType" value="Experiment Type" styleClass="entityDataLabel"/>
+        <p:selectOneMenu id="experimentType" value="#{experimentObject.experimentType}" styleClass="entityDataInputText">
+            <f:selectItem itemLabel="Select Type" itemValue="" noSelectionOption="true" />
+            <f:selectItems value="#{experimentTypeController.getAvailableItems()}" 
+                           var="experimentType"
+                           itemValue="#{experimentType}"
+                           itemLabel="#{experimentType.name}"
+                           itemDescription="#{experimentType.description}" />
+        </p:selectOneMenu>
+        
+        <h:outputLabel for="primaryStorage" value="Primary Storage" styleClass="entityDataLabel"/>
+        <p:selectOneMenu id="primaryStorage" value="#{experimentObject.primaryStorage}" styleClass="entityDataInputText">
+            <f:selectItem itemLabel="Select Type" itemValue="" noSelectionOption="true" />
+            <f:selectItems value="#{storageController.getAvailableItems()}" 
+                           var="storage"
+                           itemValue="#{storage}"
+                           itemLabel="#{storage.name}"
+                           itemDescription="#{storage.description}" />
+        </p:selectOneMenu>
         
         <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
         <h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataInputText"/>  
-        
+
+        <h:outputLabel for="rootPath" value="Storage Root Path" styleClass="entityDataLabel"/>
+        <h:inputText id="rootPath" value="#{experimentObject.rootPath}" title="Storage Root Path" styleClass="entityDataInputText"/>      
+         
         <h:outputLabel for="startDate" value="Start Date" styleClass="entityDataLabel"/>
         <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" pattern="#{resources.DateTimePattern}" />
         

src/java/DmWebPortal/web/views/experiment/private/experimentViewPanelGrid.xhtml

@@ -18,10 +18,16 @@
 
         <h:outputLabel for="experimentStation" value="Station" styleClass="entityDataLabel"/>
         <h:outputText id="experimentStation" value="#{experimentObject.experimentStation.name}" title="Station" styleClass="entityDataText"/>
+
+        <h:outputLabel for="primaryStorage" value="Primary Storage" styleClass="entityDataLabel"/>
+        <h:outputText id="primaryStorage" value="#{experimentObject.primaryStorage.name}" title="Primary Storage" styleClass="entityDataText"/>
         
         <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
         <h:outputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>
- 
+
+        <h:outputLabel for="rootPath" value="Storage Root Path" styleClass="entityDataLabel"/>
+        <h:outputText id="rootPath" value="#{experimentObject.rootPath}" title="Storage Root Path" styleClass="entityDataText"/>
+        
         <h:outputLabel for="startDate" value="Start Date" styleClass="entityDataLabel"/>
         <h:outputText  id="startDate" value="#{experimentObject.startDate}" styleClass="entityDataText">
             <f:convertDateTime pattern="#{resources.DateTimeZonePattern}" type="both" timeZone="#{resources.Timezone}" />

src/java/DmWebPortal/web/views/experimentStation/private/stationExperimentTypeAddDialog.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:f="http://java.sun.com/jsf/core"
+                xmlns:p="http://primefaces.org/ui">
+
+    <p:dialog id="stationExperimentTypeAddDialog" 
+              widgetVar="stationExperimentTypeAddDialogWidget" 
+              header="Select Experiment Type" 
+              styleClass="dialog">
+        <div class="dialog">
+            <ui:include src="stationExperimentTypeSelectDataTable.xhtml"/>
+            <f:facet name="footer" class="dialog">
+                <div class="actionButton" align="center">
+                    <p:commandButton value="Add" alt="Add" 
+                                     action="#{experimentStationController.addExperimentType()}"
+                                     onclick="PF('stationExperimentTypeSelectDataTableWidget').filter()"
+                                     oncomplete="PF('stationExperimentTypeAddDialogWidget').hide()"
+                                     update="@form"
+                                     immediate="true"
+                                     icon="ui-icon-arrowreturnthick-1-w"
+                                     styleClass="dialog">
+                    </p:commandButton>  
+                    <p:commandButton value="Cancel" alt="Cancel" 
+                                     onclick="PF('stationExperimentTypeAddDialogWidget').hide()"
+                                     update="@form"
+                                     immediate="true"
+                                     icon="ui-icon-close"
+                                     styleClass="dialog">
+                    </p:commandButton> 
+                </div>
+            </f:facet>
+        </div>
+    </p:dialog>
+</ui:composition>
+

src/java/DmWebPortal/web/views/experimentStation/private/stationExperimentTypeListDataTable.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">
+
+    <div class="actionButton">
+        <p:commandButton id="stationExperimentTypeAddButton" 
+                         action="#{experimentStationController.prepareAddExperimentType(stationObject)}" 
+                         oncomplete="PF('stationExperimentTypeAddDialogWidget').show()"
+                         rendered="#{loginController.admin}" 
+                         value="Add" alt="Add station experiment type." icon="ui-icon-plus">
+            <p:tooltip for="stationExperimentTypeAddButton" value="Add station experiment type."/>
+        </p:commandButton>
+    </div>
+
+    <ui:include src="stationExperimentTypeAddDialog.xhtml"/>
+
+    <ui:param name="breadcrumb" value="#{experimentStationController.currentViewId}"/>
+    <ui:param name="breadcrumbObjectId" value="#{stationObject.id}"/>
+
+    <p:dataTable id="stationExperimentTypeListDataTable"
+                 var="stationExperimentTypeObject" 
+                 value="#{stationObject.experimentTypeList}" 
+                 paginator="true" 
+                 paginatorAlwaysVisible="false" 
+                 rows="#{experimentStationController.displayNumberOfItemsPerPage}"
+                 widgetVar="stationExperimentTypeListWidget" 
+                 emptyMessage="No experiment types found.">
+
+        <p:column sortBy="#{stationExperimentTypeObject.name}" headerText="Username" 
+                  filterBy="#{stationExperimentTypeObject.name}" filterMatchMode="contains" >
+            <h:outputLink value="../stationExperimentType/view.xhtml?id=#{stationExperimentTypeObject.id}&amp;breadcrumb=#{breadcrumb}&amp;breadcrumbObjectId=#{breadcrumbObjectId}" 
+                          title="Experiment Type: #{stationExperimentTypeObject.name}">
+                <h:outputText value="#{stationExperimentTypeObject.name}"/>
+            </h:outputLink>
+        </p:column>
+
+        <p:column headerText="Actions" >
+            <div class="actionLink">
+                <p:commandLink action="#{experimentStationController.deleteExperimentType(stationExperimentTypeObject)}"
+                               styleClass="ui-icon ui-icon-trash" title="Delete" 
+                               update="stationExperimentTypeListDataTable"
+                               rendered="#{loginController.admin}" 
+                               immediate="true"/>
+            </div>
+        </p:column>
+
+    </p:dataTable>
+
+</ui:composition>

src/java/DmWebPortal/web/views/experimentStation/private/stationExperimentTypeSelectDataTable.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:ui="http://java.sun.com/jsf/facelets"
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:h="http://xmlns.jcp.org/jsf/html">
+
+    <ui:fragment>
+        <p:dataTable id="stationExperimentTypeSelectDataTable" 
+                     widgetVar="stationExperimentTypeSelectDataTableWidget"
+                     var="experimentTypeObject" 
+                     value="#{experimentTypeController.selectDataModel}" 
+                     rowKey="#{experimentTypeObject.name}"
+                     selectionMode="single"
+                     selection="#{experimentStationController.currentExperimentType}"
+                     paginator="true"
+                     paginatorAlwaysVisible="true"
+                     rows="#{experimentTypeController.selectNumberOfItemsPerPage}"
+                     emptyMessage="No available records found.">
+            
+            <p:column sortBy="#{experimentTypeObject.name}" headerText="Name"
+                      filterBy="#{experimentTypeObject.name}">
+                <h:outputText value="#{experimentTypeObject.name}"/>
+            </p:column>
+
+        </p:dataTable>
+    </ui:fragment>
+</ui:composition>
+

src/java/DmWebPortal/web/views/experimentStation/view.xhtml

@@ -35,9 +35,9 @@
                         </div>
                     </p:tab>
 
-                    <p:tab title="Station Experiments">
+                    <p:tab title="Experiment Types">
                         <div class="middleCenterLeftContent">
-                            <ui:include src="private/stationExperimentListDataTable.xhtml"/>
+                            <ui:include src="private/stationExperimentTypeListDataTable.xhtml"/>
                         </div>
                     </p:tab>
                     
@@ -46,6 +46,13 @@
                             <ui:include src="private/stationManagerListDataTable.xhtml"/>
                         </div>
                     </p:tab>
+                    
+                    <p:tab title="Station Experiments">
+                        <div class="middleCenterLeftContent">
+                            <ui:include src="private/stationExperimentListDataTable.xhtml"/>
+                        </div>
+                    </p:tab>
+                    
                 </p:accordionPanel>
 
                 <div class="actionButton">

src/java/DmWebPortal/web/views/storage/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">
+
+    <title>Storage Edit</title>
+
+    <ui:composition template="../../templates/dmViewTemplate.xhtml">
+        <ui:define name="middleCenter">
+            <div class="pageTitle">
+                <h1>Add Storage</h1>
+            </div>
+
+            <h:form id="addStorageForm">
+
+                <ui:include src="private/storageCreatePanelGrid.xhtml"/>
+
+                <p/>
+                <div class="actionButton">
+                    <p:commandButton action="#{storageController.create()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
+                    <p:commandButton action="#{storageController.prepareList()}" immediate="true" value="Cancel" alt="Cancel" icon="ui-icon-cancel"/>
+                </div>
+            </h:form>
+            <h:outputScript library="js" name="common/forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
+            <h:outputScript library="js" name="common/forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
+
+        </ui:define>
+    </ui:composition>
+</ui:composition>
+
+

src/java/DmWebPortal/web/views/storage/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">
+
+    <title>Storage Edit</title>
+
+    <ui:composition template="../../templates/dmViewTemplate.xhtml">
+        <ui:define name="middleCenter">
+            <h:form id="editStorageForm">
+
+                <div class="middleCenterLeftContent">
+                    <div class="pageTitle">
+                        <h1>Edit Storage</h1>
+                    </div>
+
+                    <ui:include src="private/storageEditPanelGrid.xhtml"/>
+                    <p/>
+                    <div class="actionButton">
+                        <p:commandButton action="#{storageController.update()}" value="Save" alt="Save" icon="ui-icon-check"/>
+                        <p:commandButton action="#{storageController.prepareList()}" immediate="true" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
+                    </div>
+                </div>
+
+            </h:form>
+            <h:outputScript library="js" name="common/forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
+            <h:outputScript library="js" name="common/forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
+            <h:outputScript library="js" name="common/forwardHome.js" rendered="#{!storageController.entitySelected}"/>    
+
+        </ui:define>
+    </ui:composition>
+</ui:composition>
+
+

src/java/DmWebPortal/web/views/storage/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">
+
+    <title>Storages List</title>
+
+    <ui:composition template="../../templates/dmViewTemplate.xhtml">
+    <ui:define name="middleCenter">
+        <div class="pageTitle">
+            <h1>Storages</h1>
+        </div>
+
+        <h:form id="viewStorageListForm">
+            <ui:param name="entityController" value="#{storageController}"/>
+            <ui:include src="../common/commonListActionButtons.xhtml"/>
+
+            <h:panelGroup>  
+                <ui:include src="private/storageListDataTable.xhtml"/>
+            </h:panelGroup>
+
+            <ui:include src="private/storageDestroyDialog.xhtml"/>
+
+        </h:form>
+            <h:outputScript library="js" name="common/forwardNotLoggedIn.js" rendered="#{!loginController.loggedIn}"/>    
+            <h:outputScript library="js" name="storage/loadFilters.js"/>
+
+    </ui:define>
+    </ui:composition>
+</ui:composition>

src/java/DmWebPortal/web/views/storage/private/storageCreatePanelGrid.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">
+
+    <ui:param name="storageObject" value="#{storageController.selected}"/>
+
+    <p:panelGrid columns="2" styleClass="createEntityDetails">
+
+        <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
+        <h:inputText id="name" value="#{storageObject.name}" title="Name" styleClass="entityDataEmphasizedInputText"/> 
+
+        <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
+        <h:inputText id="description" value="#{storageObject.description}" title="Description" styleClass="entityDataInputText"/>        
+
+    </p:panelGrid>
+
+</ui:composition>
+
+

src/java/DmWebPortal/web/views/storage/private/storageDestroyDialog.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="storageDestroyDialog" message="Delete storage #{storageController.getCurrentEntityInstanceName()}?"
+                     header="Delete Experiment Type" severity="alert" widgetVar="storageDestroyDialogWidget"
+                     styleClass="dialog">
+        <p:commandButton value="Yes" oncomplete="storageDestroyDialogWidget.hide()" action="#{storageController.destroy()}"/>
+        <p:commandButton value="No" onclick="PF('storageDestroyDialogWidget').hide()" type="button" />
+    </p:confirmDialog>  
+</ui:composition>
+
+

src/java/DmWebPortal/web/views/storage/private/storageEditPanelGrid.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">
+
+    <ui:param name="storageObject" value="#{storageController.selected}"/>
+
+    <p:panelGrid columns="2" styleClass="editEntityDetails"> 
+
+        <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
+        <h:outputText id="name" value="#{storageObject.name}" title="Name" styleClass="entityDataEmphasizedText"/> 
+
+        <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
+        <h:inputText id="description" value="#{storageObject.description}" title="Description" styleClass="entityDataInputText"/>     
+        
+    </p:panelGrid>
+</ui:composition>
+
+

src/java/DmWebPortal/web/views/storage/private/storageListDataTable.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">
+
+    <p:dataTable id="storageListDataTable"                              
+                 var="storageObject" 
+                 value="#{storageController.listDataModel}" 
+                 filteredValue="#{storageController.filteredObjectList}"
+                 paginator="true" 
+                 paginatorAlwaysVisible="false" 
+                 rows="#{storageController.displayNumberOfItemsPerPage}"
+                 widgetVar="storageListWidget" 
+                 emptyMessage="No storage systems found.">
+
+        <p:column sortBy="#{storageObject.id}" headerText="Id" >
+            <h:outputText value="#{storageObject.id}"/>
+        </p:column>
+
+        <p:column sortBy="#{storageObject.name}" headerText="Name" 
+                  filterBy="#{storageObject.name}" filterMatchMode="contains" >
+            <h:outputText value="#{storageObject.name}"/>
+        </p:column>
+
+        <p:column sortBy="#{storageObject.description}" headerText="Description" 
+                  filterBy="#{storageObject.description}" filterMatchMode="contains">
+            <h:outputText value="#{storageObject.description}"/>
+        </p:column>
+        
+        <p:column headerText="Actions" >
+            <div class="actionLink">
+                <p:commandLink action="#{storageController.prepareView(storageObject)}" styleClass="ui-icon ui-icon-info" title="View"/>
+                <p:commandLink action="#{storageController.prepareEdit(storageObject)}" rendered="#{loginController.admin}" styleClass="ui-icon ui-icon-pencil" title="Edit"/>
+                <p:commandLink oncomplete="PF('storageDestroyDialogWidget').show()" rendered="#{loginController.admin}" styleClass="ui-icon ui-icon-trash" title="Delete" update="@form">
+                    <f:setPropertyActionListener value="#{storageObject}" target="#{storageController.current}"/>
+                </p:commandLink>
+            </div>
+        </p:column>
+    </p:dataTable>
+
+</ui:composition>

src/java/DmWebPortal/web/views/storage/private/storageViewPanelGrid.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">
+
+    <ui:param name="storageObject" value="#{storageController.selected}"/>
+
+    <p:panelGrid columns="2" styleClass="viewEntityDetails">
+
+        <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
+        <h:outputText id="name" value="#{storageObject.name}" title="Name" styleClass="entityDataEmphasizedText"/>
+
+        <h:outputLabel for="description" value="Description" styleClass="entityDataLabel"/>
+        <h:outputText id="description" value="#{storageObject.description}" title="Description" styleClass="entityDataText"/>
+
+    </p:panelGrid>
+
+</ui:composition>
+
+

src/java/DmWebPortal/web/views/storage/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">
+
+    <f:metadata>
+        <f:event type="preRenderComponent" listener="#{storageController.processViewRequestParams}"/>
+    </f:metadata>
+    
+    <title>Storage View</title>
+
+    <ui:composition template="../../templates/dmViewTemplate.xhtml">
+        <ui:define name="middleCenter">
+            <h:form id="viewStorageForm">
+
+                <div class="middleCenterLeftContent">
+                    <div class="pageTitle">
+                        <h1>Storage Details</h1>
+                    </div>
+
+                    <ui:include src="private/storageViewPanelGrid.xhtml"/>
+
+                    <p/>
+                    <ui:param name="storageObject" value="#{storageController.selected}"/>
+                    <div class="actionButton">
+                        <p:commandButton action="#{storageController.prepareEdit(storageObject)}" rendered="#{loginController.admin}" value="Edit" alt="Edit" icon="ui-icon-pencil"/>
+                        <p:commandButton onclick="PF('storageDestroyDialogWidget').show();" rendered="#{loginController.admin}" value="Delete" alt="Delete" icon="ui-icon-trash">
+                            <f:setPropertyActionListener value="#{storageObject}" target="#{storageController.current}"/>
+                        </p:commandButton>  
+                        <p:commandButton action="#{storageController.followBreadcrumbOrPrepareList()}" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
+                    </div>
+
+                    <ui:include src="private/storageDestroyDialog.xhtml"/>
+
+                </div>
+
+            </h:form>
+            <h:outputScript library="js" name="common/forwardNotLoggedIn.js" rendered="#{!loginController.loggedIn}"/>    
+            <h:outputScript library="js" name="common/forwardHome.js" rendered="#{!storageController.entitySelected}"/>    
+
+        </ui:define>
+    </ui:composition>
+
+</ui:composition>
+
+