Changeset 20796

Timestamp:

04/03/10 16:57:31 (2 years ago)

Author:

julie

Message:

display datasource name (kegg|reactome) next to logo

File:

• trunk/bio/webapp/resources/webapp/model/pathwayLinkDisplayer.jsp (modified) (1 diff)

trunk/bio/webapp/resources/webapp/model/pathwayLinkDisplayer.jsp

@@ -6 +6 @@
 <%-- get dataset name --%>
 <c:forEach items="${object.dataSets}" var="dataset">
-    <c:set var="datasetTitle" value="${dataset.title}"/>
+    <c:set var="datasetTitle" value="${dataset.title}"/>
 </c:forEach>
 
 <%-- set variables ~~ based on dataset, set link and image to KEGG or Reactome --%>
-<c:choose>        
+<c:choose>
 <c:when test="${datasetTitle == 'KEGG pathways data set'}">
-    <%-- KEGG --%>
-    <c:set var="imageName" value="KEGG_logo_small.gif"/>
-    <c:set var="text" value="KEGG"/>
-    <c:set var="href" value="http://www.genome.jp/dbget-bin/show_pathway?dme${object.identifier}"/>
+    <%-- KEGG --%>
+    <c:set var="imageName" value="KEGG_logo_small.gif"/>
+    <c:set var="text" value="KEGG"/>
+    <c:set var="href" value="http://www.genome.jp/dbget-bin/show_pathway?dme${object.identifier}"/>
 </c:when>
 <c:otherwise>
-    <%-- reactome --%>
-    <c:set var="imageName" value="reactome_logo.png"/>
-    <c:set var="text" value="Reactome"/>
-    <c:set var="href" value="http://www.reactome.org"/>
-    
-    <c:if test="${object.curated}">
-        <c:set var="href" value="http://fly.reactome.org/cgi-bin/eventbrowser?DB=test_fly_reactome_release_1_myisam&ID=${object.identifier}"/>
+    <%-- reactome --%>
+    <c:set var="imageName" value="reactome_logo.png"/>
+    <c:set var="text" value="Reactome"/>
+    <c:set var="href" value="http://www.reactome.org"/>
+
+    <c:if test="${object.curated}">
+           <c:set var="href" value="http://fly.reactome.org/cgi-bin/eventbrowser?DB=test_fly_reactome_release_1_myisam&ID=${object.identifier}"/>
     </c:if>
 </c:otherwise>
 </c:choose>
-         
-<%-- display logo and link --%>      
+
+<%-- display logo and link --%>
 <table class="lookupReport" cellspacing="5" cellpadding="0">
 <tr>
-    <td align="right">
-            <a href="${href}" class="ext_link" target="_new"><html:img src="model/images/${imageName}" width="28" height="20" title="${text}"/></a>
+    <td align="right">
+            <a href="${href}" class="ext_link" target="_new"><html:img src="model/images/${imageName}" width="28" height="20" title="${text}"/><c:out value="${text}"></c:out></a>
     </td>
 </tr>