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

Correction générale

Browse Source
This commit is contained in:
Frederic Debuire
2008-02-25 23:22:25 +00:00
parent 90f615cbab
commit 87e8364511
32 changed files with 372 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
YACOSWeb/WebContent/WEB-INF/jsp/addConference.jsp
View File

@@ -63,8 +63,5 @@
</table>
</form:form>
<br />
<a href="<c:url value="main.htm"/>">Home</a>
</body>
</html>

3
YACOSWeb/WebContent/WEB-INF/jsp/addConference2.jsp
View File

@@ -77,9 +77,6 @@
</table>
</form:form>
<br />
<a href="<c:url value="main.htm"/>">Home</a>
</body>
</html>

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

@@ -62,7 +62,5 @@
</table>
</form:form>
<a href="<c:url value="main.htm"/>">Home</a>
</body>
</html>

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

@@ -171,7 +171,20 @@ var CritereManager = Class.create({
<c:otherwise>
<fmt:message key="conference.titleAdd" />
</c:otherwise>
</c:choose></h4>
</c:choose></h4>
<c:choose>
<c:when test="${currentConference != null and currentConference.currentPhase != 'CALL_FOR_PAPER'}">
<div class="warningBox">
Sorry, you can't modify anymore this part of the conference because the call for paper is already over.
</div>
<form:form commandName="formConference">
<input type="submit" name="_target2" value="Back">
<input type="submit" name="_target4" value="Next" />
</form:form>
</c:when>
<c:otherwise>
<fmt:message key="step">
<fmt:param value="4" />
@@ -272,9 +285,9 @@ var CritereManager = Class.create({
<script type="text/javascript">
init();
</script>
<a href="<c:url value="main.htm"/>">Home</a>
</script>
</c:otherwise>
</c:choose>
</body>
</html>

197
YACOSWeb/WebContent/WEB-INF/jsp/addConference5.jsp
View File

@@ -117,100 +117,109 @@ function filterUser(el, value) {
<c:otherwise>
<fmt:message key="conference.titleAdd" />
</c:otherwise>
</c:choose></h4>
<fmt:message key="step">
<fmt:param value="5" />
<fmt:param value="5" />
</fmt:message>
<p class="formHelp"><fmt:message key="conference.help.step5" /></p>
<form:form commandName="formConference">
<table>
<tbody>
<tr>
<td class="formLabel"><img alt="<fmt:message key="conference5.findUsers" />" src="./images/search.png"/>
</td>
<td><form:input id="myfilter" path="myfilter" /> <br />
<br />
<table border="1" id="tableName" style="display: none;">
<thead>
<tr>
<th>Name</th>
<th>Actions</th>
</tr>
</thead>
<tbody id="personbody">
<tr id="pattern" style="display: none;">
<td><span id="tablePerson">Person</span></td>
<td><a id="addNew" href="#" onclick="addPerson(this.id)">Add</a>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
<tr>
<td class="formLabel"><fmt:message key="conference5.usersList" />
</td>
<td><br />
<table border="1" id="tableNameAdded" style="display: none;">
<thead>
<tr>
<th>Name</th>
<th>Actions</th>
</tr>
</thead>
<tbody id="personbodyadded">
<tr id="patternadded" style="display: none;">
<td><span id="tablePersonadded">Person</span></td>
<td><a id="supprPerson" href="#"
onclick="deletePerson(this.id)">Remove</a></td>
</tr>
</tbody>
</table>
</td>
</tr>
<tr>
<td class="formLabel"><fmt:message
key="conference5.invitation.send" /></td>
<td><input id="emailAddress" type="text" /> <input
type="button" name="inviteButton" id="inviteButton" value="Invite" />
</td>
</tr>
<tr>
<td class="formLabel"><fmt:message
key="conference5.invitationList" /></td>
<td>
<div id="invitationList" class="dynamicList">
<div class="dynamicListHeader"><fmt:message
key="form.addConference.invitationsHeader" /></div>
</div>
<input type="button" id="removeInvitationButton"
name="removeInvitation"
value="<fmt:message key="button.removeSelected" />" /> <br />
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td>&nbsp;</td>
<td><input type="submit" name="_target3" value="Back">
<input type="submit" name="_finish" value="Finish" /></td>
</tr>
</tfoot>
</table>
</form:form>
<script type="text/javascript">
init();
</script>
<br />
<br />
<a href="<c:url value="main.htm"/>">Home</a>
</c:choose></h4>
<c:choose>
<c:when test="${currentConference != null and currentConference.currentPhase != 'CALL_FOR_PAPER'}">
<div class="warningBox">
Sorry, you can't modify anymore this part of the conference because the call for paper is already over.
</div>
<form:form commandName="formConference">
<input type="submit" name="_target3" value="Back">
<input type="submit" name="_finish" value="Finish" />
</form:form>
</c:when>
<c:otherwise>
<fmt:message key="step">
<fmt:param value="5" />
<fmt:param value="5" />
</fmt:message>
<p class="formHelp"><fmt:message key="conference.help.step5" /></p>
<form:form commandName="formConference">
<table>
<tbody>
<tr>
<td class="formLabel"><img alt="<fmt:message key="conference5.findUsers" />" src="./images/search.png"/>
</td>
<td><form:input id="myfilter" path="myfilter" /> <br />
<br />
<table border="1" id="tableName" style="display: none;">
<thead>
<tr>
<th>Name</th>
<th>Actions</th>
</tr>
</thead>
<tbody id="personbody">
<tr id="pattern" style="display: none;">
<td><span id="tablePerson">Person</span></td>
<td><a id="addNew" href="#" onclick="addPerson(this.id)">Add</a>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
<tr>
<td class="formLabel"><fmt:message key="conference5.usersList" />
</td>
<td><br />
<table border="1" id="tableNameAdded" style="display: none;">
<thead>
<tr>
<th>Name</th>
<th>Actions</th>
</tr>
</thead>
<tbody id="personbodyadded">
<tr id="patternadded" style="display: none;">
<td><span id="tablePersonadded">Person</span></td>
<td><a id="supprPerson" href="#"
onclick="deletePerson(this.id)">Remove</a></td>
</tr>
</tbody>
</table>
</td>
</tr>
<tr>
<td class="formLabel"><fmt:message
key="conference5.invitation.send" /></td>
<td><input id="emailAddress" type="text" /> <input
type="button" name="inviteButton" id="inviteButton" value="Invite" />
</td>
</tr>
<tr>
<td class="formLabel"><fmt:message
key="conference5.invitationList" /></td>
<td>
<div id="invitationList" class="dynamicList">
<div class="dynamicListHeader"><fmt:message
key="form.addConference.invitationsHeader" /></div>
</div>
<input type="button" id="removeInvitationButton"
name="removeInvitation"
value="<fmt:message key="button.removeSelected" />" /> <br />
</td>
</tr>
</tbody>
<tfoot>
<tr>
<td>&nbsp;</td>
<td><input type="submit" name="_target3" value="Back">
<input type="submit" name="_finish" value="Finish" /></td>
</tr>
</tfoot>
</table>
</form:form>
<script type="text/javascript">
init();
</script>
</c:otherwise>
</c:choose>
</body>
</html>

24
YACOSWeb/WebContent/WEB-INF/jsp/conflictList.jsp
View File

@@ -170,35 +170,27 @@
<div id="title${article.id}" onclick="showDetail(${article.id})">
<table style="width:100%;text-align:center;">
<tr>
<td><img src="./images/cc-wp-64x64.png"></td>
<td>title : ${article.title}
<br/>theme: ${article.topic}
<br/>main author: ${article.mainAuthor.firstName}${article.mainAuthor.lastName}
<c:if test="${!empty article.secondaryAuthors}">
<br/>secondaries authors:
<c:forEach var="author" items="${article.secondaryAuthors}">
<br/>${author}
</c:forEach>
</c:if>
<td width="20%"><img src="./images/cc-wp-24x24.png"></td>
<td width="60%"><a href="<c:url value='detailArticle.htm?id=${article.id}'/>"><b>${article.title}</b></a> by ${article.mainAuthor.firstName}&nbsp;${article.mainAuthor.lastName}
</td>
<td><a href="<c:url value='detailArticle.htm?id=${article.id}'/>">article's detail</a></td>
<td width="20%"><img src="./images/1uparrow.png"></td>
</tr>
</table>
</div>
<div id='dispatcher${article.id}' class="textBox" style="display:none;">
<table style="width:100%;">
<tr><td>
<h1><fmt:message key="members.list1"/></h1>
<h1><fmt:message key="ConflictList.list1"/></h1>
<div id="membersList${article.id}" style="border:1px solid black; max-height:150px;overflow:auto;">
</div>
</td><td>
<input type="button" id="addButton" value="add>>>" onclick="addRemote()"/><br/>
<input type="button" id="removeButton" value="<<<remove" onclick="removeRemote()"/>
<img id="addButton" src="./images/agt_forward.png" onclick="addRemote()"><br />
<img id="removeButton" src="./images/agt_back.png" onclick="removeRemote()">
</td><td>
<h1><fmt:message key="members.list2"/></h1>
<h1><fmt:message key="ConflictList.list2"/></h1>
<div id="membersConflictList${article.id}" style="border:1px solid black; max-height:150px;overflow:auto;">
</div>

19
YACOSWeb/WebContent/WEB-INF/jsp/delegateArticle.jsp
View File

@@ -156,19 +156,10 @@
<div id="title${article.id}" onclick="showDetail(${article.id})">
<table style="width:100%;text-align:center;">
<tr>
<td><img src="./images/cc-wp-64x64.png"></td>
<td>title : ${article.title}
<br/>theme: ${article.topic}
<br/>main author: ${article.mainAuthor.firstName}${article.mainAuthor.lastName}
<c:if test="${!empty article.secondaryAuthors}">
<br/>secondaries authors:
<c:forEach var="author" items="${article.secondaryAuthors}">
<br/>${author}
</c:forEach>
</c:if>
<td width="20%"><img src="./images/cc-wp-24x24.png"></td>
<td width="60%"><a href="<c:url value='detailArticle.htm?id=${article.id}'/>"><b>${article.title}</b></a> by ${article.mainAuthor.firstName}&nbsp;${article.mainAuthor.lastName}
</td>
<td><a href="<c:url value='detailArticle.htm?id=${article.id}'/>">article's detail</a></td>
<td width="20%"><img src="./images/1uparrow.png"></td>
</tr>
</table>
</div>
@@ -181,8 +172,8 @@
</div>
</td><td>
<input type="button" id="addButton" value="add>>>" onclick="addRemote()"/><br/>
<input type="button" id="removeButton" value="<<<remove" onclick="removeRemote()"/>
<img id="addButton" src="./images/agt_forward.png" onclick="addRemote()"><br />
<img id="removeButton" src="./images/agt_back.png" onclick="removeRemote()">
</td><td>
<h1><fmt:message key="delegateArticles.list2"/></h1>
<div id="refereesArticleList${article.id}" style="border:1px solid black; max-height:150px;overflow:auto;">

38
YACOSWeb/WebContent/WEB-INF/jsp/detailArticle.jsp
View File

@@ -8,18 +8,24 @@
<h4 class="title">Article's details</h4>
<div id="account_data">
<h2>${article.title}</h2>
<div id="account_data">
<p class="legend">Title</p>
<fieldset>
<div>
<label>Title: </label>
<span class="content"><b>${article.title}</b></span>
</div>
</fieldset>
<p class="legend">Authors</p>
<fieldset>
<div>
<label>Principal Author :</label>
<label>Main Author:</label>
<span class="content"><b>${article.mainAuthor.firstName}&nbsp;${article.mainAuthor.lastName}</b></span>
</div>
<c:if test="${article.secondaryAuthors!=null}">
<c:if test="${not empty article.secondaryAuthors}">
<div>
<label>Secondary Authors : </label>
<label>Secondary Authors: </label>
<ul>
<c:forEach items="${article.secondaryAuthors}" var="sAuthor">
<li>${sAuthor}</li>
@@ -30,15 +36,25 @@
</fieldset>
<p class="legend">Topic</p>
<fieldset>
<label>Topic : </label>
<span class="content"><b>${article.topic}</b></span>
<fieldset>
<div>
<label>Topic: </label>
<span class="content"><b>${article.topic}</b></span>
</div>
</fieldset>
<p class="legend">Abstract</p>
<fieldset>
<div>
<label>Abstract: </label>
<span class="content"><b>${article.abstractText}</b></span>
</div>
</fieldset>
<p class="legend">State</p>
<fieldset>
<div>
<label>State of article : </label>
<label>State of article: </label>
<span class="content"><b>${article.state}</b></span>
</div>
</fieldset>
@@ -48,7 +64,9 @@
<a class="download" href="
<c:url value="/download.htm">
<c:param name="articleId" value="${article.id}"/>
</c:url>">Download</a>
</c:url>">Download</a><br /><br />
<a class="back_link" href="<c:url value="${whereIcome}"/>"><fmt:message
key="form.link.back" /></a>
</body>
</html>

24
YACOSWeb/WebContent/WEB-INF/jsp/dispatchArticle.jsp
View File

@@ -164,7 +164,7 @@
</head>
<body>
<h4 class="title"><fmt:message key="delegateArticles.choose" /></h4>
<h4 class="title"><fmt:message key="dipatchArticle.choose" /></h4>
<p class="formHelp">
<fmt:message key="disptachArticle.help" />
</p>
@@ -174,21 +174,13 @@
<div id="title${article.id}" onclick="showDetail(${article.id})">
<table style="width:100%;text-align:center;">
<tr>
<td><img src="./images/cc-wp-64x64.png"></td>
<td>title : ${article.title}
<br/>theme: ${article.topic}
<br/>main author: ${article.mainAuthor.firstName}${article.mainAuthor.lastName}
<c:if test="${!empty article.secondaryAuthors}">
<br/>secondaries authors:
<c:forEach var="author" items="${article.secondaryAuthors}">
<br/>${author}
</c:forEach>
</c:if>
<td width="20%"><img src="./images/cc-wp-24x24.png"></td>
<td width="60%"><a href="<c:url value='detailArticle.htm?id=${article.id}'/>"><b>${article.title}</b></a> by ${article.mainAuthor.firstName}&nbsp;${article.mainAuthor.lastName}
</td>
<td><a href="<c:url value='detailArticle.htm?id=${article.id}'/>">article's detail</a></td>
<td width="20%"><img src="./images/1uparrow.png"></td>
</tr>
</table>
</table>
</div>
<div id='dispatcher${article.id}' class="textBox" style="display:none;">
<table style="width:100%;">
@@ -199,8 +191,8 @@
</div>
</td><td>
<input type="button" name="addButton" value="add&gt;&gt;&gt;" onclick="addRemote()"/><br/>
<input type="button" name="removeButton" value="&lt;&lt;&lt;remove" onclick="removeRemote()"/>
<img id="addButton" src="./images/agt_forward.png" onclick="addRemote()"><br />
<img id="removeButton" src="./images/agt_back.png" onclick="removeRemote()">
</td><td>
<h1><fmt:message key="members.list2"/></h1>
<div id="membersArticleList${article.id}" style="border:1px solid black; max-height:150px;overflow:auto;">

34
YACOSWeb/WebContent/WEB-INF/jsp/forum.jsp
View File

@@ -8,19 +8,33 @@
<h4 class="title">Forum</h4>
<table style="width: 100%; border: 1px solid orange;">
<table style="width: 100%">
<tr>
<th>Article</th>
<th>Message's number</th>
<tr bgcolor="#FFCE64">
<td width="10%" align="center"><b>Details</b></td>
<td width="80%" align="center"><b>Articles</b></td>
<td width="10%" align="center"><b>Replies</b></td>
</tr>
<c:forEach items="${listArticle}" var="article">
<tr>
<td><a href="<c:url value="/forumArticle.htm"><c:param name="articleId" value="${article.id}"/></c:url>"><b>${article.title}</b></a></td>
<td>?</td>
</tr>
<c:forEach items="${listArticle}" var="article" varStatus="status">
<c:choose>
<c:when test="${(status.index%2)==0}">
<tr bgcolor="white">
<td width="10%" align="center"><a href="<c:url value='detailArticle.htm?id=${article.a.id}'/>"><img src="./images/cc-kghostview-24x24.png"></a></td>
<td width="80%" align="center"><a
href="<c:url value="/forumArticle.htm"><c:param name="articleId" value="${article.a.id}"/></c:url>"><b>${article.a.title}</b></a></td>
<td width="10%" align="center"><b>${article.numberMessage}</b></td>
</tr>
</c:when>
<c:otherwise>
<tr bgcolor="#FDF2D8">
<td width="10%" align="center"><a href="<c:url value='detailArticle.htm?id=${article.a.id}'/>"><img src="./images/cc-kghostview-24x24.png"></a></td>
<td width="80%" align="center"><a
href="<c:url value="/forumArticle.htm"><c:param name="articleId" value="${article.a.id}"/></c:url>"><b>${article.a.title}</b></a></td>
<td width="10%" align="center"><b>${article.numberMessage}</b></td>
</tr>
</c:otherwise>
</c:choose>
</c:forEach>

5
YACOSWeb/WebContent/WEB-INF/jsp/forumArticle.jsp
View File

@@ -30,7 +30,7 @@
<fmt:formatDate value="${message.dateMessage}" dateStyle="short" />
</td>
<td width="25%" align="center" valign="top">${message.user.firstName} ${message.user.lastName}</td>
<td width="60%" align="left"><b>${message.title}</b><br />${message.message}</td>
<td width="60%" align="left"><b>${message.title}:</b><br />${message.message}</td>
</tr>
</c:when>
<c:otherwise>
@@ -65,6 +65,7 @@
<div>
<form:label path="message">Your message</form:label>
<form:textarea path="message" cols="60" rows="10" />
<span class="formError"><form:errors path="message" /></span>
</div>
</fieldset>
@@ -72,6 +73,6 @@
</form:form>
<br />
<a href="main.htm" class="back_link"> Main</a>
<a class="back_link" href="main.htm">Main</a>
</body>
</html>

15
YACOSWeb/WebContent/WEB-INF/jsp/listArticle.jsp
View File

@@ -9,20 +9,9 @@
<c:forEach items="${listArticle}" var="article">
<div class="article cbb">
<h2>${article.title}</h2>
<p>Author: <b>${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</b></p>
<p>
<c:if test="${not empty article.secondaryAuthors}">
Secondary Authors:
<ul>
<c:forEach items="${article.secondaryAuthors}" var="sAuthor">
<li>${sAuthor}</li>
</c:forEach>
</ul>
</c:if>
<p>Topic: <b>${article.topic}</b></p>
<h2><a href="<c:url value='detailArticle.htm?id=${article.id}'/>">${article.title}</a> by ${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</h2>
<p>State: <b>${article.state}</b></p>
<p><a href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download</a>
<p><a class="download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download</a>
</p>
<c:if test="${article.state == 'EVALUATED' or article.state == 'REJECTED' or article.state == 'ACCEPTED'}">
<p><a href="<c:url value="listReport.htm?id=${article.id}"/>"><fmt:message key="validate.report" /></a></p>

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

@@ -57,7 +57,7 @@
<c:choose>
<c:when test="${empty listConference}">
<div class="errorBox">
<div class="warningBox">
Sorry, there is no conference at the moment.
</div>
</c:when>
@@ -73,8 +73,8 @@
<authz:authorize ifNotGranted="ROLE_ANONYMOUS">
<input id="register" type="checkbox" name="register" value="Register" onchange="ShowRegistered()" checked="checked"> Conference you are registered in<br />
<input id="notregister" type="checkbox" name="notregister" value="NotRegister" onchange="ShowNotRegistered()" checked="checked"> Conference you are not registered in<br />
</authz:authorize>
<input id="ongoing" type="checkbox" name="ongoing" value="Upcoming" onchange="ShowOngoing()" checked="checked"> Only upcoming conferences<br />
</authz:authorize>
<input id="ongoing" type="checkbox" name="ongoing" value="Upcoming" onchange="ShowOngoing()"> Only upcoming conferences<br />
</td>
</tr>
</table>
@@ -90,7 +90,7 @@
<c:when test="${varName == 'true'}">
<c:choose>
<c:when test="${conference.currentPhase == 'PAST'}">
<div class="conferenceBloc cbb isRegistered confPast" style="display:none;height:0px;width:0px;">
<div class="conferenceBloc cbb isRegistered confPast">
<h2>
${conference.title} - In this conference you are:
<c:forEach items="${listRole}" var="role">

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

@@ -62,25 +62,25 @@
<c:choose>
<c:when test="${currentConference.typePDF == true or currentConference.typeLatec == true or currentConference.typeWord == true or currentConference.typeODT == true}">
<c:if test="${currentConference.typePDF == true}">
.pdf&nbsp;
<b>.pdf&nbsp;</b>
</c:if>
<c:if test="${currentConference.typeLatec == true}">
.tex&nbsp;
<b>.tex&nbsp;</b>
</c:if>
<c:if test="${currentConference.typeWord == true}">
.doc&nbsp;.docx&nbsp;
<b>.doc&nbsp;.docx&nbsp;</b>
</c:if>
<c:if test="${currentConference.typeODT == true}">
.odt&nbsp;
<b>.odt&nbsp;</b>
</c:if>
</c:when>
<c:otherwise>
Any file's type.
<b>Any file's type.</b>
</c:otherwise>
</c:choose>
<br /><br />
Other informations about the submission: ${currentConference.sendInfo}
Other informations about the submission: <b>${currentConference.sendInfo}</b>
</div>
<br />

12
YACOSWeb/WebContent/WEB-INF/jsp/reportConfCreate.jsp
View File

@@ -56,25 +56,25 @@
<c:choose>
<c:when test="${conferenceReport.typePDF == true or conferenceReport.typeLatec == true or conferenceReport.typeWord == true or conferenceReport.typeODT == true}">
<c:if test="${conferenceReport.typePDF == true}">
.pdf&nbsp;
<b>.pdf&nbsp;</b>
</c:if>
<c:if test="${conferenceReport.typeLatec == true}">
.tex&nbsp;
<b>.tex&nbsp;</b>
</c:if>
<c:if test="${conferenceReport.typeWord == true}">
.doc&nbsp;.docx&nbsp;
<b>.doc&nbsp;.docx&nbsp;</b>
</c:if>
<c:if test="${conferenceReport.typeODT == true}">
.odt&nbsp;
<b>.odt&nbsp;</b>
</c:if>
</c:when>
<c:otherwise>
Any file's type.
<b>Any file's type.</b>
</c:otherwise>
</c:choose>
<br /><br />
Other informations about the submission: ${conferenceReport.sendInfo}
Other informations about the submission: <b>${conferenceReport.sendInfo}</b>
</div>

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

@@ -33,7 +33,7 @@
<form:form method="post" enctype="multipart/form-data" commandName="submissionArticle" id="account_data">
<p class="legend"><fmt:message key="form.article.information" /></p>
<p class="formHelp"><fmt:message key="conference.help.step2datelimit" /></p>
<p class="formHelp"><fmt:message key="conference.help.step2datelimit" /></p><br />
<fieldset>
<span class="info"><fmt:message key="form.field.necessary" /></span>