[Treebase-guts] SF.net SVN: treebase:[868] trunk/treebase-web/src/main/webapp/WEB-INF/pages /limitedPhylowidget.jsp

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

Revision: 868
          http://treebase.svn.sourceforge.net/treebase/?rev=868&view=rev
Author:   rvos
Date:     2011-05-16 16:38:51 +0000 (Mon, 16 May 2011)

Log Message:
-----------
It is better to use an onclick handler than the javascript: pseudo protocol. Also removed some of the styling. We'll make it look pretty once tree drawing works.

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

Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/limitedPhylowidget.jsp
===================================================================
--- trunk/treebase-web/src/main/webapp/WEB-INF/pages/limitedPhylowidget.jsp	2011-05-13 14:32:50 UTC (rev 867)
+++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/limitedPhylowidget.jsp	2011-05-16 16:38:51 UTC (rev 868)
@@ -52,9 +52,7 @@
 
 fieldset {
   display:block;
-  background:#CEE3F6;
   margin:auto;
-  text-align:center;
 }
 
 legend {
@@ -91,13 +89,7 @@
                     	<legend>Tree window</legend>
 						<script type="text/javascript">
 						function drawjsPhyloSVGTree(namespacedGUID,ntax){
-							var uri = "/treebase-web/phylows/tree/";
-							if ( null != namespacedGUID ) {
-								uri = uri + namespacedGUID + "?format=nexml";
-							}
-							else {
-								uri = uri + document.TreeForm.treeList.value + "?format=nexml";
-							}
+							var uri = "/treebase-web/phylows/tree/" + namespacedGUID + "?format=nexml";
 							new Ajax.Request(uri,{
 								method     : 'get',
 								onComplete : function(transport) {
@@ -108,7 +100,7 @@
 									phylocanvas = new Smits.PhyloCanvas(
 										dataObject,
 										'svgCanvas', 
-										600, 600				
+										600, ntax * 20				
 									);
 								},
 								onFailure: function(){ 
@@ -117,40 +109,30 @@
 							});						
 						};
 						</script>                    	
-                    	<div id="svgCanvas" style="width:600px;height:600px"></div>
+                    	<div id="svgCanvas" style="width:600px"></div>
                     </fieldset>
                 </td>
                 <td style="vertical-align:top">
-					<fieldset  style="margin-top:10px;margin-left:5px;margin-right:5px">
+					<fieldset>
 						<legend><c:out value="${NEWICKSTRINGNAME}"/></legend>
-						<select 
-						    name="treeList" 
-						    size="10" 
-						    onclick="javascript:drawjsPhyloSVGTree();" 
-						    id="treeList">
-					 		<c:forEach var="x" items="${PHYLOWSMAP}">
-					 			<option value="${x.value}">${x.key}</option>
-					 		</c:forEach>
-					 	</select>
 					 	<ol>
 					 		<c:forEach var="tree" items="${TREELIST}">
-					 			<li>
-					 				<a href="javascript:drawjsPhyloSVGTree(${tree.treebaseIDString.namespacedGUID},${tree.nTax})">${tree.label} ${tree.title}</a>
+					 			<li onclick="drawjsPhyloSVGTree('${tree.treebaseIDString.namespacedGUID}',${tree.nTax})">
+					 				${tree.label} ${tree.title}
 					 			</li>
-					 			<option value="${x.value}">${x.key}</option>
 					 		</c:forEach>
 					 	</ol>
 					</fieldset>
 					<c:if test="${treeBlockID != null}">
-						<fieldset style="margin-left:5px;margin-right:5px;background-color:white">		
+						<fieldset>		
 							<legend>Quick links</legend>								
-							<p style="text-align:left">							
+							<p>							
 								<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">							
+							<p>							
 								<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


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