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

Correction de divers bug.

Browse Source 
Changement de listConference, ça affiche les roles maintenant
This commit is contained in:
Frederic Debuire
2008-02-16 15:36:20 +00:00
parent de2991b335
commit 3b0c845902
16 changed files with 174 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -160,7 +160,8 @@ conference.errors.dateStartNonValid=This date is not valid
conference.errors.dateStartSuperiorEnd=The start date must be earlier than the end date
conference.errors.dateStartSuperiorArticle=The article's deadline date must be earlier than the start date
conference.errors.dateStartSuperiorEvaluation=The evaluation's deadline date must be earlier than the start date
conference.errors.dateArticleSuperiorEvaluation=The article's deadline date must be earlier than the evaluation's deadline date
conference.errors.dateArticleSuperiorEvaluation=The article's deadline date must be earlier than the evaluation's deadline date
conference.errors.pageNumberNotValid=It should be a number
conference2.title=Calendar
conference2.date=Conference's date

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

@@ -23,7 +23,10 @@ var LoginManager = Class.create({
KeyPressHandler: function(event){
switch(event.keyCode){
case Event.KEY_RETURN:
if (event.element().parentNode.id == 'mainformlogin')
$('mainformlogin').submit();
else
$('mainformlogin2').submit();
}
}
});

25
YACOSWeb/WebContent/WEB-INF/jsp/addConference3.jsp
View File

@@ -2,27 +2,10 @@
<html>
<head>
<script type='text/javascript' src='./javascripts/prototype.js'></script>
<script type='text/javascript'>
function verifNumber() {
var re = /^\d+$/;
if(!re.test($('pageNumber').value))
$('errorNumber').style.display = "";
else
$('errorNumber').style.display = "none";
}
</script>
</head>
<body>
<h4 class="title"><c:choose>
<c:when test="${param['action'] eq 'modify'}">
<fmt:message key="conference.titleModify" />
@@ -48,7 +31,7 @@ function verifNumber() {
<tbody>
<tr>
<td class="formLabel">Page's numbers</td>
<td><form:input id="pageNumber" path="pageNumber" onchange="verifNumber();"/><div class="formError"><span id="errorNumber" style="display: none;">It should be a number</span></div></td>
<td><form:input path="pageNumber"/><div class="formError"><form:errors path="pageNumber" /></div></td>
</tr>
<tr>
<td class="formLabel">Authorized file types</td>
@@ -76,11 +59,7 @@ function verifNumber() {
</tr>
</tfoot>
</table>
</form:form>
<script type="text/javascript">
verifNumber();
</script>
</form:form>
<a href="<c:url value="main.htm"/>">Home</a>

4
YACOSWeb/WebContent/WEB-INF/jsp/addConference4.jsp
View File

@@ -123,7 +123,7 @@ function writePerson() {
else
$('errorMax').style.display = "none";
if (person.max <= person.min) {
if (parseInt(person.max) <= parseInt(person.min)) {
dwr.util.setValues({errorMax:"The min value shouldn't be superior to the max value"});
$('errorMax').style.display = "";
}
@@ -215,7 +215,7 @@ var CritereManager = Class.create({
</tr>
<tr>
<td>Min:</td>
<td><input id="min" type="text" /></td>
<td><input id="min" type="text"/></td>
<td><div class="formError"><span id="errorMin" style="display: none;"></span></div></td>
</tr>
<tr>

54
YACOSWeb/WebContent/WEB-INF/jsp/listConference.jsp
View File

@@ -1,45 +1,61 @@
<%@ include file="/WEB-INF/decorators/include.jsp"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<html>
<head></head>
<body>
<h4 class="title">NO NAME</h4>
<h4 class="title">Conference's list</h4>
<c:if test="${errorMessage != null}">
<span class="formError">
<div class="errorBox">
<c:choose>
<c:when test="${errorMessage == 1}"><fmt:message key="message.error.noconferenceforthisid" /></c:when>
<c:when test="${errorMessage == 2}"><fmt:message key="message.error.noconferenceid" /></c:when>
<c:otherwise><fmt:message key="message.error.conferenceerror" /></c:otherwise>
</c:choose>
</span><br />
</div>
</c:if>
Choix de la conference <br /><br />
<c:if test="${currentConferenceId!=null}">
La conf<6E>rence courante est : ${currentConference.title}.<br /><br />
</c:if>
<c:if test="${currentConferenceId==null}">
Il n'y a pas de conf<6E>rence s<>lectionn<6E>.<br /><br />
</c:if>
<p class="formHelp">
Choose a conference
</p>
<c:choose>
<c:when test="${empty listConference}">
Il n'y a pas de conf<6E>rence pr<70>sente.<br />
<div class="errorBox">
Sorry, there is no conference at the moment.
</div>
</c:when>
<c:otherwise>
<c:forEach items="${listConference}" var="conference">
<div class="conferenceBloc cbb">
<h2>${conference.title}</h2>
ID : ${conference.id}<br />
Title : ${conference.title}<br />
Description : ${conference.description}<br />
Other Informations : ${conference.otherInformations}<br />
<h2>
<c:set var="varName" value="false" />
<c:forEach items="${listRole}" var="role">
<c:if test="${conference.id == role.conference.id and varName == 'false' }">
<c:set var="varName" value="true" />
</c:if>
</c:forEach>
<c:choose>
<c:when test="${varName == 'true'}">
${conference.title} - In this conference you are:
<c:forEach items="${listRole}" var="role">
<c:if test="${conference.id == role.conference.id}">
${role.type}
</c:if>
</c:forEach>
</c:when>
<c:otherwise>
${conference.title} - You haven't any role in this conference
</c:otherwise>
</c:choose>
</h2>
<b>Description:</b> ${conference.description}<br />
<center>
<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">Choisir</a><br />
<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">Choose</a><br />
</center>
</div>
</c:forEach>

116
YACOSWeb/WebContent/WEB-INF/jsp/loginFull.jsp
View File

@@ -6,11 +6,10 @@
<h4 class="title"><fmt:message key="login.title" /></h4>
<c:if test="${not empty param.login_error}">
<p class="errorBox">
<fmt:message key="login.message.error" /><br /><br />
</p>
<div class="errorBox">
<fmt:message key="login.message.error" />
</div>
</c:if>
<table width="100%">
<tr>
@@ -18,62 +17,61 @@
<td class="existingaccount"><div class="titleLogin"><fmt:message key="login.label.alreadyaccount" /></div></td>
</tr>
<tr>
<td valign="top" width="50%">
<p class="content_login">
<fmt:message key="login.label.createaccount" />
</p>
<center><a class="register_link" href="registerUser.htm">
<fmt:message key="login.label.register" />
</a></center>
</td>
<td>
<form action="<c:url value='j_acegi_security_check'/>" method="POST" id="formlogin">
<table class="content_table">
<tr>
<td width="100" align="left">
<fmt:message key="login.label.login" />
</td>
<td align="left" width="200">
<input id="username" type='text' name='j_username' />
</td>
</tr>
<tr>
<td align="left">
<fmt:message key="login.label.password" />
</td>
<td align="left">
<input id="password" type='password' name='j_password' />
</td>
</tr>
<tr>
<td align="left">
<fmt:message key='login.label.rememberme' />
</td>
<td align="left">
<input type="checkbox" name="_acegi_security_remember_me"/>&nbsp;&nbsp;
</td>
</tr>
<tr>
<td colspan="2" align="right">
<a href="<c:url value="/forgotPassword.htm"/>" class="forgot_pwd">
<fmt:message key="login.label.forgotPasswordHeading"/>
</a>
</td>
</tr>
</table>
</form>
<br />
<center><a class="submit_link" href="javascript:document.getElementById('formlogin').submit();">
<fmt:message key="login.btn.connexion" />
</a></center>
<script type="text/javascript"> new LoginManager('username', 'password');</script>
<tr>
<td valign="top" width="50%">
</td></tr>
<p class="content_login">
<fmt:message key="login.label.createaccount" />
</p>
<center><a class="register_link" href="registerUser.htm">
<fmt:message key="login.label.register" />
</a></center>
</td>
<td>
<form action="<c:url value='j_acegi_security_check'/>" method="POST" id="mainformlogin2">
<table class="content_table">
<tr>
<td width="100" align="left">
<fmt:message key="login.label.login" />
</td>
<td align="left" width="200">
<input id="username" type='text' name='j_username' />
</td>
</tr>
<tr>
<td align="left">
<fmt:message key="login.label.password" />
</td>
<td align="left">
<input id="password" type='password' name='j_password' />
</td>
</tr>
<tr>
<td align="left">
<fmt:message key='login.label.rememberme' />
</td>
<td align="left">
<input type="checkbox" name="_acegi_security_remember_me"/>&nbsp;&nbsp;
</td>
</tr>
<tr>
<td colspan="2" align="right">
<a href="<c:url value="/forgotPassword.htm"/>" class="forgot_pwd">
<fmt:message key="login.label.forgotPasswordHeading"/>
</a>
</td>
</tr>
</table>
</form>
<br />
<center><a class="submit_link" href="javascript:document.getElementById('mainformlogin2').submit();">
<fmt:message key="login.btn.connexion" />
</a></center>
<script type="text/javascript"> new LoginManager('username', 'password');</script>
</td></tr>
</table>
</body>

2
YACOSWeb/WebContent/WEB-INF/jsp/manageArticle.jsp
View File

@@ -34,7 +34,7 @@
</td>
<td><a id="articleURL${i.index}" title="Download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>"><img src="./images/cc-download_manager-128x128.png" alt="Download" /></a></td>
<td><a id="modifyArticle${i.index}" title="Modify" href="<c:url value="/submissionArticle.htm"><c:param name="action" value="modify"/><c:param name="articleID" value="${article.id}"/></c:url>"><img src="./images/cc-button_ok-128x128.png" alt="Modify" /></a></td>
<td><a id="suppressArticle${i.index}" title="Delete" href="<c:url value="/delete.htm"><c:param name="articleId" value="${article.id}"/></c:url>"><img src="./images/cc-button_cancel-128x128.png" alt="Delete"/></a></td>
<td><a id="suppressArticle${i.index}" title="Delete" href="javascript:deleteArticle(${article.id});"><img src="./images/cc-button_cancel-128x128.png" alt="Delete"/></a></td>
</tr>
</tbody>
</table>

1
YACOSWeb/WebContent/WEB-INF/yacos-servlet.xml
View File

@@ -197,6 +197,7 @@
<bean id="ListConferenceController"
class="org.yacos.web.system.controller.ListConferenceController">
<property name="conferenceManager" ref="conferenceManager" />
<property name="userManager" ref="userManager" />
</bean>

8
YACOSWeb/WebContent/javascripts/yacos/manageArticle.js
View File

@@ -40,4 +40,10 @@ var AuthorManager = Class.create({
Event.observe(window,'load', function() {
new AuthorManager()
});
});
function deleteArticle(ArticleID) {
if (confirm("Are you sure you want to delete this article?")) {
document.location.href = "delete.htm?articleId=" + ArticleID;
}
}