diff --git a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/LoginController.java b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/LoginController.java
index 66b71262e997d476e394d2fa4952cf0aa6b83a82..2a5af241b9c19d56b6b7ea409d37ca7c4537228f 100644
--- a/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/LoginController.java
+++ b/src/java/DmWebPortal/src/java/gov/anl/aps/dm/portal/controllers/LoginController.java
@@ -101,7 +101,7 @@ public class LoginController implements Serializable
user = userInfoFacade.findByUsername(username);
if (user == null) {
- SessionUtility.addErrorMessage("Unknown User", "Username " + username + " is not registered.");
+ SessionUtility.addErrorMessage("Unknown User", "Username " + username + " is not registered. Contact administrator.");
return (username = password = null);
}
@@ -131,7 +131,7 @@ public class LoginController implements Serializable
}
}
-
+
public String getLandingPage() {
String landingPage = SessionUtility.getCurrentViewId() + "?faces-redirect=true";
if (landingPage.contains("login")) {
@@ -150,6 +150,14 @@ public class LoginController implements Serializable
}
}
+// public void forwardIfNotLoggedIn() throws IOException {
+// if (!loggedIn) {
+// ExternalContext ec = FacesContext.getCurrentInstance().getExternalContext();
+// ec.redirect(ec.getRequestContextPath() + "/views/login.");
+//
+// }
+// }
+
public String displayRole() {
return "User";
}
diff --git a/src/java/DmWebPortal/web/index.xhtml b/src/java/DmWebPortal/web/index.xhtml
index 4f1c258efa1140856622f91d2e869d0a23a4aea0..cbd321b6720a0b047974bfeac9ea45d809d6185d 100644
--- a/src/java/DmWebPortal/web/index.xhtml
+++ b/src/java/DmWebPortal/web/index.xhtml
@@ -3,7 +3,7 @@
<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/home.xhtml"/>
+ <meta http-equiv="Refresh" content="0; URL=views/login.xhtml"/>
</h:body>
</html>
diff --git a/src/java/DmWebPortal/web/resources/css/login.css b/src/java/DmWebPortal/web/resources/css/login.css
index 94c3e9f4dba116d6ed63440e24d01d0da02d2edc..f6cc4767b9292b249f43dc97fa02125ea5faa9f7 100644
--- a/src/java/DmWebPortal/web/resources/css/login.css
+++ b/src/java/DmWebPortal/web/resources/css/login.css
@@ -39,12 +39,35 @@ a:link:hover, a:visited:hover {
height: 75px;
}
-#bottom {
+#middle {
position: relative;
background-color: #f2f4f7;
padding: 5px;
margin: 0px 0px 0px 0px;
- height: 100%
+ 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;
}
.topLeftContent {
@@ -79,12 +102,12 @@ a:link:hover, a:visited:hover {
padding: 100px;
}
-
input {
background: #6da5d8;
box-shadow: 0px 3px 5px #d5d5d5;
}
+
h1 {
font-family: Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
font-size: 24px;
@@ -94,3 +117,32 @@ h1 {
color: #f2f4f7;
vertical-align: middle;
}
+
+.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;
+ tab-size: calc;
+ drop-initial-size: auto;
+}
+
+.ui-messages-error, .ui-message-error {
+ background-color: #f2f4f7;
+ color: saddlebrown;
+ border: #f2f4f7;
+ size: auto;
+}
diff --git a/src/java/DmWebPortal/web/resources/css/portal.css b/src/java/DmWebPortal/web/resources/css/portal.css
index e26007c802a62e80f7154106398d0ebc1c307524..5ebe4fb94baedc0a840a7b22b9eaecd657fbbf86 100644
--- a/src/java/DmWebPortal/web/resources/css/portal.css
+++ b/src/java/DmWebPortal/web/resources/css/portal.css
@@ -333,12 +333,12 @@ h1 {
vertical-align: middle;
}
-.homePage {
+/*.homePage {
background-image: url(../../resources/images/ApsStorageRing.png);
background-repeat: no-repeat;
background-position: center;
background-size: auto 100%;
-}
+}*/
.pageTitle h1 {
font-family: Arial, "Arial CE", "Lucida Grande CE", lucida, "Helvetica CE", sans-serif;
diff --git a/src/java/DmWebPortal/web/views/login.xhtml b/src/java/DmWebPortal/web/views/login.xhtml
index 04c2b663f7006fdeef8bda92fc06daf533241a4c..44bca8f14b8faae496185bdf3527595cbb0fb140 100644
--- a/src/java/DmWebPortal/web/views/login.xhtml
+++ b/src/java/DmWebPortal/web/views/login.xhtml
@@ -5,11 +5,36 @@
xmlns:p="http://primefaces.org/ui"
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>
- <ui:composition template="../templates/loginViewTemplate.xhtml">
- <ui:define name="bottom">
+ <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="middle" class="middleContent">
+ <div id="middleLeft" class="middleLeftContent">
<h:form id="loginForm">
- <p:growl id="messages" showDetail="true" autoUpdate="true"/>
+<!-- <p:growl id="messages" showDetail="true" autoUpdate="true"/>-->
<div class="login">
<div>
<p:inputText id="username" value="#{loginController.username}" title="Username"/>
@@ -19,13 +44,25 @@
<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>
+ </div>
+
+ <div id="middleRight" class="middleRightContent" >
+ <p:messages id="messages" showDetail="true" autoUpdate="true" closable="false" showIcon="false" />
+ </div>
+
+ </div>
+
+ <div id="bottom" class="sectionText">
+ <p>
+ Welcome to the Advanced Photon Source’s prototype data management portal. Registered users can view and set access permissions for their experiment data using this system.
+ </p>
+ </div>
</h:body>
+
</html>