xmlui: Add clickable ICARDA subjects links to item list and item view

Addresses #44.
alanorth · Dec 11, 2014 · 74c0050 · 74c0050
1 parent 436fe52
commit 74c0050
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.../modules/xmlui/src/main/webapp/themes/ICARDA/lib/xsl/aspect/artifactbrowser/item-list.xsl b/.../modules/xmlui/src/main/webapp/themes/ICARDA/lib/xsl/aspect/artifactbrowser/item-list.xsl
@@ -137,8 +137,8 @@
                     </xsl:attribute>
 
                     <span class="content" style="width: {$metadataWidth - 110}px;">
-                      <xsl:for-each select="//dim:field[@element='ccsubject'and @qualifier='ccafsubject']">
-                <a href="/browse?value={.}&amp;type=ccafsubject"><xsl:value-of select="."/></a><xsl:if test="position()!=last()"><xsl:text>, </xsl:text></xsl:if>
+                      <xsl:for-each select="//dim:field[@element='subject'and @qualifier='icarda']">
+                <a href="/browse?value={.}&amp;type=icardasubject"><xsl:value-of select="."/></a><xsl:if test="position()!=last()"><xsl:text>, </xsl:text></xsl:if>
                       </xsl:for-each>
                     </span>
                 </xsl:element>

diff --git a/.../modules/xmlui/src/main/webapp/themes/ICARDA/lib/xsl/aspect/artifactbrowser/item-view.xsl b/.../modules/xmlui/src/main/webapp/themes/ICARDA/lib/xsl/aspect/artifactbrowser/item-view.xsl
@@ -677,15 +677,15 @@
 
 
 
-		<!-- CCAFS Subject row -->
-		<xsl:when test="$clause = 22 and (dim:field[@element='ccsubject' and @qualifier='ccafsubject'])">
+		<!-- ICARDA subjects row -->
+		<xsl:when test="$clause = 22 and (dim:field[@element='subject' and @qualifier='icarda'])">
                     <tr class="ds-table-row {$phase}">
 	                <td><span class="bold"><i18n:text>Subject Focus</i18n:text>:</span></td>
 	                <td>
-	                <xsl:for-each select="//dim:field[@element='ccsubject'and @qualifier='ccafsubject']">
+	                <xsl:for-each select="//dim:field[@element='subject'and @qualifier='icarda']">
                       <xsl:variable name="lnk"><xsl:value-of select="."/></xsl:variable>
 
-                            <a href="/browse?value={.}&amp;type=ccafsubject"><xsl:value-of select="."/></a><xsl:if test="position()!=last()"><xsl:text>, </xsl:text></xsl:if>
+                            <a href="/browse?value={.}&amp;type=icardasubject"><xsl:value-of select="."/></a><xsl:if test="position()!=last()"><xsl:text>, </xsl:text></xsl:if>
 
                     </xsl:for-each>
 	                </td>