Changeset 24340

Show
Ignore:
Timestamp:
27.07.2011 20:59:04 (8 years ago)
Author:
ak19
Message:

Getting a normal hierarchical classifier view to work in oran skin: this will be the look for the the default format statements that are present in collectionconfig.xml. Remove those format statements and Sam's much better interface will be displayed. To get things to work, needed to include some template match statements from default/gs3library as these were missing for dev/oran, including lots of elements from classifiertools.xsl. Dev therefore has a new file now: its own classifiertools.xsl.

Location:
main/trunk/greenstone3/web/interfaces/oran
Files:
1 added
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/oran/style/core.css

    r24149 r24340  
    650650} 
    651651 
     652/* ------- BROWSE -------*/ 
     653 
     654ul.childrenlist li { 
     655list-style-type:none; 
     656} 
     657 
     658/* 
     659ul#classifierlist,ul#classifiernodelist { 
     660    list-style-type:none; 
     661    margin:0; 
     662    padding:0 
     663} 
     664ul#classifierlist li{ 
     665list-style:none; 
     666margin:0 0 5px 0; 
     667padding:0;display:block; 
     668} 
     669ul#classifiernodelist li{ 
     670list-style:none; 
     671margin:0; 
     672padding:5px 0 0 0; 
     673display:block 
     674} 
     675ul.childrenlist{ 
     676list-style:none; 
     677margin:0; 
     678padding:0 0 0 20px; 
     679display:block; 
     680width:100% 
     681} 
     682*/ 
  • main/trunk/greenstone3/web/interfaces/oran/transform/config_format.xsl

    r24127 r24340  
    5555                   disable-output-escaping="yes" select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']" />/index/assoc/<xslt:value-of  
    5656                   disable-output-escaping="yes" select="metadataList/metadata[@name='assocfilepath']" />/<xslt:value-of  
    57                    disable-output-escaping="yes" select="metadataList/metadata[@name='Source']" /></xslt:attribute> 
     57                   disable-output-escaping="yes" select="metadataList/metadata[@name='srclinkFile']" /></xslt:attribute> 
    5858                  <xsl:apply-templates/> 
    5959                </a> 
     
    119119        <xsl:choose> 
    120120            <xsl:when test="@type='classifier'"> 
    121                 <img style="width:20px; height:16px; border:0px" src="util:getInterfaceText($interface_name, /page/@lang, 'bookshelf_image')" />  
     121                <img style="width:20px; height:16px; border:0px"><xsl:attribute name="src"><xsl:text>interfaces/oran/images/bookshelf.png</xsl:text></xsl:attribute></img> 
    122122            </xsl:when> 
    123123            <xsl:when test="@type='document'"> 
    124                 <img style="width:20px; height:16px; border:0px" src="util:getInterfaceText($interface_name, /page/@lang, 'book_image')" />  
     124                <img style="width:20px; height:16px; border:0px"><xsl:attribute name="src"><xsl:text>interfaces/oran/images/itext.gif</xsl:text></xsl:attribute></img>  
    125125            </xsl:when> 
    126126        </xsl:choose> 
  • main/trunk/greenstone3/web/interfaces/oran/transform/pages/classifier.xsl

    r24339 r24340  
    1010    <!-- use the 'main' layout --> 
    1111    <xsl:include href="layouts/main.xsl"/> 
     12    <xsl:include href="classifiertools.xsl"/> 
    1213 
    1314    <!-- set page title --> 
     
    3536        --> 
    3637        <table id="results"> 
    37             <xsl:for-each select="classifier/*"> 
    38                 <tr> 
    39                     <xsl:apply-templates select="."/> 
    40                 </tr> 
    41             </xsl:for-each> 
     38            <xsl:variable name="collName"><xsl:value-of select="/page/pageRequest/paramList/param[@name='c']/@value"/></xsl:variable> 
     39            <xsl:variable name="serviceName"><xsl:value-of select="service/@name"/></xsl:variable> 
     40 
     41            <xsl:apply-templates select="classifier"> 
     42                <xsl:with-param name="collName" select="$collName"/> 
     43                <xsl:with-param name="serviceName" select="$serviceName"/> 
     44            </xsl:apply-templates> 
    4245        </table> 
    4346        <div class="clear"><xsl:text> </xsl:text></div> 
     
    5861    </xsl:template>--> 
    5962 
    60     <xsl:template match="documentNode" priority="3"> 
     63    <xsl:template match="documentNode"><!-- priority="3"--> 
    6164        <!-- The book icon --> 
    6265        <td> 
     
    8487    TEMPLATE FOR GROUPS OF DOCUMENTS 
    8588    --> 
    86     <xsl:template match="classifierNode"> 
     89    <xsl:template match="classifierNode"><!-- priority="3"--> 
    8790 
    8891        <table id="title{@nodeID}"><tr>