treebase-guts

[Treebase-guts] SF.net SVN: treebase:[119] trunk/treebase-web/src/main/webapp/WEB-INF/pages /search/study

[<rv...@us...>]

Revision: 119
          http://treebase.svn.sourceforge.net/treebase/?rev=119&view=rev
Author:   rvos
Date:     2009-06-25 03:30:53 +0000 (Thu, 25 Jun 2009)

Log Message:
-----------
Added download links for RDF

Modified Paths:
--------------
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/summary.jsp
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp	2009-06-25 03:25:11 UTC (rev 118)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp	2009-06-25 03:30:53 UTC (rev 119)
@@ -83,6 +83,20 @@
 		sortable="false"
 		class="iconColumn" 
 		headerClass="iconColumn">
+		<c:url value="/PhyloWS/${matrix.namespacedGUID}.rdf" var="newMatrixURL"/>
+		<a href="${newMatrixURL}">
+			<img 
+				class="iconButton" 
+				src="<fmt:message key="icons.rdf"/>" 
+				title="<fmt:message key="download.rdf"/>" 
+				alt="<fmt:message key="download.rdf"/>"/>			
+		</a>
+	</display:column>	
+	
+	<display:column  
+		sortable="false"
+		class="iconColumn" 
+		headerClass="iconColumn">
 		<c:url value="/PhyloWS/${matrix.namespacedGUID}.nex" var="newMatrixURL"/>
 		<a href="${newMatrixURL}">
 			<img 

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/summary.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/summary.jsp	2009-06-25 03:25:11 UTC (rev 118)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/summary.jsp	2009-06-25 03:30:53 UTC (rev 119)
@@ -104,7 +104,15 @@
 				title="<fmt:message key="download.nexml"/>" 
 				alt="<fmt:message key="download.nexml"/>"/>	
 			NeXML			
-		</a>		
+		</a>	
+		<a href="${baseLink}.rdf">
+			<img 
+				class="iconButton" 
+				src="<fmt:message key="icons.rdf"/>" 
+				title="<fmt:message key="download.rdf"/>" 
+				alt="<fmt:message key="download.rdf"/>"/>	
+			RDF			
+		</a>
 	</li>
 </ul>
 <h3>BibTeX reference</h3>

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp	2009-06-25 03:25:11 UTC (rev 118)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp	2009-06-25 03:30:53 UTC (rev 119)
@@ -67,6 +67,20 @@
 				alt="<fmt:message key="download.nexml"/>"/>				
 		</a>
 	</display:column>	
+
+	<display:column 
+		sortable="false"
+		class="iconColumn" 
+		headerClass="iconColumn">
+		<c:url value="/PhyloWS/${tree.namespacedGUID}.rdf" var="newTreeURL"/>
+		<a href="${newTreeURL}">
+			<img 
+				class="iconButton" 
+				src="<fmt:message key="icons.rdf"/>" 
+				title="<fmt:message key="download.rdf"/>" 
+				alt="<fmt:message key="download.rdf"/>"/>				
+		</a>
+	</display:column>	
 	
 	<display:column 
 		sortable="false"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Treebase-guts] SF.net SVN: treebase:[620] trunk/treebase-web/src/main/webapp/WEB-INF/pages /search/study

[<hl...@us...>]

Revision: 620
          http://treebase.svn.sourceforge.net/treebase/?rev=620&view=rev
Author:   hlapp
Date:     2010-03-17 19:27:47 +0000 (Wed, 17 Mar 2010)

Log Message:
-----------
Commenting out download of analysis or analysis step, as per issue# 2972107.

Modified Paths:
--------------
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analyses.jsp
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analysis.jsp

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analyses.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analyses.jsp	2010-03-17 15:13:18 UTC (rev 619)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analyses.jsp	2010-03-17 19:27:47 UTC (rev 620)
@@ -42,13 +42,14 @@
 						height="9" 
 						border="0"
 						onClick="CollapseExpand('${AnalysisStepId}')" /> 
-					<a href="/treebase-web/search/downloadAnAnalysisStep.html?analysisid=${analysisStep.id}">
+                                        <!-- commented out due to issue# 2970700 and issue# 2970457 -->
+					<!-- <a href="/treebase-web/search/downloadAnAnalysisStep.html?analysisid=${analysisStep.id}"> -->
 						<img 
 							class="iconButton" 
 							src="<fmt:message key="icons.download.reconstructed"/>" 
 							title="<fmt:message key="download.reconstructedfile"/>" 
 							alt="<fmt:message key="download.reconstructedfile"/>"/>	
-					</a>
+					<!-- </a> --->
 					<strong>Analysis Step ${status_analysisStep.count}:</strong>
 					<c:out value="${analysisStepCommand.name}" />
 				</li>

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analysis.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analysis.jsp	2010-03-17 15:13:18 UTC (rev 619)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/analysis.jsp	2010-03-17 19:27:47 UTC (rev 620)
@@ -47,13 +47,14 @@
 						height="9" 
 						border="0"
 						onClick="CollapseExpand('${AnalysisStepId}')"/> 
-					<a href="/treebase-web/search/downloadAnAnalysisStep.html?analysisid=${analysisStep.id}">
+                                        <!-- commented out due to issue# 2970700 and issue# 2970457 -->
+					<!-- <a href="/treebase-web/search/downloadAnAnalysisStep.html?analysisid=${analysisStep.id}"> -->
 						<img 
 							class="iconButton" 
 							src="<fmt:message key="icons.download.reconstructed"/>" 
 							title="<fmt:message key="download.reconstructedfile"/>" 
 							alt="<fmt:message key="download.reconstructedfile"/>"/>	
-					</a>						
+					<!-- </a> -->					
 					<strong>Analysis Step ${status_analysisStep.count}:</strong>
 					<c:out value="${analysisStepCommand.name}" />
 				</li>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Treebase-guts] SF.net SVN: treebase:[624] trunk/treebase-web/src/main/webapp/WEB-INF/pages /search/study

[<vga...@us...>]

Revision: 624
          http://treebase.svn.sourceforge.net/treebase/?rev=624&view=rev
Author:   vgapeyev
Date:     2010-03-18 14:00:43 +0000 (Thu, 18 Mar 2010)

Log Message:
-----------
Moved commented-out HTML to a temp file, due to nested <!-- --> comments. 

Modified Paths:
--------------
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp

Added Paths:
-----------
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav-HIDE-connotea.txt

Added: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav-HIDE-connotea.txt
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav-HIDE-connotea.txt	                        (rev 0)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav-HIDE-connotea.txt	2010-03-18 14:00:43 UTC (rev 624)
@@ -0,0 +1,94 @@
+<--! VG 2010-03-22 This is supposed to be a part of nav.jsp -- search for "save to connotea" -->
+<--! Since there are many small comments in this fragment, commenting it out in nav.jsp did not work out well. -->  
+
+		<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>

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 02:06:15 UTC (rev 623)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/nav.jsp	2010-03-18 14:00:43 UTC (rev 624)
@@ -81,99 +81,9 @@
 		</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 
-		        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 -->
+                <!-- 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 -->
 		<div id="notice"></div>
 	</fieldset>
 </div>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.