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

Multiple corrections

Browse Source
This commit is contained in:
Frederic Debuire
2008-02-24 23:17:02 +00:00
parent 461fcf7793
commit 2251288425
15 changed files with 341 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@
</td>
<td><form:input onfocus="ds_sh(this);" path="dateArticle"
cssStyle="cursor: text" />
<div class="formErrors">
<div class="formError">
<form:errors path="dateArticle" />
</div>
</td>
@@ -41,7 +41,7 @@
</td>
<td><form:input onfocus="ds_sh(this);" path="dateEvaluation"
cssStyle="cursor: text" />
<div class="formErrors">
<div class="formError">
<form:errors path="dateEvaluation" />
</div>
</td>
@@ -51,7 +51,7 @@
</td>
<td><form:input onfocus="ds_sh(this);" path="dateStart"
cssStyle="cursor: text" />
<div class="formErrors">
<div class="formError">
<form:errors path="dateStart" />
</div>
</td>
@@ -60,7 +60,7 @@
<td class="formLabel"><fmt:message key="conference2.end" /></td>
<td><form:input onfocus="ds_sh(this);" path="dateEnd"
cssStyle="cursor: text" />
<div class="formErrors">
<div class="formError">
<form:errors path="dateEnd" />
</div>
</td>

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

@@ -7,8 +7,15 @@
<script type="text/javascript">
//<![CDATA[
function HideRegistered() {
var listElem = $$('.isRegistered');
function ShowRegistered() {
// faux tt ca
var listElem;
if ($('ongoing').checked)
listElem = $$('.isRegistered', 'confPost');
else
listElem = $$('.isRegistered');
for (var i = 0; i < listElem.length; i++) {
if (listElem[i].visible())
listElem[i].style.display = "none";
@@ -17,8 +24,23 @@
}
}
function HideNotRegistered() {
var listElem = $$('.notRegistered');
function ShowNotRegistered() {
var listElem;
if ($('ongoing').checked)
listElem = $$('.notRegistered', 'confPost');
else
listElem = $$('.notRegistered');
for (var i = 0; i < listElem.length; i++) {
if (listElem[i].visible())
listElem[i].style.display = "none";
else
listElem[i].style.display = "";
}
}
function ShowOngoing() {
var listElem = $$('.confPast');
for (var i = 0; i < listElem.length; i++) {
if (listElem[i].visible())
listElem[i].style.display = "none";
@@ -66,9 +88,10 @@
<table width="100%">
<tr>
<td width="7%">Hide</td>
<td width="93%"><input type="checkbox" name="register" value="Register" onchange="HideRegistered()"> Conference you are registered in<br />
<input type="checkbox" name="notregister" value="NotRegister" onchange="HideNotRegistered()"> Conference you are not registered in
<td width="7%">Show</td>
<td width="93%"><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 />
<input id="ongoing" type="checkbox" name="ongoing" value="Ongoing" onchange="ShowOngoing()"> Only ongoing conferences<br />
</td>
</tr>
</table>
@@ -82,40 +105,66 @@
</c:forEach>
<c:choose>
<c:when test="${varName == 'true'}">
<div class="conferenceBloc cbb isRegistered">
<c:choose>
<c:when test="${conference.currentPhase == 'PAST'}">
<div class="conferenceBloc cbb isRegistered confPast">
<h2>
${conference.title} - In this conference you are:
<c:forEach items="${listRole}" var="role">
<c:if test="${conference.id == role.conference.id}">
${fn:toLowerCase(role.type)}
<span style="color: #8D0000; text-transform: capitalize;">${fn:toLowerCase(role.type)}</span>
</c:if>
</c:forEach>
</h2>
<b>Description:</b> ${conference.description}<br />
<center>
<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">Select</a><br />
<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">Select</a><br />
</center>
</div>
</c:when>
<c:otherwise>
<div class="conferenceBloc cbb notRegistered">
<h2>${conference.title} - You haven't any role in this conference</h2>
</div>
</c:when>
<c:otherwise>
<div class="conferenceBloc cbb isRegistered">
<h2>
${conference.title} - In this conference you are:
<c:forEach items="${listRole}" var="role">
<c:if test="${conference.id == role.conference.id}">
<span style="color: #8D0000; text-transform: capitalize;">${fn:toLowerCase(role.type)}</span>
</c:if>
</c:forEach>
</h2>
<b>Description:</b> ${conference.description}<br />
<center>
<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">View details</a><br />
<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">Select</a><br />
</center>
</div>
</div>
</c:otherwise>
</c:choose>
</c:when>
<c:otherwise>
<c:choose>
<c:when test="${conference.currentPhase == 'PAST'}">
<div class="conferenceBloc cbb notRegistered confPast">
<h2>${conference.title} - You haven't any role in this conference</h2>
<b>Description:</b> ${conference.description}<br />
<center>
<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">View details</a><br />
</center>
</div>
</c:when>
<c:otherwise>
<div class="conferenceBloc cbb notRegistered">
<h2>${conference.title} - You haven't any role in this conference</h2>
<b>Description:</b> ${conference.description}<br />
<center>
<a href="<c:url value="/chooseConference.htm?idConf=${conference.id}" />">View details</a><br />
</center>
</div>
</c:otherwise>
</c:choose>
</c:otherwise>
</c:choose>
</c:forEach>
</c:otherwise>
</c:choose>
<br />
<a href="<c:url value="main.htm"/>">Home</a>
</body>
</html>

22
YACOSWeb/WebContent/WEB-INF/jsp/listEvaluation.jsp
View File

@@ -6,8 +6,6 @@
<h4 class="title"><fmt:message key="evaluation.choose" /></h4>
<p class="formHelp">
<fmt:message key="evaluation.help"/>
</p>
@@ -21,19 +19,27 @@
</td>
</tr>
<tr>
<!--<td align="left">
Topic: <b>${article.article.topic}</b><br/>
Abstract: ${article.article.abstractText}
<td align="left">
<c:choose>
<c:when test="${not empty article.referee}">
Delegated to:<br />
<c:forEach var="referee" items="${article.referee}">
${referee.firstName} ${referee.lastName}<br/>
</c:forEach>
</c:when>
<c:otherwise>
&nbsp;
</c:otherwise>
</c:choose>
</td>
-->
<td align="right">
<c:if test="${article.evaluated == false}">
<c:if test="${article.evaluated == false and empty article.referee}">
<c:if test="${article.article.state != 'REJECTED' and article.article.state != 'ACCEPTED'}">
<a title="Click to evaluate" href="<c:url value="evaluation.htm?id=${article.article.id}"/>">Evaluate <img src="./images/button_follow_32x32.png" alt="Click to evaluate" /></a>
</c:if>
</c:if>
<c:if test="${article.evaluated == true}">
<c:if test="${article.evaluated == true and empty article.referee}">
<c:if test="${article.article.state != 'REJECTED' and article.article.state != 'ACCEPTED'}">
<a title="Click to modify evaluation" href="<c:url value="evaluation.htm?id=${article.article.id}&action=modify"/>">Modify the evaluation <img src="./images/cc-kedit-32x32.png" alt="Click to modify evaluation" /></a>
</c:if>

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

@@ -38,7 +38,39 @@
<b><fmt:message key="conference.detail.date.end" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateEnd }" dateStyle="long" /><br /><br />
<b><fmt:message key="conference.detail.date.article" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateArticle }" dateStyle="long" /><br />
<b><fmt:message key="conference.detail.date.evaluation" /></b>&nbsp;<fmt:formatDate value="${currentConference.dateEvaluation }" dateStyle="long" /><br />
</div><br />
</div>
<h3 class="descriptionTitle">Submission Informations</h3>
<div class="textBox">
<c:if test="${currentConference.pageNumber != 0}">
The number of pages for an article is about ${currentConference.pageNumber}.<br/><br/>
</c:if>
The following file's type are allowed:&nbsp;
<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;
</c:if>
<c:if test="${currentConference.typeLatec == true}">
.tex&nbsp;
</c:if>
<c:if test="${currentConference.typeWord == true}">
.doc&nbsp;.docx&nbsp;
</c:if>
<c:if test="${currentConference.typeODT == true}">
.odt&nbsp;
</c:if>
</c:when>
<c:otherwise>
Any file's type.
</c:otherwise>
</c:choose>
<br /><br />
Other informations about the submission: ${currentConference.sendInfo}
</div>
<br />
<center><a href="<c:url value="submissionArticle.htm" />" class="submitLink"><fmt:message key="conference.detail.link.submit" /></a></center>
</c:when>

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

@@ -9,48 +9,65 @@
</head>
<body>
<h4 class="title"><fmt:message key="manageArticle.title" /></h4>
<br />
<div id="articleList" class="dynamicFredList">
<c:forEach var="article" items="${listArticle}" varStatus="i">
<div id="articleLine${i.index}" align="center" class="articleLine">${article.title}</div>
<div id="articleDetails${i.index}" style="display: none;">
<table width="100%">
<tbody>
<tr>
<td width="50%" align="center">
<ul>
<h4 class="title"><fmt:message key="manageArticle.title" /></h4>
<c:if test="${param['delete'] eq 'ok'}">
<p class="formOk">
Your article has been successfully deleted.<br/>
</p>
</c:if>
<c:choose>
<c:when test="${empty listArticle}">
<div class="warningBox">
You have no article at the moment.<br />
You can submit an article in clicking
<a href="submissionArticle.htm">here</a>
or using the item menu.<br />
</div>
</c:when>
<c:otherwise>
<div id="articleList" class="dynamicFredList">
<c:forEach var="article" items="${listArticle}" varStatus="i">
<div id="articleLine${i.index}" align="center" class="articleLine">${article.title}</div>
<div id="articleDetails${i.index}" style="display: none;">
<table width="100%">
<tbody>
<tr>
<td width="50%" align="center">
<ul>
<li>Secondary Authors:
<ul>
<c:forEach var="sAuthor" items="${article.secondaryAuthors}">
<li><b>${sAuthor}</b></li>
<ul>
<c:forEach var="sAuthor" items="${article.secondaryAuthors}">
<li><b>${sAuthor}</b></li>
</c:forEach>
</ul>
</li>
<li>Topic: <b>${article.topic}</b></li>
</ul>
</ul>
</li>
<li>Topic: <b>${article.topic}</b></li>
</ul>
</td>
<td width="50%" align="center">
${article.abstractText}
</td>
</tr>
<tr>
<tr>
<td colspan="2" align="center">
<a class="manage_link" id="articleURL${i.index}" title="Download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download<img src="./images/cc-download_manager-32x32.png" alt="Download" /></a>
<a class="manage_link" 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>">Modify<img src="./images/cc-kedit-32x32.png" alt="Modify" /></a>
<a class="manage_link" id="articleURL${i.index}" title="Download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download<img src="./images/cc-download_manager-32x32.png" alt="Download" /></a>
<a class="manage_link" 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>">Modify<img src="./images/cc-kedit-32x32.png" alt="Modify" /></a>
<a class="manage_link" id="suppressArticle${i.index}" title="Delete" href="javascript:deleteArticle(${article.id});">Delete<img src="./images/cc-button_cancel-32x32.png" alt="Delete"/></a>
</td>
</tr>
</tbody>
</table>
</div>
</c:forEach>
</div>
</td>
</tr>
</tbody>
</table>
</div>
</c:forEach>
</div>
</c:otherwise>
</c:choose>
</body>
</html>

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

@@ -37,22 +37,57 @@
<b><fmt:message key="conference.detail.date.article" /></b>&nbsp;<fmt:formatDate value="${conferenceReport.dateArticle }" dateStyle="long" /><br />
<b><fmt:message key="conference.detail.date.evaluation" /></b>&nbsp;<fmt:formatDate value="${conferenceReport.dateEvaluation }" dateStyle="long" /><br />
</div>
<h3 class="dateTitle">Submission Informations</h3>
<div class="textBox">
<c:if test="${conferenceReport.pageNumber == 0}">
The number of pages for an article is undefined.<br/><br/>
</c:if>
<c:if test="${conferenceReport.pageNumber != 0}">
The number of pages for an article is about ${conferenceReport.pageNumber}.<br/><br/>
</c:if>
The following file's type are allowed:&nbsp;
<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;
</c:if>
<c:if test="${conferenceReport.typeLatec == true}">
.tex&nbsp;
</c:if>
<c:if test="${conferenceReport.typeWord == true}">
.doc&nbsp;.docx&nbsp;
</c:if>
<c:if test="${conferenceReport.typeODT == true}">
.odt&nbsp;
</c:if>
</c:when>
<c:otherwise>
Any file's type.
</c:otherwise>
</c:choose>
<br /><br />
Other informations about the submission: ${conferenceReport.sendInfo}
</div>
<h3 class="descriptionTitle"></h3>
<h3 class="descriptionTitle">Criterion</h3>
<div class="textBox">
<c:if test="${not empty criterionReport}">
<b>Criterion's list </b><br />
<b>Criterion's list: </b><br />
</c:if>
<c:forEach items="${criterionReport}" var="crit">
${crit.name} From ${crit.min_rating} to ${crit.max_rating}<br />
${crit.name} From <b>${crit.min_rating}</b> to <b>${crit.max_rating}</b><br />
</c:forEach>
</div>
<h3 class="descriptionTitle"></h3>
<h3 class="descriptionTitle">User</h3>
<div class="textBox">
<b>Chairman:</b> ${conferenceReport.chairman.firstName} ${conferenceReport.chairman.lastName}<br /><br />
<c:if test="${not empty userReport}">
<b>PCmember's list </b><br />
<b>PCmember's list: </b><br />
</c:if>
<c:forEach items="${userReport}" var="user">
${user.firstName} ${user.lastName}<br />

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

@@ -38,17 +38,17 @@
<span class="info"><fmt:message key="form.field.necessary" /></span>
<div>
<form:label path="title"><fmt:message key="form.submission.article.title" /></form:label>
<form:input path="title"/>*
* <form:input path="title"/>
<span class="formError"><form:errors path="title" /></span>
</div>
<div>
<form:label path="theme"><fmt:message key="form.submission.article.theme" /></form:label>
<form:input path="theme"/>*
* <form:input path="theme"/>
<span class="formError"><form:errors path="theme" /></span>
</div>
<div>
<form:label path="abstractText"><fmt:message key="form.submission.article.abstractText" /></form:label>
<form:textarea path="abstractText" cols="60" rows="10" />*<br />
* <form:textarea path="abstractText" cols="60" rows="10" />
<span class="formError"><form:errors path="abstractText" /></span>
</div>
</fieldset>
@@ -82,9 +82,15 @@
<p class="legend"><fmt:message key="form.article.submit.info" /></p>
<fieldset>
<div>
<div>
<c:if test="${currentConference.pageNumber != 0}">
<p class="formHelp">
Remember that the page's number of an article should be about ${currentConference.pageNumber}.
</p>
</c:if>
<form:label path="file"><fmt:message key="form.article.file" /></form:label>
<input type="file" name="file" />*
* <input type="file" name="file" />
<span class="formError"><form:errors path="file" /></span>
</div>
</fieldset>

63
YACOSWeb/WebContent/WEB-INF/jsp/userBoard.jsp
View File

@@ -76,6 +76,16 @@ function showArticleReferee() {
<a name="listConf"></a>
<h3 class="descriptionTitle">Generals informations</h3>
<div class="textBox">
<c:choose>
<c:when test="${numberCreationTokens != 0}">
You can create <b>${numberCreationTokens}</b> conference(s). Click
<a href="addConference.htm">here</a> to create one now.<br /><br />
</c:when>
<c:otherwise>
You can't create a conference at the moment. If you want to create a conference, you should address to the <a href="mailto:admin@yacos.org">administrator</a> of this site.<br /><br />
</c:otherwise>
</c:choose>
You currently follow <b>${numberConference}</b> conference(s)<br /><br />
<c:if test="${not empty listConfForUser}">
@@ -129,7 +139,7 @@ function showArticleReferee() {
<a name="listArticleAuthor"></a>
You have posted <b>${numberArticle}</b> article(s).<br /><br />
<c:if test="${not empty listConfForUser}">
<c:if test="${not empty listAllArticle}">
If you want to see the list of articles you have submitted, click <a href="#listArticleAuthor" onclick="showArticleAll();">here</a>.
@@ -197,7 +207,9 @@ function showArticleReferee() {
</c:if>
<a name="listArticleReferee"></a>
You have <b>${numberArticleReferee}</b> article(s) in your evaluation list.<br /><br />
You have <b>${numberArticleReferee}</b> article(s) in your evaluation list.<br />
You have evaluated <b>${numberEvaluatedReferee}</b> article(s)<br />
You have to evaluate <b>${numberNotEvaluatedReferee}</b> article(s)<br /><br />
<c:if test="${not empty listArticleReferee}">
If you want to see the list of articles you have in your evaluation list, click <a href="#listArticleReferee" onclick="showArticleReferee();">here</a>.
@@ -210,12 +222,16 @@ function showArticleReferee() {
<tr>
<td align="center" width="25%">${article.title}</td>
<td align="center" width="25%">
<c:if test="${article.state == 'SUBMITED'}">
To evaluate
</c:if>
<c:if test="${article.state == 'EVALUATED'}">
Evaluated
</c:if>
<c:if test="${article.evaluated == false}">
<c:if test="${article.state != 'REJECTED' and article.state != 'ACCEPTED'}">
To evaluate
</c:if>
</c:if>
<c:if test="${article.evaluated == true}">
<c:if test="${article.state != 'REJECTED' and article.state != 'ACCEPTED'}">
Evaluated
</c:if>
</c:if>
<c:if test="${article.state == 'REJECTED'}">
Rejected
</c:if>
@@ -268,7 +284,9 @@ function showArticleReferee() {
<a name="listArticlePcMember"></a>
You have <b>${numberArticlePCMember}</b> article(s) in your evaluation list.<br /><br />
You have <b>${numberArticlePCMember}</b> article(s) in your evaluation list.<br />
You have evaluated <b>${numberEvaluatedPCMember}</b> article(s)<br />
You have to evaluate <b>${numberNotEvaluatedPCMember}</b> article(s)<br /><br />
<c:if test="${not empty listArticlePCMember}">
If you want to see the list of articles you have in your evaluation list, click <a href="#listArticlePcMember" onclick="showArticlePcMember();">here</a>.
@@ -289,12 +307,16 @@ function showArticleReferee() {
</c:forEach>
</c:when>
<c:otherwise>
<c:if test="${article.state == 'SUBMITED'}">
To evaluate
</c:if>
<c:if test="${article.state == 'EVALUATED'}">
Evaluated
</c:if>
<c:if test="${article.evaluated == false}">
<c:if test="${article.state != 'REJECTED' and article.state != 'ACCEPTED'}">
To evaluate
</c:if>
</c:if>
<c:if test="${article.evaluated == true}">
<c:if test="${article.state != 'REJECTED' and article.state != 'ACCEPTED'}">
Evaluated
</c:if>
</c:if>
<c:if test="${article.state == 'REJECTED'}">
Rejected
</c:if>
@@ -324,19 +346,8 @@ function showArticleReferee() {
<div class="textBox">
You are Chairman in <b>${numberChairman}</b> conference(s)<br /><br />
<c:choose>
<c:when test="${numberCreationTokens} != 0">
You can create <b>${numberCreationTokens}</b> conference(s). Click
<a href="addConference.htm">here</a> to create one now.
</c:when>
<c:otherwise>
You can't create a conference at the moment. If you want to create a conference, you should address to the <a href="mailto:admin@yacos.org">administrator</a> of this site.
</c:otherwise>
</c:choose>
<a name="listConfChairman"></a>
<c:if test="${not empty listConfForUser}">
<br /><br />
If you want to see the list of conferences you are registered in, click <a href="#listConfChairman" onclick="showConfChairman();">here</a>.