christiancorsano/yacos
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Header login remis en forme + checkbox

Browse Source 
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)
This commit is contained in:
Nicolas Michard
2008-02-05 23:15:50 +00:00
parent 6db0c1f686
commit 826ea624f0
8 changed files with 46 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
YACOSWeb/WebContent/WEB-INF/classes/messages.properties
View File

@@ -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

4
YACOSWeb/WebContent/WEB-INF/decorators/headerchoose.jsp
View File

@@ -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">

6
YACOSWeb/WebContent/WEB-INF/decorators/main.jsp
View File

@@ -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">

6
YACOSWeb/WebContent/WEB-INF/decorators/usermenu.jsp
View File

@@ -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-->

30
YACOSWeb/WebContent/WEB-INF/jsp/main.jsp
View File

@@ -4,17 +4,23 @@
<head></head>
<body>
${user}
${conference}
Page d'accueil <20> 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<63>der <20> 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>
</body>
</html>

14
YACOSWeb/WebContent/WEB-INF/jsp/secure/authenticatedusers.jsp
View File

@@ -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>

2
YACOSWeb/WebContent/WEB-INF/jsp/secure/userinformation.jsp
View File

@@ -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>