From 64a5b670ca27e99edbcf75108956c3b469035f9f Mon Sep 17 00:00:00 2001
From: Nils Christian Ehmke <nie@informatik.uni-kiel.de>
Date: Sat, 21 Jul 2012 14:28:47 +0200
Subject: [PATCH] Moved some css-code into the correct css-files; Added a
welcome-message to the login-page.
---
Kieker.WebGUI/src/main/webapp/Login.xhtml | 38 +++++----------------
Kieker.WebGUI/src/main/webapp/css/Login.css | 30 ++++++++++++++++
2 files changed, 38 insertions(+), 30 deletions(-)
diff --git a/Kieker.WebGUI/src/main/webapp/Login.xhtml b/Kieker.WebGUI/src/main/webapp/Login.xhtml
index 599fa868..d00af406 100644
--- a/Kieker.WebGUI/src/main/webapp/Login.xhtml
+++ b/Kieker.WebGUI/src/main/webapp/Login.xhtml
@@ -2,42 +2,20 @@
<!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://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"
- xmlns:c="http://java.sun.com/jsp/jstl/core">
+ xmlns:p="http://primefaces.org/ui">
<h:head>
<title>Kieker.WebGUI</title>
<link rel="stylesheet" type="text/css" href="../css/Common.css" />
<link rel="stylesheet" type="text/css" href="../css/Login.css" />
- <style>
- .col1 {
- width: fit-content !important;
- }
-
- .col2 {
- width: 100% !important;
- }
-
- .input {
- width: 100% !important;
- }
-
- .grid {
- width: 100% !important;
- }
-
- .login-panel {
- width: 30%;
- text-align: center
- }
- </style>
</h:head>
-
- <h:body>
- <img src="../img/kieker-logo-transparent.png" /><br/>
+
+ <h:body onload="growlComp.renderMessage({summary:'Welcome to the Kieker.WebGUI', detail: 'This is an early alpha version of the Kieker Web GUI. Therefore it may contain bugs and some functionality may have not been implemented yet. Just click "Login" to continue.', severity: 'info'})">
+ <img src="../img/kieker-logo-transparent.png" />
+ <br/>
<p:spacer width="0" height="100"/>
+
+ <!-- The following is the login form -->
<h:form>
<div align="center">
<p:panel header="Welcome to the Kieker.WebGUI" styleClass="login-panel">
@@ -53,8 +31,8 @@
<p:commandButton value="Login" ajax="false" action="#{userBean.login}" />
</div>
</p:panel>
+ <p:growl sticky="true" autoUpdate="true" widgetVar="growlComp"/>
</div>
</h:form>
-
</h:body>
</html>
\ No newline at end of file
diff --git a/Kieker.WebGUI/src/main/webapp/css/Login.css b/Kieker.WebGUI/src/main/webapp/css/Login.css
index 8d52f57c..8d724d30 100644
--- a/Kieker.WebGUI/src/main/webapp/css/Login.css
+++ b/Kieker.WebGUI/src/main/webapp/css/Login.css
@@ -3,3 +3,33 @@
.ui-panel {
font-size: 12px;
}
+
+.col1 {
+ width: fit-content !important;
+}
+
+.col2 {
+ width: 100% !important;
+}
+
+.input {
+ width: 100% !important;
+}
+
+.grid {
+ width: 100% !important;
+}
+
+.login-panel {
+ width: 30%;
+ text-align: center
+}
+
+.ui-growl {
+ width: 500px
+}
+
+.ui-growl-message {
+ width: 400px;
+ text-align: justify;
+}
--
GitLab