Changeset 32626

Show
Ignore:
Timestamp:
23.11.2018 14:19:17 (3 weeks 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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/default/transform/pages/classifier.xsl

    r32600 r32626  
    271271      TEMPLATE FOR DOCUMENTS 
    272272  --> 
    273   <xsl:template match="documentNode"><!-- priority="3"--> 
    274     <!-- The book icon --> 
    275     <td> 
    276       <img>          
    277     <xsl:attribute name="src"> 
    278       <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'book_image')"/> 
    279     </xsl:attribute> 
    280       </img> 
    281     </td> 
    282     <!-- The document link --> 
    283     <td> 
    284       <a> 
    285     <xsl:choose> 
    286       <xsl:when test="@docType = 'paged'"> 
    287         <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> 
    288       </xsl:when> 
    289       <xsl:otherwise> 
    290         <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> 
    291       </xsl:otherwise> 
    292     </xsl:choose> 
    293     <xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/> 
    294       </a> 
    295     </td> 
    296     <!-- The berry (optional) --> 
    297     <td> 
    298       <xsl:call-template name="documentBerryForClassifierOrSearchPage"/> 
    299     </td> 
    300   </xsl:template> 
     273  <xsl:template match="documentNode"> 
     274    <td valign="top"> 
     275      <gsf:link type="document"> 
     276    <gsf:icon type="document"/> 
     277      </gsf:link> 
     278    </td> 
     279    <td valign="top"> 
     280      <gsf:link type="source"> 
     281    <gsf:choose-metadata> 
     282      <gsf:metadata name="thumbicon"/> 
     283      <gsf:metadata name="srcicon"/> 
     284    </gsf:choose-metadata> 
     285      </gsf:link> 
     286    </td> 
     287    <td valign="top"> 
     288      <gsf:link type="document"> 
     289    <!-- Defined in the global format statement --> 
     290    <xsl:call-template name="choose-title"/> 
     291    <gsf:switch> 
     292      <gsf:metadata name="Source"/> 
     293      <gsf:when test="exists"><br/><i>(<gsf:metadata name="Source"/>)</i></gsf:when> 
     294    </gsf:switch> 
     295      </gsf:link> 
     296    </td> 
     297  </xsl:template> 
     298 
    301299 
    302300  <xsl:template name="documentNodePost"> 
     
    321319  <xsl:template match="classifierNode[@classifierStyle = 'HList']" > 
    322320    <gsf:link type="classifier" style="static"> 
    323       <xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/> 
     321      <gsf:metadata name="Title"/> 
    324322    </gsf:link> 
    325323  </xsl:template> 
    326324 
    327325  <xsl:template match="classifierNode"> 
    328     <!-- Bookshelf icon --> 
    329     <td> 
     326    <td valign="top"> 
    330327      <gsf:link type="classifier" style="static"> 
    331       <img> 
    332     <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'bookshelf_image')"/></xsl:attribute> 
    333       </img> 
    334       </gsf:link> 
    335     </td> 
    336     <!-- Link title --> 
    337     <td> 
     328    <gsf:icon type="classifier"/> 
     329      </gsf:link> 
     330    </td> 
     331    <td valign="top"> 
    338332      <gsf:link type="classifier"> 
    339     <xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/> 
     333    <gsf:metadata name="Title"/> 
    340334      </gsf:link> 
    341335    </td>