Changeset 38056


Ignore:
Timestamp:
2023-09-07T13:28:08+12:00 (8 months ago)
Author:
kjdon
Message:

made this interface work again with current greenstone. didn't do any prettying, just wanted to make it functional

Location:
main/trunk/greenstone3/web/interfaces/basic
Files:
11 edited
2 moved

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/web/interfaces/basic/style/core.css

    r38055 r38056  
    2828}
    2929
    30 div#banner ul, ul#resultlist, ul#tocnodes, ul#docbuttons, ul.tocnode, ul#bannerlist, ul#navbarlist, ul#collectionlist, ul#servicelist, ul#classifierlist, ul#classifiernodelist, ul#queryitemlist{
     30div#banner ul, ul#resultlist, ul#tocnodes, ul#docbuttons, ul.tocnode, ul#bannerlist, ul#navbarlist, ul#collectionlist, ul#servicelist, ul#classifierlist, ul#classifiernodelist, ul#classifiernodelist-horizontal, ul#childrenlist, ul#queryitemlist{
    3131  list-style-type:none;
    3232  margin:0;
    3333  padding:0;
     34}
     35
     36ul#classifiernodelist-horizontal li {
     37    display: inline;
     38    padding: 2px;
    3439}
    3540

  • main/trunk/greenstone3/web/interfaces/basic/transform/about.xsl

    r25699 r38056  
    88  exclude-result-prefixes="java util">
    99
    10  
     10  <xsl:include href="style.xsl"/>
    1111  <xsl:template match="page">
    1212   
    … …  
    1414    <html>
    1515      <head>
     16        <xsl:call-template name="baseHref"/>
    1617    <title>
    1718      <gslib:aboutCollectionPageTitle/>

  • main/trunk/greenstone3/web/interfaces/basic/transform/authen.xsl

    r26533 r38056  
    2020  <xsl:template name="pageHead">
    2121    <head>
     22      <xsl:call-template name="baseHref"/>
    2223      <title>
    2324    <xsl:call-template name="pageTitle"/><xsl:text> </xsl:text>

  • main/trunk/greenstone3/web/interfaces/basic/transform/classifier.xsl

    r24115 r38056  
    1818    <html>
    1919      <head>
     20        <xsl:call-template name="baseHref"/>
    2021    <title>
    2122      <!-- put a space in the title in case the actual value is missing - mozilla will not display a page with no title-->

  • main/trunk/greenstone3/web/interfaces/basic/transform/classifiertools.xsl

    r23972 r38056  
    1313      <xsl:variable name="cl_name"><xsl:value-of select="@name"/></xsl:variable>
    1414      <xsl:choose>
    15     <xsl:when test="/page/pageResponse/service/classifierList/classifier[@name=$cl_name]/@horizontalAtTop">
     15    <!--<xsl:when test="/page/pageResponse/service/classifierList/classifier[@name=$cl_name]/@horizontalAtTop">-->
     16        <xsl:when test="@childType='HList'">
    1617      <xsl:apply-templates select="." mode="horizontal-at-top">
    1718        <xsl:with-param name="collName" select="$collName"/>

  • main/trunk/greenstone3/web/interfaces/basic/transform/document.xsl

    r25843 r38056  
    2323        <html>
    2424          <head>
     25            <xsl:call-template name="baseHref"/>
    2526            <title>
    2627              <!-- put a space in the title in case the actual value is missing - mozilla will not display a page with no title-->
    … …  
    268269      <xsl:otherwise>
    269270        <img>
    270           <xsl:attribute name="src"><xsl:value-of select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<xsl:value-of select="metadataList/metadata[@name='archivedir']"/>/cover.jpg</xsl:attribute>
     271          <xsl:attribute name="src"><xsl:value-of select="/page/pageResponse/collection/metadataList/metadata[@name='httpPath']"/>/index/assoc/<xsl:value-of select="metadataList/metadata[@name='assocfilepath']"/>/cover.jpg</xsl:attribute>
    271272        </img>
    272273      </xsl:otherwise>

  • main/trunk/greenstone3/web/interfaces/basic/transform/expand-gsf.xsl

    r38055 r38056  
    1010  <xsl:namespace-alias
    1111    stylesheet-prefix="xslt" result-prefix="xsl"/>
     12
     13  <!-- don't output anything for gsf:format-gs2 elements,
     14       they just exist in collectionconfig files to keep the XML valid -->
     15  <xsl:template match="gsf:format-gs2" />
     16 
    1217
    1318  <xsl:template match="format">

  • main/trunk/greenstone3/web/interfaces/basic/transform/gslib.xsl

    r25877 r38056  
    1515  <xsl:param name="interface_name"/>
    1616  <xsl:param name="library_name"/>
    17 
     17  <xsl:param name="servlet_url_prefix"/>
     18 
    1819  <xsl:include href="xml-to-string.xsl"/>
    1920 
    … …  
    125126  <xsl:template name="collectionLinkWithImage">
    126127    <xsl:choose>
    127       <xsl:when test="displayItem[@name='icon']">
     128      <xsl:when test="displayItemList/displayItem[@name='icon']">
    128129    <a href="{$library_name}?a=p&amp;sa=about&amp;c={@name}">
    129130      <img>
    130131        <xsl:attribute name="src">
    131           <xsl:value-of select="metadataList/metadata[@name='httpPath']"/>/images/<xsl:value-of select="displayItem[@name='icon']"/>
     132          <xsl:value-of select="metadataList/metadata[@name='httpPath']"/>/images/<xsl:value-of select="displayItemList/displayItem[@name='icon']"/>
    132133        </xsl:attribute>
    133134        <xsl:attribute name="alt">
    134           <xsl:value-of select="displayItem[@name='name']"/>
     135          <xsl:value-of select="displayItemList/displayItem[@name='name']"/>
    135136        </xsl:attribute>
    136137      </img>
    … …  
    139140      <xsl:otherwise>
    140141    <a class="noimage" href="{$library_name}?a=p&amp;sa=about&amp;c={@name}"> 
    141       <xsl:value-of select="displayItem[@name='name']"/>
     142      <xsl:value-of select="displayItemList/displayItem[@name='name']"/>
    142143    </a>
    143144      </xsl:otherwise>
    144     </xsl:choose>
    145   </xsl:template>
    146  
    147  
     145    </xsl:choose>
     146  </xsl:template>
     147 
     148    <xsl:template name="collectionMeta">
     149    <xsl:param name="name"/>
     150    <xsl:value-of select="/page/pageResponse/collection/metadataList/metadata[@name=$name]"/>
     151    </xsl:template>
     152   
    148153  <xsl:template name="serviceClusterList">
    149154    <xsl:apply-templates select="serviceClusterList"/>
    … …  
    152157  <xsl:template match="serviceClusterList">
    153158    <xsl:for-each select="serviceCluster">
    154       <a href="{$library_name}?a=p&amp;sa=about&amp;c={@name}"><xsl:value-of select='@name'/><xsl:value-of select="displayItem[@name='name']"/></a>
     159      <a href="{$library_name}?a=p&amp;sa=about&amp;c={@name}"><xsl:value-of select='@name'/><xsl:value-of select="displayItemList/displayItem[@name='name']"/></a>
    155160    </xsl:for-each>
    156161  </xsl:template>
    … …  
    163168 
    164169  <xsl:template name="authenticationLink">
    165     <a href="{$library_name}?a=g&amp;rt=r&amp;sa=authen&amp;s={@name}&amp;s1.aup=Login&amp;s1.un=&amp;s1.asn="><xsl:value-of select="displayItem[@name='name']"/></a><xsl:value-of select="displayItem[@name='description']"/>
     170    <a href="{$library_name}?a=g&amp;rt=r&amp;sa=authen&amp;s={@name}&amp;s1.aup=Login&amp;s1.un=&amp;s1.asn="><xsl:value-of select="displayItemList/displayItem[@name='name']"/></a><xsl:value-of select="displayItem[@name='description']"/>
    166171  </xsl:template>
    167172 
    … …  
    193198    <a href="{$library_name}?a=p&amp;sa=about&amp;c={$collName}">
    194199      <xsl:choose>
    195     <xsl:when test="$this-element/displayItem[@name='icon']">
     200    <xsl:when test="$this-element/displayItemList/displayItem[@name='icon']">
    196201      <img border="0">
    197202        <xsl:attribute name="src">
    198           <xsl:value-of select="$this-element/metadataList/metadata[@name='httpPath']"/>/images/<xsl:value-of select="$this-element/displayItem[@name='icon']"/>
     203          <xsl:value-of select="$this-element/metadataList/metadata[@name='httpPath']"/>/images/<xsl:value-of select="$this-element/displayItemList/displayItem[@name='icon']"/>
    199204        </xsl:attribute>   
    200205        <xsl:attribute name="alt">
    … …  
    207212    </xsl:when>
    208213    <xsl:otherwise>
    209       <xsl:value-of select="$this-element/displayItem[@name='name']"/>
     214      <xsl:value-of select="$this-element/displayItemList/displayItem[@name='name']"/>
    210215    </xsl:otherwise>
    211216      </xsl:choose>

  • main/trunk/greenstone3/web/interfaces/basic/transform/home.xsl

    r25699 r38056  
    88  exclude-result-prefixes="java util">
    99
    10  
     10  <xsl:include href="style.xsl"/>
    1111  <xsl:template match="page/pageResponse">
    1212   
    … …  
    1515     
    1616      <head>
     17        <xsl:call-template name="baseHref"/>
    1718    <title>
    1819      <gslib:siteHomePageTitle/>

  • main/trunk/greenstone3/web/interfaces/basic/transform/pref.xsl

    r23972 r38056  
    1616    <html>
    1717      <head>
     18        <xsl:call-template name="baseHref"/>
    1819    <title>
    1920      <!-- put a space in the title in case the actual value is missing - mozilla will not display a page with no title-->

  • main/trunk/greenstone3/web/interfaces/basic/transform/query.xsl

    r23972 r38056  
    1414
    1515  <xsl:output method="html"/>
    16  
     16  <!-- added this so cross collection searching doesn't fail - this is used in the default template in localsite's siteConfig.xml -->
     17  <xsl:variable name="opt-doc-link-args"></xsl:variable>
    1718  <!-- the main page layout template is here -->
    1819  <xsl:template match="page">
    1920    <html>
    2021      <head>
     22        <xsl:call-template name="baseHref"/>
    2123    <title>
    2224      <!-- put a space in the title in case the actual value is missing - mozilla will not display a page with no title-->

  • main/trunk/greenstone3/web/interfaces/basic/transform/style.xsl

    r25699 r38056  
    1313  <xsl:param name="library_name"/>
    1414
     15  <xsl:variable name="base-href">
     16    <xsl:choose>
     17      <xsl:when test="$servlet_url_prefix">
     18        <xsl:value-of select="$servlet_url_prefix"/>
     19      </xsl:when>
     20      <!-- don't need this one anymore, keep for backwards compat-->
     21      <xsl:when test="/page/pageResponse/metadataList/metadata[@name = 'siteURL']">
     22        <xsl:value-of select="/page/pageResponse/metadataList/metadata[@name = 'siteURL']"/>
     23      </xsl:when>
     24      <xsl:when test="/page/pageRequest/@baseURL">
     25        <xsl:value-of select="/page/pageRequest/@baseURL"/>
     26      </xsl:when>
     27    </xsl:choose>
     28  </xsl:variable>
     29
     30  <xsl:template name="baseHref">
     31    <base href="{$base-href}"/>
     32  </xsl:template>
     33 
    1534  <!-- global style info goes here  -->
    1635  <xsl:template name="globalStyle">
Note: See TracChangeset for help on using the changeset viewer.