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

Corrections diverses

Browse Source
This commit is contained in:
conceptoire.com
2008-02-25 14:23:08 +00:00
parent 7f37bba101
commit d8a31c0219
7 changed files with 64 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
YACOSWeb/WebContent/WEB-INF/applicationContextAcegi.xml
View File

@@ -121,6 +121,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schem
/listreport.htm=ROLE_USER /listreport.htm=ROLE_USER
/detailarticle.htm=ROLE_USER /detailarticle.htm=ROLE_USER
/admin.htm=ROLE_ADMIN /admin.htm=ROLE_ADMIN
/forum.htm=ROLE_CHAIRMAN,ROLE_PCMEMBER
/**=IS_AUTHENTICATED_ANONYMOUSLY /**=IS_AUTHENTICATED_ANONYMOUSLY
</value> </value>
</property> </property>

10
YACOSWeb/WebContent/WEB-INF/jsp/evaluation.jsp
View File

@@ -9,17 +9,19 @@
<form:form method="post" commandName="evaluationForm" id="account_data"> <form:form method="post" commandName="evaluationForm" id="account_data">
<p class="legend">Rating</p> <p class="legend">Rating</p>
<fieldset> <fieldset class="inline">
<c:forEach items="${evaluationForm.simpleRatings}" var="criterion" varStatus="j"> <c:forEach items="${evaluationForm.simpleRatings}" var="criterion" varStatus="j">
<div> <div>
<form:label path="title">${criterion.name}</form:label>
<form:hidden path="simpleRatings[${j.index}].name"></form:hidden> <form:hidden path="simpleRatings[${j.index}].name"></form:hidden>
<form:label path="simpleRatings[${j.index}].name"><form:select path="simpleRatings[${j.index}].value"> <form:label path="simpleRatings[${j.index}].name">
${criterion.name}
</form:label>
<form:select path="simpleRatings[${j.index}].value">
<c:forEach var="i" begin="${criterion.min_rating}" end="${criterion.max_rating}"> <c:forEach var="i" begin="${criterion.min_rating}" end="${criterion.max_rating}">
<form:option value="${i}"></form:option> <form:option value="${i}"></form:option>
</c:forEach> </c:forEach>
</form:select></form:label> </form:select>
</div> </div>
</c:forEach> </c:forEach>

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

@@ -4,49 +4,29 @@
<head> <head>
<script type='text/javascript' src='./javascripts/prototype.js'></script> <script type='text/javascript' src='./javascripts/prototype.js'></script>
<script type='text/javascript' src='./javascripts/scriptaculous.js'></script>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
function ShowRegistered() { function ShowRegistered() {
if ($('register').checked)
// faux tt ca listElem = $$('.isRegistered').invoke('blindDown');
var listElem;
if ($('ongoing').checked)
listElem = $$('.isRegistered', 'confPost');
else else
listElem = $$('.isRegistered'); listElem = $$('.isRegistered').invoke('blindUp');
for (var i = 0; i < listElem.length; i++) {
if (listElem[i].visible())
listElem[i].style.display = "none";
else
listElem[i].style.display = "";
}
} }
function ShowNotRegistered() { function ShowNotRegistered() {
var listElem; if ($('notregister').checked)
if ($('ongoing').checked) listElem = $$('.notRegistered').invoke('blindDown');
listElem = $$('.notRegistered', 'confPost');
else else
listElem = $$('.notRegistered'); listElem = $$('.notRegistered').invoke('blindUp');
for (var i = 0; i < listElem.length; i++) {
if (listElem[i].visible())
listElem[i].style.display = "none";
else
listElem[i].style.display = "";
}
} }
function ShowOngoing() { function ShowOngoing() {
var listElem = $$('.confPast'); if ($('ongoing').checked)
for (var i = 0; i < listElem.length; i++) { listElem = $$('.confPast').invoke('blindUp');
if (listElem[i].visible()) else
listElem[i].style.display = "none"; listElem = $$('.confPast').invoke('blindDown');
else
listElem[i].style.display = "";
}
} }
//]]> //]]>
</script> </script>

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

@@ -21,9 +21,9 @@
<c:when test="${empty listArticle}"> <c:when test="${empty listArticle}">
<div class="warningBox"> <div class="warningBox">
You have no article at the moment.<br /> You have no article at the moment.<br />
You can submit an article in clicking You can submit an article by clicking
<a href="submissionArticle.htm">here</a> <a href="submissionArticle.htm">here</a>
or using the item menu.<br /> or using the menu item.<br />
</div> </div>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
@@ -36,21 +36,26 @@
<table width="100%"> <table width="100%">
<tbody> <tbody>
<tr> <tr>
<td width="50%" align="center"> <td>
<ul> <ul>
<li>Secondary Authors: <li>
<h2>Secondary Authors:</h2>
<ul> <ul>
<c:forEach var="sAuthor" items="${article.secondaryAuthors}"> <c:forEach var="sAuthor" items="${article.secondaryAuthors}">
<li><b>${sAuthor}</b></li> <li><b>${sAuthor}</b></li>
</c:forEach> </c:forEach>
</ul> </ul>
</li> </li>
<li>Topic: <b>${article.topic}</b></li> <li>
<h2>Topic:</h2>
<b>${article.topic}</b>
</li>
<li>
<h2>Abstract :</h2>
${article.abstractText}
</li>
</ul> </ul>
</td> </td>
<td width="50%" align="center">
${article.abstractText}
</td>
</tr> </tr>
<tr> <tr>
<td colspan="2" align="center"> <td colspan="2" align="center">

28
YACOSWeb/WebContent/WEB-INF/jsp/validateArticle.jsp
View File

@@ -6,7 +6,7 @@
<h4 class="title">Validate an article</h4> <h4 class="title">Validate an article</h4>
<p class="formHelp"> <p class="formHelp">
Choose whether you want to validate an article (i.e. the article will take part in the conference) or reject it. Choose whether you want to validate an article (i.e. the article will be featured in the conference) or reject it.
</p> </p>
<c:forEach items="${listArticleValidate}" var="article"> <c:forEach items="${listArticleValidate}" var="article">
@@ -17,11 +17,27 @@
<td>${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</td> <td>${article.mainAuthor.firstName} ${article.mainAuthor.lastName}</td>
</tr> </tr>
<tr> <tr>
<td colspan="2">State: ${article.state} <td colspan="2">
<a href="<c:url value="validateOrReject.htm?value=valide&id=${article.id}"/>"> <c:choose>
<fmt:message key="validate.validate" /><img src="./images/ok.png" alt="Validate" /></a> <c:when test="${article.state != 'REJECTED' and article.state != 'ACCEPTED'}">
<a href="<c:url value="validateOrReject.htm?value=reject&id=${article.id}"/>"> <a href="<c:url value="validateOrReject.htm?value=valide&id=${article.id}"/>"
<fmt:message key="validate.reject" /><img src="./images/cancel.png" alt="Reject" /></a></td> onclick="return confirm('You are about to validate this article. This operation cannot be undone. Do you want to continue ?')">
<fmt:message key="validate.validate" /><img src="./images/ok.png" alt="Validate" /></a>
<a href="<c:url value="validateOrReject.htm?value=reject&id=${article.id}"/>"
onclick="return confirm('You are about to reject this article. This operation cannot be undone. Do you want to continue ?')">
<fmt:message key="validate.reject" /><img src="./images/cancel.png" alt="Reject" /></a>
</c:when>
<c:otherwise>
<c:if test="${article.state == 'REJECTED'}">
<img src="./images/cancel.png" alt="Rejected" />
</c:if>
<c:if test="${article.state == 'ACCEPTED'}">
<img src="./images/ok.png" alt="Validated" />
</c:if>
State: ${article.state}
</c:otherwise>
</c:choose>
</td>
</tr> </tr>
<tr> <tr>
<td><a title="Download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download<img <td><a title="Download" href="<c:url value="/download.htm"><c:param name="articleId" value="${article.id}"/></c:url>">Download<img

6
YACOSWeb/WebContent/stylesheets/base.css
View File

@@ -482,6 +482,12 @@ a.manage_link:hover {
float:left; float:left;
width:195px; width:195px;
} }
#account_data fieldset.inline div label {
display:inline;
width:195px;
}
#account_data fieldset div input { #account_data fieldset div input {
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif; font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
color:#847d6e; color:#847d6e;

6
YACOSWeb/src/org/yacos/web/PCmember/controller/ForumController.java
View File

@@ -55,7 +55,9 @@ public class ForumController extends SimpleFormController {
String person = request.getParameter("role"); String person = request.getParameter("role");
// TODO : renvoyer un truc s'il n'a pas le role if(person == null){
throw new ModelAndViewDefiningException(new ModelAndView("404error"));
}
if (person.equals("pcmember")) { if (person.equals("pcmember")) {
if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.PCMEMBER, conf.getId())) { if (userManager.hasRoleForConference(SessionService.getInstance().getCurrentUserLogin(), RoleType.PCMEMBER, conf.getId())) {
listArticle = articleManager.getArticlesOfMember(conf.getId(), SessionService.getInstance().getCurrentUserLogin()); listArticle = articleManager.getArticlesOfMember(conf.getId(), SessionService.getInstance().getCurrentUserLogin());
@@ -67,7 +69,7 @@ public class ForumController extends SimpleFormController {
} }
} }
else else
throw new ModelAndViewDefiningException(new ModelAndView("404error")); throw new ModelAndViewDefiningException(new ModelAndView("denied"));
return new ModelAndView("forum", "listArticle", listArticle); return new ModelAndView("forum", "listArticle", listArticle);