Menu
▾
▴
treebase-guts
|
From: <rv...@us...> - 2010-01-15 14:36:55
|
Revision: 447
http://treebase.svn.sourceforge.net/treebase/?rev=447&view=rev
Author: rvos
Date: 2010-01-15 14:36:49 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Added generated error/warning messages to template
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 14:19:19 UTC (rev 446)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 14:36:49 UTC (rev 447)
@@ -178,6 +178,16 @@
<h2><c:out value="${headerPrefix}"/> Study ${study.id}</h2>
<div class="message" id="searchMessages">
+
+<c:if test="${not empty messages}">
+ <c:forEach var="msg" items="${messages}">
+ <div>
+ <img src="<fmt:message key="icons.info"/>" alt="<fmt:message key="icon.information"/>" class="icon" />
+ <span style="color: red; ">${msg}</span>
+ </div>
+ </c:forEach>
+</c:if>
+
<c:if test="${! empty study.citation.title}">
<div>
<img src="<fmt:message key="icons.info"/>" alt="<fmt:message key="icon.information"/>" class="icon" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-01-15 14:52:21
|
Revision: 449
http://treebase.svn.sourceforge.net/treebase/?rev=449&view=rev
Author: rvos
Date: 2010-01-15 14:52:06 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Now displays reviewer mode based on request attribute
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 14:39:53 UTC (rev 448)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 14:52:06 UTC (rev 449)
@@ -177,15 +177,14 @@
</div>
<h2><c:out value="${headerPrefix}"/> Study ${study.id}</h2>
+
<div class="message" id="searchMessages">
-<c:if test="${not empty messages}">
- <c:forEach var="msg" items="${messages}">
+<c:if test="${reviewerAccessGranted}">
<div>
<img src="<fmt:message key="icons.info"/>" alt="<fmt:message key="icon.information"/>" class="icon" />
- <span style="color: red; ">${msg}</span>
+ <span style="color: red; ">You are in reviewer mode.</span>
</div>
- </c:forEach>
</c:if>
<c:if test="${! empty study.citation.title}">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-01-15 15:55:25
|
Revision: 455
http://treebase.svn.sourceforge.net/treebase/?rev=455&view=rev
Author: rvos
Date: 2010-01-15 15:55:17 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Added reviewer agreement.
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 15:23:47 UTC (rev 454)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 15:55:17 UTC (rev 455)
@@ -183,8 +183,59 @@
<c:if test="${reviewerAccessGranted}">
<div>
<img src="<fmt:message key="icons.info"/>" alt="<fmt:message key="icon.information"/>" class="icon" />
- <span style="color: red; ">You are in reviewer mode ${displayAgreement}.</span>
+ <span style="color: red; ">You are in reviewer mode.</span>
</div>
+ <c:if test="${displayAgreement}">
+ <script type="text/javascript">
+var msg = "Reviewer/Referee Access Agreement\n"
++ "\n"
++ "You have reached this page using a special URL that is intended to be used\n"
++ "by journal editors and reviewers or referees of a paper that is under\n"
++ "consideration for publication. This URL gives you access to the submitted\n"
++ "data and metadata associated with analyses and results presented in the\n"
++ "paper under review. Please carefully examine the data paying special\n"
++ "attention to the following:\n"
++ "\n"
++ "* The citation data (authors, year, citation, abstract) should be\n"
++ " complete, except for information that is not yet known (e.g. volume or\n"
++ " page numbers).\n"
++ "* Verify that nexus files are error-free and executable by software\n"
++ " programs (e.g. PAUP, Mesquite, MacClade, etc). Please make sure that the\n"
++ " taxon labels for trees are identical, or a subset of, the taxon labels in\n"
++ " data matrices connected by way of an analysis. If taxon labels in trees do\n"
++ " not match with taxon labels in associated data matrices, the data will not\n"
++ " be useful to the scientific community.\n"
++ "* Verify that data are not missing and that opportunities to supply\n"
++ " valuable metadata are not overlooked. For example, TreeBASE can store\n"
++ " Genbank accession numbers, museum voucher IDs, latitude and longitudes for\n"
++ " specimen localities, character names and character state names for\n"
++ " morphological data, etc. Including these metadata are sometimes overlooked\n"
++ " by submitting authors, yet sharing this metadata is extremely valuable to\n"
++ " the scientific community. Please use your power as a reviewer to encourage\n"
++ " the sharing of richly-annotated metadata.\n"
++ "* Verify that analyses are not missing and that, where possible, analysis\n"
++ " entries include software commands (e.g. the contents of a PAUP block or\n"
++ " MrBayes block) so that analyses can be replicated easily (e.g. commands\n"
++ " that describe substitution models, data partitions, and heuristic search\n"
++ " parameters).\n"
++ "* Verify that taxon labels are mapped against TreeBASE's taxonomic\n"
++ " dictionary. Data in TreeBASE can only be found using a taxon name search if\n"
++ " the taxon labels are properly mapped.\n"
++ "\n"
++ "By clicking the 'OK' button below, you agree to keep these data\n"
++ "confidential; you agree not to retain these data after completing your report\n"
++ "to the journal editor; you agree not to use these data or knowledge of these\n"
++ "data for the purposes of your research until and unless the paper under\n"
++ "review has been published and the data have been made available to the\n"
++ "general public; you agree to keep the URL confidential.\n";
+ if (confirm(msg) {
+ // do things if OK
+ }
+ else {
+ history.back(1);
+ }
+ </script>
+ </c:if>
</c:if>
<c:if test="${! empty study.citation.title}">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-01-15 16:01:51
|
Revision: 456
http://treebase.svn.sourceforge.net/treebase/?rev=456&view=rev
Author: rvos
Date: 2010-01-15 16:01:45 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Added reviewer agreement confirmation dialog as onLoad() callback
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 15:55:17 UTC (rev 455)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 16:01:45 UTC (rev 456)
@@ -187,53 +187,57 @@
</div>
<c:if test="${displayAgreement}">
<script type="text/javascript">
-var msg = "Reviewer/Referee Access Agreement\n"
-+ "\n"
-+ "You have reached this page using a special URL that is intended to be used\n"
-+ "by journal editors and reviewers or referees of a paper that is under\n"
-+ "consideration for publication. This URL gives you access to the submitted\n"
-+ "data and metadata associated with analyses and results presented in the\n"
-+ "paper under review. Please carefully examine the data paying special\n"
-+ "attention to the following:\n"
-+ "\n"
-+ "* The citation data (authors, year, citation, abstract) should be\n"
-+ " complete, except for information that is not yet known (e.g. volume or\n"
-+ " page numbers).\n"
-+ "* Verify that nexus files are error-free and executable by software\n"
-+ " programs (e.g. PAUP, Mesquite, MacClade, etc). Please make sure that the\n"
-+ " taxon labels for trees are identical, or a subset of, the taxon labels in\n"
-+ " data matrices connected by way of an analysis. If taxon labels in trees do\n"
-+ " not match with taxon labels in associated data matrices, the data will not\n"
-+ " be useful to the scientific community.\n"
-+ "* Verify that data are not missing and that opportunities to supply\n"
-+ " valuable metadata are not overlooked. For example, TreeBASE can store\n"
-+ " Genbank accession numbers, museum voucher IDs, latitude and longitudes for\n"
-+ " specimen localities, character names and character state names for\n"
-+ " morphological data, etc. Including these metadata are sometimes overlooked\n"
-+ " by submitting authors, yet sharing this metadata is extremely valuable to\n"
-+ " the scientific community. Please use your power as a reviewer to encourage\n"
-+ " the sharing of richly-annotated metadata.\n"
-+ "* Verify that analyses are not missing and that, where possible, analysis\n"
-+ " entries include software commands (e.g. the contents of a PAUP block or\n"
-+ " MrBayes block) so that analyses can be replicated easily (e.g. commands\n"
-+ " that describe substitution models, data partitions, and heuristic search\n"
-+ " parameters).\n"
-+ "* Verify that taxon labels are mapped against TreeBASE's taxonomic\n"
-+ " dictionary. Data in TreeBASE can only be found using a taxon name search if\n"
-+ " the taxon labels are properly mapped.\n"
-+ "\n"
-+ "By clicking the 'OK' button below, you agree to keep these data\n"
-+ "confidential; you agree not to retain these data after completing your report\n"
-+ "to the journal editor; you agree not to use these data or knowledge of these\n"
-+ "data for the purposes of your research until and unless the paper under\n"
-+ "review has been published and the data have been made available to the\n"
-+ "general public; you agree to keep the URL confidential.\n";
- if (confirm(msg) {
- // do things if OK
+ TreeBASE.register(
+ function() {
+ var msg = "Reviewer/Referee Access Agreement\n"
+ + "\n"
+ + "You have reached this page using a special URL that is intended to be used\n"
+ + "by journal editors and reviewers or referees of a paper that is under\n"
+ + "consideration for publication. This URL gives you access to the submitted\n"
+ + "data and metadata associated with analyses and results presented in the\n"
+ + "paper under review. Please carefully examine the data paying special\n"
+ + "attention to the following:\n"
+ + "\n"
+ + "* The citation data (authors, year, citation, abstract) should be\n"
+ + " complete, except for information that is not yet known (e.g. volume or\n"
+ + " page numbers).\n"
+ + "* Verify that nexus files are error-free and executable by software\n"
+ + " programs (e.g. PAUP, Mesquite, MacClade, etc). Please make sure that the\n"
+ + " taxon labels for trees are identical, or a subset of, the taxon labels in\n"
+ + " data matrices connected by way of an analysis. If taxon labels in trees do\n"
+ + " not match with taxon labels in associated data matrices, the data will not\n"
+ + " be useful to the scientific community.\n"
+ + "* Verify that data are not missing and that opportunities to supply\n"
+ + " valuable metadata are not overlooked. For example, TreeBASE can store\n"
+ + " Genbank accession numbers, museum voucher IDs, latitude and longitudes for\n"
+ + " specimen localities, character names and character state names for\n"
+ + " morphological data, etc. Including these metadata are sometimes overlooked\n"
+ + " by submitting authors, yet sharing this metadata is extremely valuable to\n"
+ + " the scientific community. Please use your power as a reviewer to encourage\n"
+ + " the sharing of richly-annotated metadata.\n"
+ + "* Verify that analyses are not missing and that, where possible, analysis\n"
+ + " entries include software commands (e.g. the contents of a PAUP block or\n"
+ + " MrBayes block) so that analyses can be replicated easily (e.g. commands\n"
+ + " that describe substitution models, data partitions, and heuristic search\n"
+ + " parameters).\n"
+ + "* Verify that taxon labels are mapped against TreeBASE's taxonomic\n"
+ + " dictionary. Data in TreeBASE can only be found using a taxon name search if\n"
+ + " the taxon labels are properly mapped.\n"
+ + "\n"
+ + "By clicking the 'OK' button below, you agree to keep these data\n"
+ + "confidential; you agree not to retain these data after completing your report\n"
+ + "to the journal editor; you agree not to use these data or knowledge of these\n"
+ + "data for the purposes of your research until and unless the paper under\n"
+ + "review has been published and the data have been made available to the\n"
+ + "general public; you agree to keep the URL confidential.\n";
+ if (confirm(msg) {
+ // do things if OK
+ }
+ else {
+ history.back(1);
+ }
}
- else {
- history.back(1);
- }
+ );
</script>
</c:if>
</c:if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-01-15 16:04:23
|
Revision: 457
http://treebase.svn.sourceforge.net/treebase/?rev=457&view=rev
Author: rvos
Date: 2010-01-15 16:04:17 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Added missing closing parenthesis.
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 16:01:45 UTC (rev 456)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 16:04:17 UTC (rev 457)
@@ -230,7 +230,7 @@
+ "data for the purposes of your research until and unless the paper under\n"
+ "review has been published and the data have been made available to the\n"
+ "general public; you agree to keep the URL confidential.\n";
- if (confirm(msg) {
+ if ( confirm(msg) ) {
// do things if OK
}
else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-01-15 16:48:17
|
Revision: 458
http://treebase.svn.sourceforge.net/treebase/?rev=458&view=rev
Author: rvos
Date: 2010-01-15 16:48:09 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Changed agreement to floating div instead of javascript confirm dialog.
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 16:04:17 UTC (rev 457)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 16:48:09 UTC (rev 458)
@@ -186,59 +186,64 @@
<span style="color: red; ">You are in reviewer mode.</span>
</div>
<c:if test="${displayAgreement}">
- <script type="text/javascript">
- TreeBASE.register(
- function() {
- var msg = "Reviewer/Referee Access Agreement\n"
- + "\n"
- + "You have reached this page using a special URL that is intended to be used\n"
- + "by journal editors and reviewers or referees of a paper that is under\n"
- + "consideration for publication. This URL gives you access to the submitted\n"
- + "data and metadata associated with analyses and results presented in the\n"
- + "paper under review. Please carefully examine the data paying special\n"
- + "attention to the following:\n"
- + "\n"
- + "* The citation data (authors, year, citation, abstract) should be\n"
- + " complete, except for information that is not yet known (e.g. volume or\n"
- + " page numbers).\n"
- + "* Verify that nexus files are error-free and executable by software\n"
- + " programs (e.g. PAUP, Mesquite, MacClade, etc). Please make sure that the\n"
- + " taxon labels for trees are identical, or a subset of, the taxon labels in\n"
- + " data matrices connected by way of an analysis. If taxon labels in trees do\n"
- + " not match with taxon labels in associated data matrices, the data will not\n"
- + " be useful to the scientific community.\n"
- + "* Verify that data are not missing and that opportunities to supply\n"
- + " valuable metadata are not overlooked. For example, TreeBASE can store\n"
- + " Genbank accession numbers, museum voucher IDs, latitude and longitudes for\n"
- + " specimen localities, character names and character state names for\n"
- + " morphological data, etc. Including these metadata are sometimes overlooked\n"
- + " by submitting authors, yet sharing this metadata is extremely valuable to\n"
- + " the scientific community. Please use your power as a reviewer to encourage\n"
- + " the sharing of richly-annotated metadata.\n"
- + "* Verify that analyses are not missing and that, where possible, analysis\n"
- + " entries include software commands (e.g. the contents of a PAUP block or\n"
- + " MrBayes block) so that analyses can be replicated easily (e.g. commands\n"
- + " that describe substitution models, data partitions, and heuristic search\n"
- + " parameters).\n"
- + "* Verify that taxon labels are mapped against TreeBASE's taxonomic\n"
- + " dictionary. Data in TreeBASE can only be found using a taxon name search if\n"
- + " the taxon labels are properly mapped.\n"
- + "\n"
- + "By clicking the 'OK' button below, you agree to keep these data\n"
- + "confidential; you agree not to retain these data after completing your report\n"
- + "to the journal editor; you agree not to use these data or knowledge of these\n"
- + "data for the purposes of your research until and unless the paper under\n"
- + "review has been published and the data have been made available to the\n"
- + "general public; you agree to keep the URL confidential.\n";
- if ( confirm(msg) ) {
- // do things if OK
- }
- else {
- history.back(1);
- }
- }
- );
- </script>
+ <div id="agreement" style="position:fixed;left:10%;top:5%;width:80%;height:80%;background-color:white;padding:10px;border:5px solid orange">
+ <h2>Reviewer/Referee Access Agreement</h2>
+ <div style="width:100%;overflow:auto">
+ You have reached this page using a special URL that is intended to be used
+ by journal editors and reviewers or referees of a paper that is under
+ consideration for publication. This URL gives you access to the submitted
+ data and metadata associated with analyses and results presented in the
+ paper under review. Please carefully examine the data paying special
+ attention to the following:
+ <ul>
+ <li>
+ The citation data (authors, year, citation, abstract) should be
+ complete, except for information that is not yet known (e.g. volume or
+ page numbers).
+ </li>
+ <li>
+ Verify that nexus files are error-free and executable by software
+ programs (e.g. PAUP, Mesquite, MacClade, etc). Please make sure that the
+ taxon labels for trees are identical, or a subset of, the taxon labels in
+ data matrices connected by way of an analysis. If taxon labels in trees do
+ not match with taxon labels in associated data matrices, the data will not
+ be useful to the scientific community.
+ </li>
+ <li>
+ Verify that data are not missing and that opportunities to supply
+ valuable metadata are not overlooked. For example, TreeBASE can store
+ Genbank accession numbers, museum voucher IDs, latitude and longitudes for
+ specimen localities, character names and character state names for
+ morphological data, etc. Including these metadata are sometimes overlooked
+ by submitting authors, yet sharing this metadata is extremely valuable to
+ the scientific community. Please use your power as a reviewer to encourage
+ the sharing of richly-annotated metadata.
+ </li>
+ <li>
+ Verify that analyses are not missing and that, where possible, analysis
+ entries include software commands (e.g. the contents of a PAUP block or
+ MrBayes block) so that analyses can be replicated easily (e.g. commands
+ that describe substitution models, data partitions, and heuristic search
+ parameters).
+ </li>
+ <li>
+ Verify that taxon labels are mapped against TreeBASE's taxonomic
+ dictionary. Data in TreeBASE can only be found using a taxon name search if
+ the taxon labels are properly mapped.
+ </li>
+ </ul>
+ By clicking the 'OK' button below, you agree to keep these data
+ confidential; you agree not to retain these data after completing your report
+ to the journal editor; you agree not to use these data or knowledge of these
+ data for the purposes of your research until and unless the paper under
+ review has been published and the data have been made available to the
+ general public; you agree to keep the URL confidential.
+ </div>
+ <div style="width:100%;text-align:center;padding-top:10px">
+ <input type="submit" id="agreementOk" value="OK" onclick="$('agreement').style.display = 'none'"/>
+ <input type="submit" id="agreementCancel" value="Cancel" onclick="history.back(1)"/>
+ </div>
+ </div>
</c:if>
</c:if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-01-15 16:56:22
|
Revision: 459
http://treebase.svn.sourceforge.net/treebase/?rev=459&view=rev
Author: rvos
Date: 2010-01-15 16:56:16 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Set agreement cancellation to re-direct to access violation page
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 16:48:09 UTC (rev 458)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 16:56:16 UTC (rev 459)
@@ -241,7 +241,7 @@
</div>
<div style="width:100%;text-align:center;padding-top:10px">
<input type="submit" id="agreementOk" value="OK" onclick="$('agreement').style.display = 'none'"/>
- <input type="submit" id="agreementCancel" value="Cancel" onclick="history.back(1)"/>
+ <input type="submit" id="agreementCancel" value="Cancel" onclick="document.href='/treebase-web/accessviolation.html'"/>
</div>
</div>
</c:if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-01-15 17:08:04
|
Revision: 460
http://treebase.svn.sourceforge.net/treebase/?rev=460&view=rev
Author: rvos
Date: 2010-01-15 17:07:52 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Cancel redirects with extra parameter "agreement=cancel"
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 16:56:16 UTC (rev 459)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 17:07:52 UTC (rev 460)
@@ -241,7 +241,7 @@
</div>
<div style="width:100%;text-align:center;padding-top:10px">
<input type="submit" id="agreementOk" value="OK" onclick="$('agreement').style.display = 'none'"/>
- <input type="submit" id="agreementCancel" value="Cancel" onclick="document.href='/treebase-web/accessviolation.html'"/>
+ <input type="submit" id="agreementCancel" value="Cancel" onclick="window.location=location.href+'&agreement=cancel'"/>
</div>
</div>
</c:if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-01-15 17:23:54
|
Revision: 463
http://treebase.svn.sourceforge.net/treebase/?rev=463&view=rev
Author: rvos
Date: 2010-01-15 17:23:48 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Added switch to template.
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 17:19:50 UTC (rev 462)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 17:23:48 UTC (rev 463)
@@ -185,7 +185,7 @@
<img src="<fmt:message key="icons.info"/>" alt="<fmt:message key="icon.information"/>" class="icon" />
<span style="color: red; ">You are in reviewer mode.</span>
</div>
- <c:if test="${displayAgreement}">
+ <c:if test="${displayAgreement || reviewerAccessDenied}">
<div id="agreement" style="position:fixed;left:10%;top:5%;width:80%;height:80%;background-color:white;padding:10px;border:5px solid orange">
<h2>Reviewer/Referee Access Agreement</h2>
<div style="width:100%;overflow:auto">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-01-15 18:39:52
|
Revision: 466
http://treebase.svn.sourceforge.net/treebase/?rev=466&view=rev
Author: rvos
Date: 2010-01-15 18:39:46 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Refactoring reviewer login logic
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 18:16:45 UTC (rev 465)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 18:39:46 UTC (rev 466)
@@ -241,8 +241,15 @@
general public; you agree to keep the URL confidential.
</div>
<div style="width:100%;text-align:center;padding-top:10px">
- <input type="submit" id="agreementOk" value="OK" onclick="window.location=location.href+'&agreement=ok'"/>
- <input type="submit" id="agreementCancel" value="Cancel" onclick="window.location=location.href+'&agreement=cancel'"/>
+ <script type="text/javascript">
+ function processAgreementResponse(response) {
+ var currentLocation = location.href;
+ var newLocation = currentLocation.replace(/&agreement=[ok|cancel]/,"") + '&agreement=' + response;
+ window.location=newLocation;
+ }
+ </script>
+ <input type="submit" id="agreementOk" value="OK" onclick="processAgreementResponse('ok')"/>
+ <input type="submit" id="agreementCancel" value="Cancel" onclick="processAgreementResponse('cancel')"/>
</div>
</div>
</c:if>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-01-15 18:47:34
|
Revision: 467
http://treebase.svn.sourceforge.net/treebase/?rev=467&view=rev
Author: rvos
Date: 2010-01-15 18:47:28 +0000 (Fri, 15 Jan 2010)
Log Message:
-----------
Refactoring reviewer login logic
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 18:39:46 UTC (rev 466)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-01-15 18:47:28 UTC (rev 467)
@@ -244,7 +244,7 @@
<script type="text/javascript">
function processAgreementResponse(response) {
var currentLocation = location.href;
- var newLocation = currentLocation.replace(/&agreement=[ok|cancel]/,"") + '&agreement=' + response;
+ var newLocation = currentLocation.replace(/&agreement=(ok|cancel)/g,"") + '&agreement=' + response;
window.location=newLocation;
}
</script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hl...@us...> - 2010-03-17 19:44:20
|
Revision: 621
http://treebase.svn.sourceforge.net/treebase/?rev=621&view=rev
Author: hlapp
Date: 2010-03-17 19:44:13 +0000 (Wed, 17 Mar 2010)
Log Message:
-----------
Commented out the Add to Connotea feature until it is fixed to work.
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-03-17 19:27:47 UTC (rev 620)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-03-17 19:44:13 UTC (rev 621)
@@ -81,6 +81,7 @@
</a>
<!-- save to connotea -->
+ <!-- commented out temporarily because this uses the absolute path, which won't work due to proxying
<form method="post" id="connotea" action="http://www.connotea.org/add" enctype="application/x-www-form-urlencoded" name="edit">
<input
@@ -172,6 +173,7 @@
<img src="/treebase-web/images/connotea.gif" alt="Connotea" class="iconButton"/>
Connotea
</a>
+ --> <!-- end of commenting out connotea -->
<div id="notice"></div>
</fieldset>
</div>
@@ -285,4 +287,4 @@
</c:otherwise>
</c:choose>
</div>
-<h3>${currentSection}</h3>
\ No newline at end of file
+<h3>${currentSection}</h3>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vga...@us...> - 2010-03-18 14:37:18
|
Revision: 627
http://treebase.svn.sourceforge.net/treebase/?rev=627&view=rev
Author: vgapeyev
Date: 2010-03-18 14:37:11 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
Catch-up to commit #626.
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-03-18 14:31:28 UTC (rev 626)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-03-18 14:37:11 UTC (rev 627)
@@ -81,9 +81,100 @@
</a>
<!-- save to connotea -->
- <!-- commented out temporarily because this uses the absolute path, which won't work due to proxying -->
- <!-- Insert nav-HIDE-connotea.txt here -->
- <!-- end of commenting out connotea -->
+ <!-- commented out temporarily because this uses the absolute path, which won't work due to proxying - SF Bug 2972133 -->
+ <%--
+ <form method="post" id="connotea" action="http://www.connotea.org/add" enctype="application/x-www-form-urlencoded" name="edit">
+
+ <input
+ name="uri"
+ value="<%= request.getScheme() %>://<%= request.getLocalName() %>:<%= request.getLocalPort() %>/treebase-web/search/study/summary.html?id=<c:out value="${study.id}"/>"
+ type="hidden"/>
+
+ <input
+ name="uri"
+ value="<%= request.getScheme() %>://<%= request.getLocalName() %>:<%= request.getLocalPort() %>/treebase-web/search/study/summary.html?id=<c:out value="${study.id}"/>"
+ type="hidden"/>
+
+ <input name="ctitle" value="<c:out value="${cit.title}"/>" type="hidden"/>
+ <input name="ctitle2" value="<c:out value="${cit.title}"/>" type="hidden"/>
+
+ <c:choose>
+ <c:when test="${cit.citationType == 'Article'}">
+ <input name="cjournal" value="<c:out value="${cit.journal}"/>" type="hidden"/>
+ <input name="cjournal2" value="<c:out value="${cit.journal}"/>" type="hidden"/>
+
+ <input name="cvolume" value="<c:out value="${cit.volume}"/>" type="hidden"/>
+ <input name="cvolume2" value="<c:out value="${cit.volume}"/>" type="hidden"/>
+
+ <input name="cissue" value="<c:out value="${cit.issue}"/>" type="hidden"/>
+ <input name="cissue2" value="<c:out value="${cit.issue}"/>" type="hidden"/>
+ </c:when>
+ <c:otherwise>
+ <input name="cjournal" value="" type="hidden"/>
+ <input name="cjournal2" value="" type="hidden"/>
+
+ <input name="cvolume" value="" type="hidden"/>
+ <input name="cvolume2" value="" type="hidden"/>
+
+ <input name="cissue" value="" type="hidden"/>
+ <input name="cissue2" value="" type="hidden"/>
+ </c:otherwise>
+ </c:choose>
+
+ <input name="cpages" value="<c:out value="${cit.pages}"/>" type="hidden"/>
+ <input name="cpages2" value="<c:out value="${cit.pages}"/>" type="hidden"/>
+
+ <input name="cdate" value="<c:out value="${cit.publishYear}"/>" type="hidden"/>
+ <input name="cdate2" value="<c:out value="${cit.publishYear}"/>" type="hidden"/>
+
+ <input name="cauthors" value="<c:out value="${cit.authorsAsBibtex}"/>" type="hidden"/>
+ <input name="cauthors2" value="<c:out value="${cit.authorsAsBibtex}"/>" type="hidden"/>
+
+ <!-- JOUR, BOOK or CHAP --><!-- XXX check if article!! -->
+ <input name="cristype" value="JOUR" type="hidden"/>
+ <input name="cristype2" value="JOUR" type="hidden"/>
+
+ <input name="cdoi" value="<c:out value="${cit.doi}"/>" type="hidden"/>
+ <input name="cdoi2" value="<c:out value="${cit.doi}"/>" type="hidden"/>
+
+ <input name="cpubmed" value="<c:out value="${cit.PMID}"/>" type="hidden"/>
+ <input name="cpubmed2" value="<c:out value="${cit.PMID}"/>" type="hidden"/>
+
+ <!-- isbn -->
+ <input name="casin" value="" type="hidden"/> <!-- XXX check if book/in book -->
+ <input name="casin2" value="" type="hidden"/>
+
+ <input name="usertitle" value="<c:out value="${cit.title}"/>" type="hidden"/>
+
+ <input name="tags" value="uploaded, <c:out value="${cit.keywords}"/>" type="hidden"/>
+ <input name="button" value="Save" type="hidden"/>
+
+ <input name="description" value="<c:out value="${study.notes}"/>" type="hidden"/>
+ <input name="mywork" value="0" type="hidden"/>
+ <input name="private" value="0" type="hidden"/>
+ <input name="embargo" value="" type="hidden"/>
+
+ <c:choose>
+ <c:when test="${not empty study.TB1StudyID}">
+ <input name="comment" value="This study was previously identified under the legacy study ID ${study.TB1StudyID} (Status: <c:out value="${study.studyStatus.description}"/>)." type="hidden"/>
+ </c:when>
+ <c:otherwise>
+ <input name="comment" value="This study is part of submission <c:out value="${study.submission.id}"/> (Status: <c:out value="${study.studyStatus.description}"/>)." type="hidden"/>
+ </c:otherwise>
+ </c:choose>
+
+ <input name="button" value="Save" type="hidden"/>
+ <input name="continue" value="0" type="hidden"/>
+ <input name="title" value="<c:out value="${cit.title}"/>" type="hidden"/>
+ <input name=".cgifields" value="private" type="hidden"/>
+ <input name=".cgifields" value="mywork" type="hidden"/>
+ <input name="prefilled" value="1" type="hidden"/>
+ </form>
+ <a href="#" onclick="connotea()">
+ <img src="/treebase-web/images/connotea.gif" alt="Connotea" class="iconButton"/>
+ Connotea
+ </a>
+ --%> <!-- end of commenting out connotea -->
<div id="notice"></div>
</fieldset>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rv...@us...> - 2010-06-01 20:53:52
|
Revision: 703
http://treebase.svn.sourceforge.net/treebase/?rev=703&view=rev
Author: rvos
Date: 2010-06-01 20:53:46 +0000 (Tue, 01 Jun 2010)
Log Message:
-----------
Removed hardcoding of url, using purl instead. This fixes issue 2972133.
Modified Paths:
--------------
trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-06-01 20:05:30 UTC (rev 702)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp 2010-06-01 20:53:46 UTC (rev 703)
@@ -82,17 +82,16 @@
<!-- save to connotea -->
<!-- commented out temporarily because this uses the absolute path, which won't work due to proxying - SF Bug 2972133 -->
- <%--
<form method="post" id="connotea" action="http://www.connotea.org/add" enctype="application/x-www-form-urlencoded" name="edit">
<input
name="uri"
- value="<%= request.getScheme() %>://<%= request.getLocalName() %>:<%= request.getLocalPort() %>/treebase-web/search/study/summary.html?id=<c:out value="${study.id}"/>"
+ value="${baseLink}?format=html"
type="hidden"/>
<input
name="uri"
- value="<%= request.getScheme() %>://<%= request.getLocalName() %>:<%= request.getLocalPort() %>/treebase-web/search/study/summary.html?id=<c:out value="${study.id}"/>"
+ value="${baseLink}?format=html"
type="hidden"/>
<input name="ctitle" value="<c:out value="${cit.title}"/>" type="hidden"/>
@@ -174,7 +173,7 @@
<img src="/treebase-web/images/connotea.gif" alt="Connotea" class="iconButton"/>
Connotea
</a>
- --%> <!-- end of commenting out connotea -->
+ <!-- end of commenting out connotea -->
<div id="notice"></div>
</fieldset>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X