Changeset 32626 for main/trunk/greenstone3/web/interfaces/default/transform/pages/classifier.xsl

Timestamp:

2018-11-23T14:19:17+13:00 (5 years ago)

Author:

kjdon

Message:

making default templates in the interface xsl files, the format statements in the model col collectionConfig.xml, and GLI default formats in Format4gs3Manager all match up

File:

• main/trunk/greenstone3/web/interfaces/default/transform/pages/classifier.xsl (modified) (2 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/pages/classifier.xsl

@@ -271 +271 @@
       TEMPLATE FOR DOCUMENTS
   -->
-  <xsl:template match="documentNode"><!-- priority="3"-->
-    <!-- The book icon -->
-    <td>
-      <img>         
-    <xsl:attribute name="src">
-      <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'book_image')"/>
-    </xsl:attribute>
-      </img>
-    </td>
-    <!-- The document link -->
-    <td>
-      <a>
-    <xsl:choose>
-      <xsl:when test="@docType = 'paged'">
-        <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/>&amp;d=<xsl:value-of select="@nodeID"/>&amp;dt=<xsl:value-of select="@docType"/>&amp;p.a=b&amp;p.s=<xsl:value-of select="/page/pageResponse/service/@name"/></xsl:attribute>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=d&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/>&amp;d=<xsl:value-of select="@nodeID"/>&amp;dt=<xsl:value-of select="@docType"/>&amp;p.a=b&amp;p.s=<xsl:value-of select="/page/pageResponse/service/@name"/>&amp;ed=1</xsl:attribute>
-      </xsl:otherwise>
-    </xsl:choose>
-    <xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/>
-      </a>
-    </td>
-    <!-- The berry (optional) -->
-    <td>
-      <xsl:call-template name="documentBerryForClassifierOrSearchPage"/>
-    </td>
-  </xsl:template>
+  <xsl:template match="documentNode">
+    <td valign="top">
+      <gsf:link type="document">
+    <gsf:icon type="document"/>
+      </gsf:link>
+    </td>
+    <td valign="top">
+      <gsf:link type="source">
+    <gsf:choose-metadata>
+      <gsf:metadata name="thumbicon"/>
+      <gsf:metadata name="srcicon"/>
+    </gsf:choose-metadata>
+      </gsf:link>
+    </td>
+    <td valign="top">
+      <gsf:link type="document">
+    <!-- Defined in the global format statement -->
+    <xsl:call-template name="choose-title"/>
+    <gsf:switch>
+      <gsf:metadata name="Source"/>
+      <gsf:when test="exists"><br/><i>(<gsf:metadata name="Source"/>)</i></gsf:when>
+    </gsf:switch>
+      </gsf:link>
+    </td>
+  </xsl:template>
+
 
   <xsl:template name="documentNodePost">
@@ -321 +319 @@
   <xsl:template match="classifierNode[@classifierStyle = 'HList']" >
     <gsf:link type="classifier" style="static">
-      <xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/>
+      <gsf:metadata name="Title"/>
     </gsf:link>
   </xsl:template>
 
   <xsl:template match="classifierNode">
-    <!-- Bookshelf icon -->
-    <td>
+    <td valign="top">
       <gsf:link type="classifier" style="static">
-      <img>
-    <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'bookshelf_image')"/></xsl:attribute>
-      </img>
-      </gsf:link>
-    </td>
-    <!-- Link title -->
-    <td>
+    <gsf:icon type="classifier"/>
+      </gsf:link>
+    </td>
+    <td valign="top">
       <gsf:link type="classifier">
-    <xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/>
+    <gsf:metadata name="Title"/>
       </gsf:link>
     </td>