Menu
▾
▴
[Treebase-guts] SF.net SVN: treebase:[400] trunk/treebase-web/src/main
|
From: <yo...@us...> - 2009-12-21 14:26:19
|
Revision: 400
http://treebase.svn.sourceforge.net/treebase/?rev=400&view=rev
Author: youjun
Date: 2009-12-21 14:26:10 +0000 (Mon, 21 Dec 2009)
Log Message:
-----------
change the mailto subject of involved pages
Modified Paths:
--------------
trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SummaryController.java
trunk/treebase-web/src/main/webapp/WEB-INF/pages/changeStudyStatus.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/editSetTaxonLabel.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyStateSubmissionList.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp
trunk/treebase-web/src/main/webapp/WEB-INF/pages/taxonLabels.jsp
Added Paths:
-----------
trunk/treebase-web/src/main/webapp/WEB-INF/lib/
Modified: trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SummaryController.java
===================================================================
--- trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SummaryController.java 2009-12-18 19:03:26 UTC (rev 399)
+++ trunk/treebase-web/src/main/java/org/cipres/treebase/web/controllers/SummaryController.java 2009-12-21 14:26:10 UTC (rev 400)
@@ -168,6 +168,7 @@
}
resultMap.put("submissionNumber", submission.getSubmissionNumber());
+ resultMap.put("submission", submission);
resultMap.put("studyStatus", study.getStudyStatus().getDescription());
// Collection<Analysis> anacoll = study.getAnalysesReadOnly();
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/changeStudyStatus.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/changeStudyStatus.jsp 2009-12-18 19:03:26 UTC (rev 399)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/changeStudyStatus.jsp 2009-12-21 14:26:10 UTC (rev 400)
@@ -24,7 +24,7 @@
url="/user/summary.html" paramId="id" paramProperty="id"/>
<display:column title="Submitter" sortable="true">
- <a href='mailto:${userList.submitter.emailAddressString}?subject=From Treebase Editor'>${userList.submitter.username}</a>
+ <a href='mailto:${userList.submitter.emailAddressString}?subject=TreeBASE Submission S${userList.id}'>${userList.submitter.username}</a>
</display:column>
<display:column property="study.name" title="Study Name" sortable="true"/>
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/editSetTaxonLabel.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/editSetTaxonLabel.jsp 2009-12-18 19:03:26 UTC (rev 399)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/editSetTaxonLabel.jsp 2009-12-21 14:26:10 UTC (rev 400)
@@ -19,7 +19,12 @@
<form method="post" name="dataform">
<c:set var="counter" value="0"/>
-<c:if test="${publicationState eq 'NotReady'}">
+
+<%if(request.isUserInRole("Admin") || request.isUserInRole("Associate Editor")){%>
+ <% request.setAttribute("isEditable","yes");%>
+ <% } %>
+
+ <c:if test="${publicationState eq 'NotReady'||isEditable eq 'yes'}">
<fieldset>
<legend>Taxon label list editor
<a href="#" class="openHelp" onclick="openHelp('editSetTaxonLabel')"><img class="iconButton" src="<fmt:message key="icons.help"/>" /></a>
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyStateSubmissionList.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyStateSubmissionList.jsp 2009-12-18 19:03:26 UTC (rev 399)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/readyStateSubmissionList.jsp 2009-12-21 14:26:10 UTC (rev 400)
@@ -22,7 +22,7 @@
<display:column title="Submitter" sortable="true"
style="text-align:left; width: 10%">
- <a href='mailto:${userList.submitter.emailAddressString}?subject=From Treebase Editor'>${userList.submitter.username}</a>
+ <a href='mailto:${userList.submitter.emailAddressString}?subject=TreeBASE Submission S${userList.id}'>${userList.submitter.username}</a>
</display:column>
<display:column property="study.studyStatus.description" title="Status"
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp 2009-12-18 19:03:26 UTC (rev 399)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/submissionSummaryView.jsp 2009-12-21 14:26:10 UTC (rev 400)
@@ -11,7 +11,7 @@
</legend>
Submission: <c:out value="${submissionNumber}"/>, <c:out value="${studyStatus}"/>, <a href="/treebase-web/admin/changeStudyStatus.html"> Update Status</a><br/>
Submission initiated: <c:out value="${initiatedDate}"/><br/>
-
+<a href='mailto:${submission.submitter.emailAddressString}?subject=TreeBASE Submission S${submission.id}'>Contact Submitter</a><br/>
<c:if test="${not empty citationsummary.study}">
<c:if test="${not empty citationsummary.study.name}">
Study name: <c:out value="${citationsummary.study.name}"/>
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/taxonLabels.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/taxonLabels.jsp 2009-12-18 19:03:26 UTC (rev 399)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/taxonLabels.jsp 2009-12-21 14:26:10 UTC (rev 400)
@@ -27,7 +27,11 @@
<!-- this class name 'checkBoxColumn' is important, not just for styling,
but also to add check/uncheck all behaviour -->
- <c:if test="${editable}">
+ <%if(request.isUserInRole("Admin") || request.isUserInRole("Associate Editor")){%>
+ <% request.setAttribute("isEditable","yes");%>
+ <% } %>
+
+ <c:if test="${editable||isEditable eq 'yes'}">
<display:column class="checkBoxColumn">
<input type="checkbox" name="validate" value="${userList.id}" title="Include/exclude from validation"
<c:if test="${!userList.attemptedLinking}"> checked="checked"</c:if>
@@ -72,7 +76,7 @@
</c:if>
</display:column>
- <c:if test="${editable}">
+ <c:if test="${editable||isEditable eq 'yes'}">
<display:column
url="/user/editTaxonLabel.html"
paramId="taxonlabelid"
@@ -88,7 +92,7 @@
</c:if>
- <c:if test="${editable}">
+ <c:if test="${editable||isEditable eq 'yes'}">
<display:footer>
<tr>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
