Compare revisions

25038bbf · 25038bbf · 25038bbf · 25038bbf · 25038bbf · 25038bbf
--- a/src/java/DmWebPortal/web/WEB-INF/faces-config.xml
+++ b/src/java/DmWebPortal/web/WEB-INF/faces-config.xml
+<?xml version='1.0' encoding='UTF-8'?>
+<faces-config version="2.2"
+    xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
+    <application>
+        <resource-bundle>
+            <base-name>/resources</base-name>
+            <var>resources</var>
+        </resource-bundle>
+    </application>
+<validator>
+    <validator-id>checkboxValidator</validator-id>
+    <validator-class>gov.anl.aps.dm.portal.controllers.CheckboxValidator</validator-class>
+</validator>
+</faces-config>
--- a/src/java/DmWebPortal/web/WEB-INF/glassfish-web.xml
+++ b/src/java/DmWebPortal/web/WEB-INF/glassfish-web.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
+<glassfish-web-app error-url="">
+  <context-root>/dm</context-root>
+  <class-loader delegate="true"/>
+  <jsp-config>
+    <property name="keepgenerated" value="true">
+      <description>Keep a copy of the generated servlet class' java code.</description>
+    </property>
+  </jsp-config>
+</glassfish-web-app>
--- a/src/java/DmWebPortal/web/WEB-INF/web.xml
+++ b/src/java/DmWebPortal/web/WEB-INF/web.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+    <context-param>
+        <param-name>javax.faces.PROJECT_STAGE</param-name>
+        <param-value>Development</param-value>
+    </context-param>
+    <servlet>
+        <servlet-name>Faces Servlet</servlet-name>
+        <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet-mapping>
+        <servlet-name>Faces Servlet</servlet-name>
+        <url-pattern>*.xhtml</url-pattern>
+    </servlet-mapping>
+    <session-config>
+        <session-timeout>
+            30
+        </session-timeout>
+    </session-config>
+    <welcome-file-list>
+        <welcome-file>index.xhtml</welcome-file>
+    </welcome-file-list>
+</web-app>
--- a/src/java/DmWebPortal/web/index.xhtml
+++ b/src/java/DmWebPortal/web/index.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:h="http://xmlns.jcp.org/jsf/html">
+    <h:body>
+       <meta http-equiv="Refresh" content="0; URL=views/login.xhtml"/>    
+    </h:body>
+</html>
+
--- a/src/java/DmWebPortal/web/resources/css/jsfcrud.css
+++ b/src/java/DmWebPortal/web/resources/css/jsfcrud.css
+root { 
+    display: block;
+}
+
+body {
+    font-family: Arial, Helvetica, sans-serif;
+    color: #3a4f54;
+    background-color: #f2f4f7;
+    font-size: small;
+}
+
+a {
+    color: #e33b06;
+}
+
+table {
+    empty-cells: show;
+}
+
+form.jsfcrud_list_form th, td th {
+    font-size: x-small;
+    color: #4e6a71;
+    border-top-style: solid;
+    border-bottom-style: solid;
+    border-left-style: solid;
+    border-right-style: solid;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-top-color: #b2d5d6;
+    border-bottom-color: #b2d5d6;
+    border-left-color: #90b4bd;
+    border-right-color: #90b4bd;
+    letter-spacing: 3px;
+    text-align: left;
+    padding-top: 6px;
+    padding-bottom: 6px;
+    padding-left: 6px;
+    padding-right: 6px;
+    background-color: #b2d5d6;
+}
+
+td {
+    vertical-align: top;
+    padding-bottom: 8px;
+    font-size: small;
+}
+
+form.jsfcrud_list_form td, td td {
+    border-top-style: solid;
+    border-bottom-style: solid;
+    border-left-style: solid;
+    border-right-style: solid;
+    border-top-width: 1px;
+    border-bottom-width: 1px;
+    border-left-width: 1px;
+    border-right-width: 1px;
+    border-top-color: #b2d5d6;
+    border-bottom-color: #b2d5d6;
+    border-left-color: #b2d5d6;
+    border-right-color: #b2d5d6;
+    vertical-align: baseline;
+    padding-bottom: 0px;
+}
+
+tr.jsfcrud_odd_row {
+    background-color: #fefeff;
+    color: #4e6a71;
+}
+
+
+tr.jsfcrud_even_row {
+    background-color: #eff5fa;
+    color: #4e6a71;
+}
+
+#busyImage {
+    position: absolute;
+    left: 50%;
+    top: 50%;
+}
--- a/src/java/DmWebPortal/web/resources/css/login.css
+++ b/src/java/DmWebPortal/web/resources/css/login.css
+body {
+    background-color: #f2f4f7;
+    font-size: 12px;
+    font-family: Verdana, "Verdana CE",  Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
+    color: #000000;
+    margin: 0px;
+}
+
+a:link, a:visited {
+    color: #4e80b6;
+    font-weight: bold;
+}
+
+a:link:hover, a:visited:hover  {
+    color: #6da5d8;
+    font-weight: bold;
+}
+
+ #top {
+     position: relative;
+     color: white;
+
+     /* IE10 */
+     background-image: -ms-linear-gradient(top, #4e80b6 0%, #6da5d8 100%);
+     /* Mozilla Firefox */
+     background-image: -moz-linear-gradient(top, #4e80b6 0%, #6da5d8 100%);
+     /* Opera */
+     background-image: -o-linear-gradient(top, #4e80b6 0%, #6da5d8 100%);
+     /* Webkit (Safari/Chrome 10) */
+     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #4e80b6), color-stop(1, #6da5d8));
+     /* Webkit (Chrome 11+) */
+     background-image: -webkit-linear-gradient(top, #4e80b6 0%, #6da5d8 100%);
+     /* Proposed W3C Markup */
+     background-image: linear-gradient(top, #4e80b6 0%, #6da5d8 100%);
+     /* IE6-9 */
+     filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#4e80b6', endColorstr='#6da5d8');
+     padding: 15px;
+     margin: 0px 0px 0px 0px;
+     height: 75px;
+ }
+
+#middle {
+    position: relative;
+    background-color: #f2f4f7;
+    padding: 5px;
+    margin: 0px 0px 0px 0px;
+    height: 100%;
+}
+
+#bottom {
+    position: relative;
+    background-color: #f2f4f7;
+    padding: 5px;
+    margin: 10px 0px 0px 10px;
+    height: 100%;
+    float: left;
+}
+
+.middleLeftContent {
+    float: left;
+    margin-left: 35px;
+    vertical-align: central;
+    text-align: center;
+}
+
+.middleRightContent {
+    font-size: 14px;
+    font-weight: normal;
+    vertical-align: central;
+    margin-top: 100px;
+    background-color: #f2f4f7;
+    color: saddlebrown;
+    size: auto;
+}
+
+.topLeftContent {
+    float: left;
+    width: 150px;
+    margin-left: 35px;
+    vertical-align: central;
+    text-align: center;
+}
+
+.topCenterContent {
+    position: relative;
+    vertical-align: central;
+    text-align: center;
+    margin: 0px 170px 0px 170px;
+}
+
+.topRightContent {
+    float: right;
+    width: 170px;
+    vertical-align: central;
+    text-align: center;
+    font-size: 10px;
+}
+
+.login {
+    vertical-align: central;
+    text-align: center;
+    margin-left: auto;
+    margin-right: auto;
+    background: #f2f4f7;
+    padding: 100px;
+}
+
+input {
+    background: #f2f4f7;
+    box-shadow: 0px 3px 5px #d5d5d5;
+}
+
+
+h1 {
+    font-family: Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
+    font-size:  24px;
+    font-weight: bold;
+    margin: 20px;
+    padding-bottom: 0px;
+    color: #f2f4f7;
+    vertical-align: middle;
+}
+
+.pageTitle h2 {
+    font-family: Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
+    font-size:  20px;
+    font-weight: bold;
+    margin: 0px;
+    padding-bottom: 40px;
+    color: #4e80b6;
+    vertical-align: middle;
+    text-align: left;
+}
+
+.sectionText {
+    font-size: 14px;
+    font-weight: normal;
+    color: #4e80b6;
+}
+
+.ui-messages-info, .ui-message-info {
+    background-color: #f2f4f7;
+    color: saddlebrown;
+    border: #f2f4f7;
+    size: auto;
+}
+
+.ui-messages-warn, .ui-message-warn {
+    background-color: #f2f4f7;
+    color: saddlebrown;
+    border: #f2f4f7;
+    size: auto;
+    drop-initial-size: auto;
+}
+
+.ui-messages-error, .ui-message-error {
+    background-color: #f2f4f7;
+    color: saddlebrown;
+    border: #f2f4f7;
+    size: auto;
+}
--- a/src/java/DmWebPortal/web/resources/css/portal.css
+++ b/src/java/DmWebPortal/web/resources/css/portal.css
+body {
+    background-color: #f2f4f7;
+    font-size: 12px;
+    font-family: Verdana, "Verdana CE",  Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
+    color: #000000;
+    margin: 0px;
+}
+
+a:link, a:visited {
+    color: #4e80b6;
+    font-weight: bold;
+}
+
+a:link:hover, a:visited:hover  {
+    color: #6da5d8;
+    font-weight: bold;
+}
+
+#top {
+    position: relative;
+    color: white;
+
+    /* IE10 */
+    background-image: -ms-linear-gradient(top, #4e80b6 0%, #6da5d8 100%);
+    /* Mozilla Firefox */
+    background-image: -moz-linear-gradient(top, #4e80b6 0%, #6da5d8 100%);
+    /* Opera */
+    background-image: -o-linear-gradient(top, #4e80b6 0%, #6da5d8 100%);
+    /* Webkit (Safari/Chrome 10) */
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0, #4e80b6), color-stop(1, #6da5d8));
+    /* Webkit (Chrome 11+) */
+    background-image: -webkit-linear-gradient(top, #4e80b6 0%, #6da5d8 100%);
+    /* Proposed W3C Markup */
+    background-image: linear-gradient(top, #4e80b6 0%, #6da5d8 100%);
+    /* IE6-9 */
+    filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#4e80b6', endColorstr='#6da5d8');
+
+    padding: 15px;
+    margin: 0px 0px 0px 0px;
+    height: 75px;
+}
+
+#menu {
+    background-color: #6da5d8;
+}
+
+#middle {
+}
+
+#bottom {
+    position: relative;
+    background-color: #6da5d8;
+    padding: 0px;
+    margin: 0px 0px 0px 0px;
+    height: 100%
+}
+
+.topLeftContent {
+    float: left;
+    width: 170px;
+    vertical-align: central;
+    text-align: center;
+    margin-left: 35px;
+}
+
+.topCenterContent {
+    position: relative;
+    vertical-align: central;
+    text-align: center;
+    margin: 0px 170px 0px 170px;
+}
+
+.topRightContent {
+    float: right;
+    width: 170px;
+    vertical-align: central;
+    text-align: left;
+    font-size: 10px;
+}
+
+.menubar {
+    background: #6da5d8;
+}
+
+.menuContent {
+    position: relative;
+    vertical-align: central;
+    text-align: left;
+    margin: 0px 0px 0px 0px;
+    color: white;
+    background-color: #6da5d8;
+}
+
+.menuLeftContent {
+    float: left;
+    width: 50px;
+    height: fit-content;
+    text-align: center;
+    background-color: #6da5d8;
+}
+
+.menuCenterContent {
+    position: relative;
+    vertical-align: central;
+    text-align: left;
+    margin: 0px 0px 0px 0px;
+    color: white;
+    background-color: #6da5d8;
+}
+
+.menuRightContent {
+    float: right;
+    width: 50px;
+    vertical-align: central;
+    text-align: center;
+    background-color: #6da5d8;
+}
+
+.middleLeftContent {
+    float: left;
+    width: 50px;
+    height: fit-content;
+    text-align: center;
+    background-color: #6da5d8;
+}
+
+.middleCenterContent {
+    position: relative;
+    vertical-align: central;
+    text-align: left;
+    margin: 50px;
+    color: white;
+}
+
+.middleCenterLeftContent {
+    float: left;
+    margin-right: 2%;
+    margin-bottom: 2%;
+}
+
+.middleCenterRightContent {
+    float: left;
+    margin-bottom: 2%;
+}
+
+.middleRightContent {
+    float: right;
+    width: 50px;
+    vertical-align: central;
+    text-align: center;
+    background-color: #6da5d8;
+}
+
+.actionButton {
+    margin-top: 5px;
+    margin-bottom: 5px;
+    margin-right: 5px;
+    border: 0px;
+}
+
+.actionButtonRight {
+    float: right;
+    margin-right: 0px;
+    margin-left: 5px;
+}
+
+.actionLink {
+    display: none;
+}
+
+.entityDataLabel {
+    font-weight: bold;
+}
+
+.entityDataEmphasizedLabel {
+    font-weight: bold;
+    font-size: 105%;
+}
+
+.entityDataText {
+    font-weight: normal;
+    float: left;
+}
+
+.entityDataEmphasizedText {
+    font-weight: bold;
+    font-size: 105%;
+}
+
+.entityDataSelectOne {
+    font-weight: normal;
+}
+
+.entityDataSelectMany {
+    font-weight: normal;
+    height: 75px;
+}
+
+.entityDataError {
+    font-weight: bold;
+}
+
+.createEntityDetails td:nth-child(1) {
+    vertical-align: top;
+}
+
+.createEntityDetails td:nth-child(2) {
+    width: 300px;
+}
+
+.viewEntityDetails td:nth-child(1) {
+    vertical-align: top;
+    width: 125px;
+}
+
+.viewEntityDetails td:nth-child(2) {
+    vertical-align: top;
+    width: 300px;
+}
+
+.editEntityDetails td:nth-child(1) {
+    vertical-align: top;
+}
+
+.editEntityDetails td:nth-child(2) {
+    width: 300px;
+}
+
+.entityLogList td:last-child {
+    width: 195px;
+}
+
+.commandLink {
+
+}
+
+tr:hover .actionLink {
+    display: inline-block;
+}
+
+.objectPanel {
+    display: inline-block;
+}
+
+.statusPanel {
+    display: inline-block;
+    white-space: pre;
+}
+
+.queryPanel {
+    width: 100%;
+}
+
+.queryInput {
+    width: 200px;
+}
+
+.queryColumn {
+    text-align: center;
+}
+
+.dialog {
+    background: #6da5d8;
+    box-shadow: 0px 3px 5px #d5d5d5;    
+    vertical-align: central;
+    text-align: center;
+    margin: 0;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+.dialogDataLabel {
+    float: left
+}
+
+.htmlPreserve {
+    white-space: pre;
+}
+
+input, textarea {
+    background: #f2f4f7;
+    box-shadow: 0px 3px 5px #d5d5d5;
+    width: 300px;
+}
+
+.loginInput input {
+    width: 200px;
+}
+
+.cellSelect {
+    width: 150px;
+}
+
+.longCellSelect {
+    width: 300px;
+}
+
+.veryLongCellSelect {
+    width: 450px;
+}
+
+.cellInput {
+    width: 125px;
+}
+
+.shortCellInput {
+    width: 75px;
+}
+
+.longCellInput {
+    width: 250px;
+}
+
+.threeDigitCellInput {
+    width: 20px;
+}
+
+.fourDigitCellInput {
+    width: 30px;
+}
+
+select {
+    width: 150px;
+}
+
+h1 {
+    font-family: Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
+    font-size:  24px;
+    font-weight: bold;
+    margin: 20px;
+    padding-bottom: 0px;
+    color: #f2f4f7;
+    vertical-align: middle;
+}
+
+.pageTitle h1 {
+    font-family: Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
+    font-size:  20px;
+    font-weight: bold;
+    margin: 0px;
+    padding-bottom: 40px;
+    color: #4e80b6;
+    vertical-align: middle;
+    text-align: left;
+}
+
+.sectionTitle h2 {
+    font-family: Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
+    font-size:  16px;
+    font-weight: bold;
+    margin: 0px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+    color: #4e80b6;
+    vertical-align: middle;
+    text-align: left;
+}
+
+.sectionText {
+    font-size: 14px;
+    font-weight: normal;
+    color: #4e80b6;
+}
+
+h2 {
+    font-size:  20px;
+    font-weight: bold;
+    color: #4e80b6;
+}
+
+.shortFilterColumn {
+    width: 40px;
+}
+
+.ui-accordion .ui-accordion-content {
+    background: #f2f4f7;    
+}
+
+.ui-panelgrid tr, .ui-panelgrid td {
+    background: #f2f4f7;
+    border: none;
+    font-weight: bold;
+}
+
+.ui-menu, .ui-menuitem, .ui-menu .ui-menu-child {
+    background: #6da5d8;
+    color: white;
+    margin-top: 0px;
+}
+
+.ui-menuitem-text {
+    color: white;
+    font-weight: bold;
+}
+
+.ui-growl-item-container {
+    vertical-align: middle;
+}
+
+.ui-tooltip {
+    text-wrap: normal;
+}
+
+.ui-icon {
+    display: inline-block;
+}
+
+.ui-dialog-footer, .ui-dialog-buttonpane, .ui-dialog .ui-dialog-buttonpane {
+    background: #6da5d8;
+    text-align: center;
+}
+
+.ui-confirm-dialog-message {
+    color: white;
+}
+
+.ui-column-dnd-bottom {
+    display: none;
+}
+
+.ui-icon-excel {
+    background-image: url(../../resources/images/excel.ico) !important;
+    background-repeat: no-repeat;
+    background-position: left
+}
+
+.ui-icon-pdf {
+    background-image: url(../../resources/images/pdf.ico) !important;
+    background-repeat: no-repeat;
+    background-position: left
+}
+
+.ui-datatable-resizable {
+    table-layout: auto !important;
+}
+
+.ui-datatable {
+    table-layout: auto !important;
+}
+
+.ui-datatable-scrollable {
+    table-layout: fixed !important;
+}
+
+.ui-datatable table, .ui-datatable-resizable table {
+    table-layout: auto !important;
+}
+
+.ui-datatable-scrollable table {
+    table-layout: fixed !important;
+}
\ No newline at end of file
--- a/src/java/DmWebPortal/web/resources/images/AnlLogo167x75.png
+++ b/src/java/DmWebPortal/web/resources/images/AnlLogo167x75.png
--- 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/common/forwardNotAuthorized.js
+++ b/src/java/DmWebPortal/web/resources/js/common/forwardNotAuthorized.js
+  window.location = "/dm/views/home.xhtml";
+
--- a/src/java/DmWebPortal/web/resources/js/common/forwardNotLoggedin.js
+++ b/src/java/DmWebPortal/web/resources/js/common/forwardNotLoggedin.js
+  window.location = "/dm/views/login.xhtml";
\ No newline at end of file
--- a/src/java/DmWebPortal/web/templates/dmAdminOnlyTemplate.xhtml
+++ b/src/java/DmWebPortal/web/templates/dmAdminOnlyTemplate.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:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
+    <h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
+    <ui:include src="/templates/contentViewTemplate4x3.xhtml"/>
+</html>
\ No newline at end of file
--- a/src/java/DmWebPortal/web/templates/dmRestrictedTemplate.xhtml
+++ b/src/java/DmWebPortal/web/templates/dmRestrictedTemplate.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:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
+    <h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin and experimentController.isRestricted()}"/>
+    <ui:include src="/templates/contentViewTemplate4x3.xhtml"/>
+</html>
\ No newline at end of file
--- a/src/java/DmWebPortal/web/templates/dmViewTemplate.xhtml
+++ b/src/java/DmWebPortal/web/templates/dmViewTemplate.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="/dm/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="Administrator" rendered="#{loginController.admin}"/>
+
+                    </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="/views/home.xhtml" icon="ui-icon-home"/>
+                                    <p:menuitem value="Experiments" url="/views/experiment/list.xhtml"/> 
+                                    <p:menuitem value="Users" url="/views/userInfo/list.xhtml"/>
+                                    <p:menuitem value="Experiment Types" url="/views/experimentType/list.xhtml"/>
+                                    <p:menuitem value="Role Types" url="/views/roleType/list.xhtml"/>
+                                    <p:menuitem value="Login" onclick="PF('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 id="middleRight" class="middleRightContent">
+                        <ui:insert name="middleRight">
+                        </ui:insert>
+                    </div>
+                    <div id="middleCenter" class="middleCenterContent">
+                        <ui:insert name="middleCenter">
+                        </ui:insert>
+                    </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>
\ No newline at end of file
--- 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">
+
+    <ui:param name="entityTypeName" value="#{entityController.entityTypeName}"/>
+
+    <div class="actionButton">
+        <p:commandButton id="#{entityTypeName}AddButton" action="#{entityController.prepareCreate()}" rendered="#{loginController.admin}" 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/experiment/create.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/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">
+    
+    <h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
+    <h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin}"/>
+    <ui:composition template="../../templates/dmViewTemplate.xhtml">
+    <ui:define name="middleCenter">
+        <div class="pageTitle">
+            <h1>Add Experiment</h1>
+        </div>
+
+        <h:form id="addExperimentForm">
+
+            <ui:include src="experimentCreatePanelGrid.xhtml"/>
+
+            <p/>
+            <div class="actionButton">
+                <p:commandButton action="#{experimentController.create()}" value="Save" alt="Save" icon="ui-icon-check" update="@form"/>
+                <p:commandButton action="#{experimentController.prepareList()}" immediate="true" value="Cancel" alt="Cancel" icon="ui-icon-cancel"/>
+            </div>
+        </h:form>
+
+    </ui:define>
+    </ui:composition>
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/experiment/edit.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/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">
+
+    <h:outputScript library="js/common" name="forwardNotLoggedin.js" rendered="#{!loginController.loggedIn}"/>
+    <h:outputScript library="js/common" name="forwardNotAuthorized.js" rendered="#{!loginController.admin and experimentController.isRestricted()}"/>
+    <ui:composition template="../../templates/dmViewTemplate.xhtml">
+    <ui:define name="middleCenter">
+        <h:form id="editExperimentForm">
+
+                <div class="pageTitle">
+                    <h1>Edit Experiment #{experimentController.current.name}</h1>
+                </div>
+
+            <p:accordionPanel multiple="true" dynamic="true" cache="false" activeIndex="0,1"  >
+                <p:tab title="Experiment Properties" id="detailsTab" >
+
+                    <div class="middleCenterLeftContent">
+                        <ui:include src="experimentEditPanelGrid.xhtml"/>
+                    </div>
+
+                </p:tab>
+
+                <p:tab title="Experiment Users" id="usersTab">                
+                    <ui:include src="experimentUsersEditDataTable.xhtml"/>
+                </p:tab>
+            </p:accordionPanel>
+                
+                <p/>
+                <div class="actionButton">
+                    <p:commandButton  action="#{experimentController.update()}" actionListener="#{experimentController.updateRemovedExperimentRoles()}" value="Save" alt="Save" icon="ui-icon-check"/>
+                    <p:commandButton action="#{experimentController.prepareList()}" immediate="true" value="Return" alt="Return" icon="ui-icon-arrowreturnthick-1-w"/>
+                </div>
+
+                <ui:include src="experimentUserRemoveDialog.xhtml" />
+         </h:form>
+    </ui:define>
+    </ui:composition>
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/experimentCreatePanelGrid.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:f="http://java.sun.com/jsf/core"        
+                xmlns:p="http://primefaces.org/ui"
+                xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
+
+    <ui:param name="experimentObject" value="#{experimentController.selected}"/>
+    
+    <p:panelGrid columns="2" >
+
+        <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
+        <h:inputText id="name" value="#{experimentObject.name}" title="Name" styleClass="entityDataEmphasizedText"/>
+
+        <h:outputLabel for="experimentType" value="Experiment Type" styleClass="entityDataLabel"/>
+        <p:selectOneMenu id="experimentType" value="#{experimentObject.experimentType}" styleClass="entityDataText">
+            <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="description" value="Description" styleClass="entityDataLabel"/>
+        <h:inputText id="description" value="#{experimentObject.description}" title="Description" styleClass="entityDataText"/>      
+
+        <h:outputLabel for="startDate" value="Start Date"/>
+        <p:calendar id="startDate" value="#{experimentObject.startDate}" mode="popup" showOn="button" />
+        
+        <h:outputLabel for="endDate" value="End Date" />
+        <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" />
+        
+    </p:panelGrid>
+
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/experiment/experimentDestroyDialog.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/experimentDestroyDialog.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="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" />
+    </p:confirmDialog>  
+</ui:composition>
+
+
--- a/src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.xhtml
+++ b/src/java/DmWebPortal/web/views/experiment/experimentEditPanelGrid.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:f="http://xmlns.jcp.org/jsf/core">
+
+    <ui:param name="experimentObject" value="#{experimentController.current}"/>
+    <ui:param name="isFieldWriteable" value="#{loginController.loggedIn}"/>
+
+    <p:panelGrid columns="2" > 
+
+        <h:outputLabel for="name" value="Name" styleClass="entityDataEmphasizedLabel"/>
+        <h:outputText id="name" value="#{experimentObject.name}" title="Name" styleClass="entityDataEmphasizedText"/>
+
+        <h:outputLabel for="experimentType" value="Experiment Type" styleClass="entityDataLabel"/>
+        <p:selectOneMenu id="experimentType" value="#{experimentObject.experimentType}" styleClass="entityDataText">
+            <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="description" value="Description" styleClass="entityDataLabel"/>
+        <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}" mode="popup" showOn="button" />
+        
+        <h:outputLabel for="endDate" value="End Date" styleClass="entityDataLabel"/>
+        <p:calendar id="endDate" value="#{experimentObject.endDate}" mode="popup" showOn="button" />
+
+    </p:panelGrid>
+
+
+</ui:composition>
No results found