[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.