Changeset 20465


Ignore:
Timestamp:
2009-09-01T14:00:27+12:00 (15 years ago)
Author:
oranfry
Message:

work on the new interface

Location:
greenstone3/trunk/web/interfaces/oran
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • greenstone3/trunk/web/interfaces/oran/style/core.css

    r19988 r20465  
    88    margin: 0;
    99    color: #444;
     10    background-color: #eae4d9;
    1011}
    1112
    … …  
    1617    padding: 0;
    1718    line-height: 160%;
    18     background: url('../images/layout/containerLeft.png') scroll repeat-y left top;
     19/*  background: url('../images/layout/containerLeft.png') scroll repeat-y left top;*/
     20    background-color: #fff;
     21    border: 1px solid #c8c3b9;
    1922}
    2023#container2 {
    21     background: url('../images/layout/containerRight.png') scroll repeat-y right top;
    22 }
     24    /* background: url('../images/layout/containerRight.png') scroll repeat-y right top; */
     25}
     26/*
    2327#container3 {
    2428    background: url('../images/layout/containerTop.png') scroll repeat-x left top;
    … …  
    2832    padding: 10px;
    2933}
     34*/
    3035
    3136#banner {
    … …  
    3843
    3944#content {
    40     border-left: 1px solid #cdc;
    41     border-right: 1px solid #cdc;
    4245    padding: 1em;
    4346    min-height: 300px;
    … …  
    6366}
    6467
    65 #collectionLinks a {
     68.collectionLink {
    6669    display: block;
     70    width: 140px;
     71    height: 100px;
    6772    float: left;
    68     width: 160px;
    69     height: 120px;
    7073    border: 1px solid #888;
    71     background-position: center center;
    72     background-repeat: no-repeat;
    7374    margin: 0 20px 20px 0;
     75    font-size: 150%;
     76    color: #444;
     77    text-decoration: none;
     78    background: url(../images/collectionIconStripe.gif) scroll no-repeat 0 0;
     79    padding: 20px;
    7480}
    7581
    … …  
    260266
    261267/* corners of the banner */
     268/*
    262269.corner {
    263270    position: absolute;
    … …  
    284291    background-position: -20px -20px;
    285292}
    286 
     293*/
    287294.clear {
    288295    clear: both;

  • greenstone3/trunk/web/interfaces/oran/transform/layouts/main.xsl

    r20404 r20465  
    7373                        <xsl:if test="/page/pageResponse/collection/serviceList/service">
    7474                            <ul id="nav">
    75                                 <xsl:for-each select="/page/pageResponse/collection/serviceList/service">
    76                                     <xsl:call-template name="navigationTab"/>
    77                                 </xsl:for-each>
     75                                <xsl:if test="/page/pageResponse/collection/serviceList/service[@type='browse']">
     76                                    <xsl:for-each select="/page/pageResponse/collection/serviceList/service[@type='browse']">
     77                                        <xsl:call-template name="navigationTab"/>
     78                                    </xsl:for-each>
     79                                </xsl:if>
     80                                <xsl:if test="/page/pageResponse/collection/serviceList/service[@type='query']">
     81                                   
     82                                    <xsl:for-each select="/page/pageResponse/collection/serviceList/service[@type='query'][1]">
     83                                        <xsl:call-template name="navigationTab"/>
     84                                    </xsl:for-each>
     85                                </xsl:if>
    7886                            </ul>
    7987                        </xsl:if>

  • greenstone3/trunk/web/interfaces/oran/transform/pages/berry.xsl

    r20379 r20465  
    2222        <script type="text/javascript" src="interfaces/oran/js/berrycheckout.js"><xsl:text> </xsl:text></script>
    2323        <script type="text/javascript">
    24             <xsl:text> </xsl:text>
     24            var doc;
     25            var docList = new Array();
    2526            <xsl:for-each select="/page/pageResponse/collection/item">
    2627                <xsl:text disable-output-escaping="yes">
    27 var doc = new Array();
    28 var docList = new Array();
     28            doc = new Array();</xsl:text>
     29                <xsl:for-each select="@*">
     30                    <xsl:text disable-output-escaping="yes">
     31            doc["</xsl:text><xsl:value-of select="name()" /><xsl:text disable-output-escaping="yes">"]='</xsl:text><xsl:value-of select="." /><xsl:text disable-output-escaping="yes">';</xsl:text>
     32                </xsl:for-each>
     33                <xsl:text disable-output-escaping="yes">
     34            docList[</xsl:text>
     35                <xsl:value-of select="position()-1"/>
     36                <xsl:text>] = doc;
    2937</xsl:text>
    30                 <xsl:for-each select="@*">
    31                     <xsl:text disable-output-escaping="yes">doc["</xsl:text><xsl:value-of select="name()" /><xsl:text disable-output-escaping="yes">"]='</xsl:text><xsl:value-of select="." /><xsl:text disable-output-escaping="yes">';
    32                     </xsl:text>
    33                 </xsl:for-each>
    34                 <xsl:text disable-output-escaping="yes">docList[docList.length] = doc;
    35                 </xsl:text>
    3638            </xsl:for-each>
    3739        </script>

  • greenstone3/trunk/web/interfaces/oran/transform/pages/query.xsl

    r20195 r20465  
    1515
    1616    <!-- set page breadcrumbs -->
    17     <xsl:template name="breadcrumbs"> <gslib:siteLink/><gslib:rightArrow/> <gslib:collectionNameLinked/><gslib:rightArrow/></xsl:template>
     17    <xsl:template name="breadcrumbs"> <gslib:siteLink/><gslib:rightArrow/><xsl:if test="/page/pageResponse/collection"> <gslib:collectionNameLinked/><gslib:rightArrow/></xsl:if></xsl:template>
    1818
    1919    <!-- the page content -->

  • greenstone3/trunk/web/interfaces/oran/transform/util.xsl

    r20406 r20465  
    1414  <!-- every pages ....................................................................... -->
    1515    <xsl:template name="siteName"><xsl:value-of select="/page/pageResponse/metadataList/metadata[@name='siteName']"/></xsl:template>
    16     <xsl:template name="siteLink"><a href="./{$library_name}"><xsl:call-template name="siteName"/></a></xsl:template>
     16    <xsl:template name="siteLink"><a href="./{$library_name}"><xsl:call-template name="siteName"/><xsl:text> </xsl:text></a></xsl:template>
    1717
    1818    <xsl:variable name="a"><xsl:value-of select="/page/pageRequest/paramList/param[@name='a']/@value"/>     </xsl:variable>
    … …  
    165165        <xsl:choose>
    166166            <xsl:when test="displayItem[@name='icon']">
    167                 <!-- <a href="{$library_name}/{@name}"> -->
    168167                <a href="{$library_name}?a=p&amp;sa=about&amp;c={@name}">
    169                     <xsl:attribute name="style">background-image: url('<xsl:value-of select="metadataList/metadata[@name='httpPath']"/>/images/icon-160x120.gif');</xsl:attribute>
    170                     <b><xsl:value-of select="displayItem[@name='name']"/></b>
     168                    <div class="collectionLink">
     169                        <xsl:value-of select="displayItem[@name='name']"/>
     170                    </div>
    171171                </a>
    172172            </xsl:when>
    … …  
    376376                    <xsl:attribute name='title'><xsl:value-of select="displayItem[@name='description']"/></xsl:attribute>
    377377                </xsl:if>
    378                 <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=<xsl:value-of select="$action"/>&amp;rt=d&amp;s=<xsl:value-of select="@name"/>&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/></xsl:attribute>
     378                <xsl:choose>
     379                    <xsl:when test="classifierList/classifier/@name">
     380                        <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=<xsl:value-of select="$action"/>&amp;rt=s&amp;s=<xsl:value-of select="@name"/>&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/>&amp;cl=<xsl:value-of select="classifierList/classifier/@name"/></xsl:attribute>
     381                    </xsl:when>
     382                    <xsl:otherwise>
     383                        <xsl:attribute name="href"><xsl:value-of select="$library_name"/>?a=<xsl:value-of select="$action"/>&amp;rt=d&amp;s=<xsl:value-of select="@name"/>&amp;c=<xsl:value-of select="/page/pageResponse/collection/@name"/></xsl:attribute>
     384                    </xsl:otherwise>
     385                </xsl:choose>
    379386                <xsl:value-of select="displayItem[@name='name']"/>
    380387            </a>
Note: See TracChangeset for help on using the changeset viewer.