Skip to content
Snippets Groups Projects
Commit 418a89b9 authored by Barbara B. Frosik's avatar Barbara B. Frosik
Browse files

Redirected from index.xhtml to home.xhtml 

changed the directory structure - removed "faces" directory from directory tree
parent 61a7d2bd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 127 additions and 14 deletions
src/java/DmWebPortal/web/WEB-INF/web.xml
+ 2
− 2
View file @ 418a89b9
......@@ -11,7 +11,7 @@
</servlet>
<servlet-mapping>
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>/faces/*</url-pattern>
<url-pattern>*.xhtml</url-pattern>
</servlet-mapping>
<session-config>
<session-timeout>
......@@ -19,6 +19,6 @@
</session-timeout>
</session-config>
<welcome-file-list>
<welcome-file>faces/index.xhtml</welcome-file>
<welcome-file>index.xhtml</welcome-file>
</welcome-file-list>
</web-app>
src/java/DmWebPortal/web/index.xhtml
+ 1
− 5
View file @ 418a89b9
......@@ -2,12 +2,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:head>
<title>Facelet Title</title>
<h:outputStylesheet name="css/jsfcrud.css"/>
</h:head>
<h:body>
Hello from Facelets
<meta http-equiv="Refresh" content="0; URL=views/home.xhtml"/>
</h:body>
</html>
src/java/DmWebPortal/web/resources/css/portal.css
+ 1
− 1
View file @ 418a89b9
body {
background-color: #f2f4f7;
background-color: #b2d5d6;
font-size: 12px;
font-family: Verdana, "Verdana CE", Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
color: #000000;
......
src/java/DmWebPortal/web/templates/contentViewTemplate4x3.xhtml
+ 5
− 5
View file @ 418a89b9
......@@ -17,7 +17,7 @@
<div id="top" class="topContent">
<div id="topLeft" class="topLeftContent">
<ui:insert name="topLeft">
<h:graphicImage alt="ANL Logo" url="../../resources/images/AnlLogo167x75.png"/>
<h:graphicImage alt="ANL Logo" url="/resources/images/AnlLogo167x75.png"/>
</ui:insert>
</div>
<div>
......@@ -54,9 +54,9 @@
<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="Home" url="/views/home.xhtml" icon="ui-icon-home"/>
<p:menuitem value="Experiment Types" url="/views/experimentType/list.xhtml"/>
<p:menuitem value="Users" url="/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>
......@@ -113,4 +113,4 @@
</h:form>
</h:body>
</html>
</html>
\ No newline at end of file
src/java/DmWebPortal/web/templates/homeViewTemplate.xhtml 0 → 100644
+ 117
− 0
View file @ 418a89b9
<?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" />
<!-- <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="/views/home.xhtml" icon="ui-icon-home"/>
<p:menuitem value="Experiment Types" url="/views/experimentType/list.xhtml"/>
<p:menuitem value="Users" url="/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>
\ No newline at end of file
src/java/DmWebPortal/web/views/home.xhtml
+ 1
− 1
View file @ 418a89b9
......@@ -6,7 +6,7 @@
xmlns:p="http://primefaces.org/ui"
xmlns:f="http://xmlns.jcp.org/jsf/core">
<ui:composition template="../templates/contentViewTemplate4x3.xhtml">
<ui:composition template="../templates/homeViewTemplate.xhtml">
<ui:define name="middleCenter">
<div class="homePage">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment