From: <rv...@us...> - 2009-06-25 02:57:30
|
Revision: 116 http://treebase.svn.sourceforge.net/treebase/?rev=116&view=rev Author: rvos Date: 2009-06-25 02:57:29 +0000 (Thu, 25 Jun 2009) Log Message: ----------- Added NeXML download link Modified Paths: -------------- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.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 02:55:45 UTC (rev 115) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp 2009-06-25 02:57:29 UTC (rev 116) @@ -69,13 +69,24 @@ sortable="false" class="iconColumn" headerClass="iconColumn"> - <c:url value="/search/downloadAMatrix.html" var="newMatrixURL"> - <c:param name="id">${study.id}</c:param> - <c:param name="matrixid">${matrix.id}</c:param> - </c:url> + <c:url value="/PhyloWS/${matrix.namespacedGUID}.xml" var="newMatrixURL"/> <a href="${newMatrixURL}"> <img class="iconButton" + src="<fmt:message key="icons.xml"/>" + title="<fmt:message key="download.nexml"/>" + alt="<fmt:message key="download.nexml"/>"/> + </a> + </display:column> + + <display:column + sortable="false" + class="iconColumn" + headerClass="iconColumn"> + <c:url value="/PhyloWS/${matrix.namespacedGUID}.nex" var="newMatrixURL"/> + <a href="${newMatrixURL}"> + <img + class="iconButton" src="<fmt:message key="icons.download.reconstructed"/>" title="<fmt:message key="download.reconstructedfile"/>" alt="<fmt:message key="download.reconstructedfile"/>"/> @@ -103,10 +114,7 @@ sortable="false" class="iconColumn" headerClass="iconColumn"> - <c:url var="url" value="matrix.html"> - <c:param name="matrixid" value="${matrix.id}" /> - <c:param name="id" value="${matrix.study.id}" /> - </c:url> + <c:url var="url" value="/PhyloWS/${matrix.namespacedGUID}.html"/> <a href="${url}"> <img class="iconButton" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2009-06-28 10:26:51
|
Revision: 145 http://treebase.svn.sourceforge.net/treebase/?rev=145&view=rev Author: rvos Date: 2009-06-28 10:26:49 +0000 (Sun, 28 Jun 2009) Log Message: ----------- Refactored to remove hardcoded /PhyloWS/ strings. Modified Paths: -------------- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.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-28 10:23:41 UTC (rev 144) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp 2009-06-28 10:26:49 UTC (rev 145) @@ -5,6 +5,11 @@ <c:set var="currentSection" scope="request" value="Matrices"/> <c:set var="headerPrefix" scope="request" value="${currentSection} for "/> + +<c:set var="serverName" scope="request" value="<%= request.getServerName() %>"/> +<c:set var="portNumber" scope="request" value="<%= request.getServerPort() %>"/> +<c:set var="baseURL" scope="request" value='http://${serverName}:${portNumber}/treebase-web/phylows/'/> + <jsp:include page="nav.jsp"/> <c:url var="studyURL" value="summary.html"> @@ -21,11 +26,8 @@ cellpadding="3"> <display:column title="ID"> - <c:url value="matrix.html" var="matrixURL"> - <c:param name="id">${study.id}</c:param> - <c:param name="matrixid">${matrix.id}</c:param> - </c:url> - <a href="${matrixURL}">M${matrix.id }</a> + <c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">html</c:param></c:url> + <a href="${url}">${matrix.treebaseIDString}</a> </display:column> <display:column @@ -69,8 +71,8 @@ sortable="false" class="iconColumn" headerClass="iconColumn"> - <c:url value="/PhyloWS/${matrix.namespacedGUID}.xml" var="newMatrixURL"/> - <a href="${newMatrixURL}"> + <c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">nexml</c:param></c:url> + <a href="${url}"> <img class="iconButton" src="<fmt:message key="icons.xml"/>" @@ -83,8 +85,8 @@ sortable="false" class="iconColumn" headerClass="iconColumn"> - <c:url value="/PhyloWS/${matrix.namespacedGUID}.rdf" var="newMatrixURL"/> - <a href="${newMatrixURL}"> + <c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">rdf</c:param></c:url> + <a href="${url}"> <img class="iconButton" src="<fmt:message key="icons.rdf"/>" @@ -97,8 +99,8 @@ sortable="false" class="iconColumn" headerClass="iconColumn"> - <c:url value="/PhyloWS/${matrix.namespacedGUID}.nex" var="newMatrixURL"/> - <a href="${newMatrixURL}"> + <c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">nexus</c:param></c:url> + <a href="${url}"> <img class="iconButton" src="<fmt:message key="icons.download.reconstructed"/>" @@ -128,7 +130,7 @@ sortable="false" class="iconColumn" headerClass="iconColumn"> - <c:url var="url" value="/PhyloWS/${matrix.namespacedGUID}.html"/> + <c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">html</c:param></c:url> <a href="${url}"> <img class="iconButton" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rv...@us...> - 2010-03-01 16:02:54
|
Revision: 522 http://treebase.svn.sourceforge.net/treebase/?rev=522&view=rev Author: rvos Date: 2010-03-01 16:02:48 +0000 (Mon, 01 Mar 2010) Log Message: ----------- Download links no longer point to localhost. Modified Paths: -------------- trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.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 2010-03-01 15:49:04 UTC (rev 521) +++ trunk/treebase-web/src/main/webapp/WEB-INF/pages/search/study/matrices.jsp 2010-03-01 16:02:48 UTC (rev 522) @@ -6,10 +6,6 @@ <c:set var="currentSection" scope="request" value="Matrices"/> <c:set var="headerPrefix" scope="request" value="${currentSection} for "/> -<c:set var="serverName" scope="request" value="<%= request.getServerName() %>"/> -<c:set var="portNumber" scope="request" value="<%= request.getServerPort() %>"/> -<c:set var="baseURL" scope="request" value='http://${serverName}:${portNumber}/treebase-web/phylows/'/> - <jsp:include page="nav.jsp"/> <c:url var="studyURL" value="summary.html"> @@ -26,7 +22,7 @@ cellpadding="3"> <display:column title="ID"> - <c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">html</c:param></c:url> + <c:url var="url" value="${matrix.phyloWSPath.purl}"><c:param name="format">html</c:param></c:url> <a href="${url}">${matrix.treebaseIDString}</a> </display:column> @@ -71,7 +67,7 @@ sortable="false" class="iconColumn" headerClass="iconColumn"> - <c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">nexml</c:param></c:url> + <c:url var="url" value="${matrix.phyloWSPath.purl}"><c:param name="format">nexml</c:param></c:url> <a href="${url}"> <img class="iconButton" @@ -85,7 +81,7 @@ sortable="false" class="iconColumn" headerClass="iconColumn"> - <c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">rdf</c:param></c:url> + <c:url var="url" value="${matrix.phyloWSPath.purl}"><c:param name="format">rdf</c:param></c:url> <a href="${url}"> <img class="iconButton" @@ -99,7 +95,7 @@ sortable="false" class="iconColumn" headerClass="iconColumn"> - <c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">nexus</c:param></c:url> + <c:url var="url" value="${matrix.phyloWSPath.purl}"><c:param name="format">nexus</c:param></c:url> <a href="${url}"> <img class="iconButton" @@ -130,7 +126,7 @@ sortable="false" class="iconColumn" headerClass="iconColumn"> - <c:url var="url" value="${baseURL}${matrix.phyloWSPath}"><c:param name="format">html</c:param></c:url> + <c:url var="url" value="${matrix.phyloWSPath.purl}"><c:param name="format">html</c:param></c:url> <a href="${url}"> <img class="iconButton" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |