From: <yo...@us...> - 2010-04-02 00:44:38
|
Revision: 667 http://treebase.svn.sourceforge.net/treebase/?rev=667&view=rev Author: youjun Date: 2010-04-02 00:44:31 +0000 (Fri, 02 Apr 2010) Log Message: ----------- close open bracket, move javascript function out of table Modified Paths: -------------- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeList.jsp 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 2010-04-01 23:16:26 UTC (rev 666) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/trees.jsp 2010-04-02 00:44:31 UTC (rev 667) @@ -9,7 +9,13 @@ <c:url var="studyURL" value="summary.html"> <c:param name="id" value="${study.id}"/> </c:url> - +<script type="text/javascript"> + function openPhylowidget(tree_id) + { + var realURL = "http://www.phylowidget.org/full/?tree='http://"+location.host+"${url}"+"TB2:Tr"+tree_id+"'"; + window.open(realURL,'myplwidget') + } +</script> <display:table name="trees" requestURI="" class="list" @@ -23,14 +29,8 @@ <!--c:param name="treeid" value="${tree.id}" /--> <!--c:param name="id" value="${tree.study.id}" /--> </c:url> - <script type="text/javascript"> - function openPhylowidget(tree_id) - { - var realURL = "http://www.phylowidget.org/full/?tree='http://"+location.host+"${url}"+"TB2:Tr"+tree_id+"'"; - window.open(realURL,'myplwidget') - } - </script> - <a href="javascript:void(0)" onClick="openPhylowidget(${tree.id}">Tr${tree.id}</a> + + <a href="javascript:void(0)" onClick="openPhylowidget(${tree.id})">Tr${tree.id}</a> </display:column> <display:column Modified: trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeList.jsp =================================================================== --- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeList.jsp 2010-04-01 23:16:26 UTC (rev 666) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/treeList.jsp 2010-04-02 00:44:31 UTC (rev 667) @@ -4,8 +4,15 @@ <%--content tag="heading"><fmt:message key="search.results.title.trees"/></content> <body id="trees"/ --%> +<script type="text/javascript"> + function openPhylowidget(tree_id) + { + var realURL = "http://www.phylowidget.org/full/?tree='http://"+location.host+"${url}"+"TB2:Tr"+tree_id+"'"; + window.open(realURL,'myplwidget') + } + +</script> - <display:table name="${resultSet.results}" requestURI="" class="list" @@ -19,14 +26,7 @@ <!--c:param name="treeid" value="${tree.id}" /--> <!--c:param name="id" value="${tree.study.id}" /--> </c:url> - <script type="text/javascript"> - function openPhylowidget(tree_id) - { - var realURL = "http://www.phylowidget.org/full/?tree='http://"+location.host+"${url}"+"TB2:Tr"+tree_id+"'"; - window.open(realURL,'myplwidget') - } - - </script> + <input type="checkbox" id="s-${tree.id }" name="selection" value="${tree.id }" /> <a href="javascript:void(0)" onClick="openPhylowidget(${tree.id})">Tr${tree.id}</a> </display:column> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |