treebase-guts Mailing List for TreeBASE (Page 29)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Log Message:
-----------
fix redirect path for limitedPhylowidget 

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

Added Paths:
-----------
    trunk/treebase-web/src/main/webapp/WEB-INF/pages/limitedPhylowidget.jsp

Added: trunk/treebase-web/src/main/webapp/WEB-INF/pages/limitedPhylowidget.jsp
===================================================================

--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/limitedPhylowidget.jsp	                        (rev 0)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/limitedPhylowidget.jsp	2010-03-18 14:18:10 UTC (rev 625)
@@ -0,0 +1,199 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<%@include file="/common/taglibs.jsp" %>
+
+<html>
+<head>
+<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+<title>-Tree viewer/editor (PhyloWidget)</title>
+
+<script type="text/javascript" src="<c:url value='/scripts/prototype/prototype-1.6.0.3.js'/>"></script>
+<script type="text/javascript" src="<c:url value='/scripts/phylowidget/lib.js'/>"></script>
+<script type="text/javascript" src="<c:url value='/scripts/phylowidget.js'/>"></script>
+
+<style type="text/css">
+body {
+  margin: 0px 0px 0px 0px;
+  padding: 0px 0px 0px 0px;
+  text-align: center;
+  font-family: verdana, geneva, arial, helvetica, sans-serif; 
+  font-size: 11px; 
+  background-color: white; 
+  text-decoration: none; 
+  font-weight: normal; 
+  line-height: normal;
+}
+ 
+a          { color: #3399CC; text-decoration: none; }
+a:link     { color: #3399CC; text-decoration: none; }
+a:visited  { color: #3399CC; text-decoration: none; }
+a:active   { color: #3399CC; text-decoration: underline; }
+a:hover    { color: #3399CC; text-decoration: underline; }
+
+div {
+  border: 0px;
+
+}
+
+#content {
+  margin: auto;
+}
+
+#content fieldset {
+  margin-top: 5px;
+}
+
+#comments {
+}
+
+input {
+  font-size:12px;
+}
+
+fieldset {
+  display:block;
+  background:#CEE3F6;
+  margin:auto;
+  text-align:center;
+}
+
+legend {
+  background:white;
+  border:1px solid black;
+  padding:5px;
+}
+
+#treeText,#clipText {
+  width:100%;
+}
+
+table {
+  text-align:left;
+}
+
+table .key {
+  text-align:right;
+  padding-right:10px;
+}
+
+table .val {
+ text-align:left;
+}
+
+</style>
+</head>
+<body>
+	<script type="text/javascript">		
+	    TreeBASE.register(			
+	        function () {		
+	            var treeList = $('treeList');
+	            var option = treeList.select('option');
+	            var treeText = $('treeText');
+	           	treeText.value = option[0].value;				
+	            updateJavaTree();			
+	        }		
+	    );	
+	</script>
+	<form name="TreeForm">
+		<table id="content" style="margin-top: 5px">
+			<tr>
+                <td style="vertical-align:top">
+                    <fieldset>
+                        <legend>PhyloWidget
+<a href="#" class="openHelp" onclick="openHelp('newPhyloWidget')"><img class="iconButton" src="<fmt:message key="icons.help"/>" /></a>                        
+                        </legend>
+                        <applet 
+                            code="org.phylowidget.PhyloWidget"
+                            id="PhyloWidget"
+                            name="PhyloWidget"
+                            codebase="./phylowidget" 
+                            archive="PhyloWidget.jar,core.jar,itext.jar,jgrapht-jdk1.5.jar,pdf.jar"
+                            mayscript="true"
+                            width="600" height="600">
+                        	<param name="tree" value="<c:out value="${DEFAULTNEWICK}"/>"/>
+                        	
+                        	
+                        	<!-- 
+                        		Additional parameters can be passed to the widget, which
+                        		are parsed out by PhyloUI.java, e.g.:
+                        		<param name="showBranchLengths" value="true"/>
+                        		<param name="useBranchLengths" value="true"/>                        	
+                        	-->
+                        	<param name="menuFile" value="nondb-menus.xml" />
+                            <param name="image" value="loading.gif" />
+                            <param name="boxmessage" value="Loading PhyloWidget software..." />
+                            <param name="boxbgcolor" value="#FFFFFF" />
+                            <param name="progressbar" value="true" />
+                            <param name="subapplet.classname" value="org.phylowidget.PhyloWidget" />
+                            <param name="subapplet.displayname" value="PhyloWidget" />
+                            <param name="cache_archive" value="PhyloWidget.jar,core.jar,itext.jar,jgrapht-jdk1.5.jar,pdf.jar"/>
+                            <param name="cache_archive_ex" value="PhyloWidget.jar;preload,core.jar;preload,itext.jar;preload,jgrapht-jdk1.5.jar;preload,pdf.jar;preload"/>
+                            
+                            
+                            <!-- This is the message that shows up when people don't have
+                                 Java installed in their browser. -->
+                            To view this content, you need to install Java from 
+                            <a href="http://java.com">java.com</a>                        
+                        </applet>
+                    </fieldset>
+                </td>
+                <td style="vertical-align:top">	                	               		
+					<fieldset style="margin-left:5px;margin-right:5px">
+						<legend>Node Info</legend>
+						<div id="nodeText" style="background:white;margin:5px;padding:5px;">
+							Mouse over a node to view its detailed information here. 
+							Node details will be displayed if they were described in 
+							the uploaded tree.
+						</div>
+					</fieldset>
+					<fieldset  style="margin-top:10px;margin-left:5px;margin-right:5px">
+						<legend><c:out value="${NEWICKSTRINGNAME}"/></legend>
+						<select 
+						    name="treeList" 
+						    size="10" 
+						    onclick="javascript:pickTree();" 
+						    id="treeList">
+							<c:forEach var="x" items="${NEWICKSTRINGSMAP}" > 
+					  			<option value="${x.value}">${x.key}</option>
+					 		</c:forEach>
+					 	</select>
+					</fieldset>
+                    <input 
+                        type="hidden" 
+                        name="treeText" 
+                        id="treeText" 
+                        onfocus="selectOnce(this);" 
+                        value="" />
+                    <input 
+                        type="hidden" 
+                        name="clipText" 
+                        id="clipText" 
+                        onchange="updateJavaClip();" 
+                        value="" />                    
+                    <div id="comments" style="margin: 5px">
+                        Make a selection by clicking on the tree list.
+                    </div>
+					<c:if test="${treeBlockID != null}">
+						<fieldset style="margin-left:5px;margin-right:5px;background-color:white">		
+							<legend>Quick links</legend>								
+							<p style="text-align:left">							
+								<a href="/treebase-web/search/study/trees.html?id=${studyID}" target="_new">
+									<img class="iconButton" style="vertical-align:middle" src="<fmt:message key="icons.trees"/>" />
+									Containing tree set
+								</a>
+							</p>
+							<p style="text-align:left">							
+								<a href="/treebase-web/search/study/summary.html?id=${studyID}" target="_new">
+									<img class="iconButton" style="vertical-align:middle" src="<fmt:message key="icons.citation"/>" />
+									Containing study
+								</a>
+							</p>
+						</fieldset>
+					</c:if>                     
+		        </td>
+		    </tr>
+        </table>	
+	</form>
+</body>
+</html>
+

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/tree.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/tree.jsp	2010-03-18 14:00:43 UTC (rev 624)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/tree.jsp	2010-03-18 14:18:10 UTC (rev 625)
@@ -105,7 +105,7 @@
                             archive="PhyloWidget.jar,core.jar,itext.jar,jgrapht-jdk1.5.jar,pdf.jar"
                             mayscript="true"
                             width="600" height="600">
-                            <param name="menuFile" value="nondb-menus.xml" />
+                            
                             <param name="image" value="loading.gif" />
                             <param name="boxmessage" value="Loading Processing software..." />
                             <param name="boxbgcolor" value="#FFFFFF" />

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml	2010-03-18 14:00:43 UTC (rev 624)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/treebase-servlet.xml	2010-03-18 14:18:10 UTC (rev 625)
@@ -587,7 +587,7 @@
 	  parent="directMapToPhyloWidgetController">
 	  	<property name="submissionHome"><ref bean="submissionHome"></ref></property>
 	  	<property name="studyService"><ref bean="studyService"></ref></property>	  						  
-		<property name="defaultView"><value>redirect:/test/newPhylowidget.html</value></property>
+		<property name="defaultView"><value>redirect:/test/limitedPhylowidget.html</value></property>
 	</bean>
 	
 	<bean id="deleteATreeBlockController" class="org.cipres.treebase.web.controllers.DeleteATreeBlockController">
@@ -865,6 +865,7 @@
 				
 				<prop key="/user/viewXML.html">filenameController</prop>
 				<prop key="/test/phylowidget.html">filenameController</prop>
+				<prop key="/test/limitedPhylowidget.html">filenameController</prop>
 				<prop key="/test/newPhylowidget.html">filenameController</prop>
 				<prop key="/user/processUser.html">processUserController</prop>					
 				<prop key="/accessviolation.html">filenameController</prop>


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




2009	Jan	Feb	Mar (1)	Apr (14)	May (36)	Jun (148)	Jul (33)	Aug (2)	Sep (17)	Oct (42)	Nov (137)	Dec (88)
2010	Jan (89)	Feb (80)	Mar (217)	Apr (76)	May (5)	Jun (39)	Jul (35)	Aug (4)	Sep (7)	Oct (14)	Nov (12)	Dec (9)
2011	Jan (6)	Feb (4)	Mar (11)	Apr (55)	May (90)	Jun (39)	Jul (15)	Aug (15)	Sep (23)	Oct (12)	Nov (17)	Dec (20)
2012	Jan (22)	Feb (63)	Mar	Apr (1)	May (6)	Jun (3)	Jul (1)	Aug (1)	Sep	Oct	Nov	Dec
2013	Jan (3)	Feb (6)	Mar	Apr	May	Jun (4)	Jul (1)	Aug (1)	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr (7)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

treebase-guts Mailing List for TreeBASE (Page 29)

treebase-guts — Commit and tracker messages