From 826ea624f05949b5355e84345085c5cbf77e6adf Mon Sep 17 00:00:00 2001
From: Nicolas Michard <nicolas.michard@gmail.com>
Date: Tue, 5 Feb 2008 23:15:50 +0000
Subject: [PATCH] Header login remis en forme + checkbox page accueil site
 quand pas de conference active page accueil conference quand conference
 active proposition de choisir une conference quand connecte mais pas de
 conference active -- le CONTENU de ces pages se fera par la suite -- Le menu
 ne s'affiche que si une conference est active (user online and offline)

---
 .../WEB-INF/classes/messages.properties       | 10 +++++--
 .../WEB-INF/decorators/headerchoose.jsp       |  4 ++-
 .../WebContent/WEB-INF/decorators/main.jsp    |  6 +++-
 .../WEB-INF/decorators/usermenu.jsp           |  6 ++++
 YACOSWeb/WebContent/WEB-INF/jsp/main.jsp      | 30 +++++++++++--------
 .../WEB-INF/jsp/secure/authenticatedusers.jsp | 14 ---------
 .../WEB-INF/jsp/secure/userinformation.jsp    |  2 +-
 YACOSWeb/WebContent/login.jsp                 |  9 ++++--
 8 files changed, 46 insertions(+), 35 deletions(-)
 delete mode 100644 YACOSWeb/WebContent/WEB-INF/jsp/secure/authenticatedusers.jsp

diff --git a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
index 7f0c8c2..d57837e 100644
--- a/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
+++ b/YACOSWeb/WebContent/WEB-INF/classes/messages.properties
@@ -7,15 +7,15 @@ disclaimer.link.about=About
 
 ###################
 # LOGIN FORM
-login.btn.submit=Submit
+login.btn.connexion=Connexion
 login.btn.logout=Logout
 login.field.login=Login
+login.txt.login=Log in
 #Login
 login.label.login=Login
 login.label.password=Password
 login.label.rememberme=Remember me
-login.label.connexion=Connexion
-login.label.inscription=New user ? Create an account here
+login.label.register=Register
 login.label.alreadyaccount:I have already an account
 # New user
 login.label.createnewuser=Create an account
@@ -23,6 +23,10 @@ login.label.createaccount="When creating an account on Yacos.com, you may post a
 login.label.continue=Continue
 login.message.error=Your login attempt was not successful, try again.
 
+###################
+# USER INFORMATION HEADER
+user.information.editaccount=Edit my account
+
 ###################
 # USER MENU
 menu.chairman.title=Chairman
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp
index e81047c..a71e47e 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp
@@ -7,7 +7,9 @@
 
 <!-- containerheader -->
 		<div id="header">
-			<div id="logoimage"><img src="./images/logo-yacos.png" alt="Logo Yacos Image" /></div>
+			<div id="logoimage">
+				<a href="main.htm"><img src="./images/logo-yacos.png" alt="Logo Yacos Image" /></a>
+			</div>
 			<div id="bar">
 			<div id="rightchoice">
 			
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
index d9a63cd..b2710ab 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
@@ -19,7 +19,11 @@
 		<!--  Container -->
 		<div id="container">
 		
-		<div id="logotexte"><img src="./images/logo-yacos-texte.png" alt="Logo Yacos Texte" /></div>
+		
+			<div id="logotexte">
+				<a href="main.htm"><img src="./images/logo-yacos-texte.png" alt="Logo Yacos Texte" /></a>
+			</div>
+		
 		
 		<!-- User Information -->
 		<div id="userlogin">
diff --git a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
index 76819a5..57747a1 100644
--- a/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
@@ -22,6 +22,10 @@
 			</ul>
 	</div>
 	
+	<!-- On affiche les menus seulement si une conference est deja active -->
+	
+	<c:if test="${currentConferenceId != null}">
+	
 	<!-- AUTHOR MENU : CHAIRMAN -->
 	<authz:authorize ifAllGranted="ROLE_CHAIRMAN">
 		<div id="mainmenubloc">
@@ -81,6 +85,8 @@
 		</div>
 	</authz:authorize>
 	
+	</c:if>
+	
 	
 </div><!--mainmenu-->
 
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
index d84e5f4..983671e 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
@@ -4,17 +4,23 @@
 <head></head>
 <body>
 
-${user}
-${conference}
-Page d'accueil à changer de place (controller dans system et non dans author)
-Si conf active : page d'intro de la conf
-si pas de conf active : page d'intro du site (visiteur)<br/><br/>
+<c:choose>
 
-Utilisateur avec tous les rôles (pour test plus vite) :<br/>
-<b>Lancer le Filler.java dans YACOS Test pour avoir l'utilisateur admin puis choisir la conference id=68 (ou la premiere de la liste normalement)...</b><br />
+	<c:when test="${currentConferenceId != null}">
+		PAGE ACCUEIL CONFERENCE COURANTE : <b>${currentConference.title}</b>
+	</c:when>
+	
+	<c:otherwise>
+    	<authz:authorize ifNotGranted="ROLE_ANONYMOUS">
+    		Pour pouvoir accéder à vos fonctions veuillez choisir une conference : 	
+    		<a href="<c:url value="listConference.htm"/>"><fmt:message key="conference.linkMenu.choose" /></a>
+    	</authz:authorize>
+    	<authz:authorize ifAllGranted="ROLE_ANONYMOUS">
+    		PAGE ACCUEIL YACOS (NON CONNECTE)	
+    	</authz:authorize>
+	</c:otherwise>
+	
+</c:choose>
 
-
-LOGIN=<b>admin</b> PASS=<b>admin</b><br/>
-
-  </body>
-</html>
\ No newline at end of file
+</body>
+</html>
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/secure/authenticatedusers.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/secure/authenticatedusers.jsp
deleted file mode 100644
index a640a28..0000000
--- a/YACOSWeb/WebContent/WEB-INF/jsp/secure/authenticatedusers.jsp
+++ /dev/null
@@ -1,14 +0,0 @@
-<%@ include file="/WEB-INF/decorators/include.jsp"%>
-<%@ page import="org.acegisecurity.context.SecurityContextHolder" %>
-
-<html>
-<head></head>
-<body>
-
-
-<h1>Welcome: <%= SecurityContextHolder.getContext().getAuthentication().getName() %></h1>
-<p><a href="../../">Home</a>
-<p><a href="../../j_acegi_logout">Logout</a>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp b/YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp
index 8338f9d..31418cf 100644
--- a/YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp
+++ b/YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp
@@ -8,7 +8,7 @@
 	${ currentUser.firstName } ${ currentUser.lastName } <b>(<authz:authentication operation="username"></authz:authentication>)</b><br />
 	You currently follow <b>4</b> conferences<br />
 	You have the following rights : <b>Author, Chairman, PC Member</b><br />
-	<a href="registerUser.htm">Change my profile</a><br />
+	<a href="registerUser.htm"><fmt:message key="user.information.editaccount" /></a><br />
 	<a href="j_acegi_logout" id="submit_btn"><fmt:message key="login.btn.logout" /></a>
 
 </body>
diff --git a/YACOSWeb/WebContent/login.jsp b/YACOSWeb/WebContent/login.jsp
index 74f857b..32687ea 100644
--- a/YACOSWeb/WebContent/login.jsp
+++ b/YACOSWeb/WebContent/login.jsp
@@ -4,11 +4,14 @@
 <head></head>
 <body>
 	<form action="<c:url value='j_acegi_security_check'/>" method="POST" id="mainformlogin">
-		<a href="login.htm" id="connexion"><fmt:message key="login.label.inscription"/></a><br />
-		<fmt:message key="login.label.connexion"/> :
+		<fmt:message key="login.txt.login"/> :
 		<input type='text' name='j_username' value="<fmt:message key='login.field.login' />" onfocus="if (this.value == '<fmt:message key='login.field.login' />') { this.value = ''; }" onblur="if (this.value == '') { this.value = '<fmt:message key='login.field.login' />'; }" />
 		<input type='password' name='j_password' />
-		<a href="javascript:document.getElementById('mainformlogin').submit();" id="submit_btn"><fmt:message key="login.btn.submit" /></a>
+		<a href="javascript:document.getElementById('mainformlogin').submit();" id="submit_btn"><fmt:message key="login.btn.connexion" /></a>
+		<br />
+		<a href="login.htm" id="connexion"><fmt:message key="login.label.register"/></a>
+		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+		<fmt:message key='login.label.rememberme' />&nbsp;&nbsp;<input type="checkbox" name="_acegi_security_remember_me"/>
 	</form>
 
 </body>