Changeset 24359


Ignore:
Timestamp:
2011-08-01T21:15:32+12:00 (13 years ago)
Author:
ak19
Message:

Corrections to commits of revision 24339 and 24340: better layout for oran skin when the default contents of collectionconfig.xml are present (if there's nothing in collectionconfig.xml, it will use Sam's better interface). Uses table and table rows and cells instead of unordered list and listitems.

Location:
main/trunk/greenstone3/web/interfaces/oran
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r24340 r24359  
    652652/* ------- BROWSE -------*/
    653653
     654.childrenlist {
     655    margin:0 0 0 10px;
     656
     657}
     658.childrenlist td {
     659    padding:3px 0px 0px 10px;
     660}
     661
     662/*
    654663ul.childrenlist li {
    655664list-style-type:none;
    656665}
    657 
    658 /*
    659666ul#classifierlist,ul#classifiernodelist {
    660667    list-style-type:none;

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

    r24340 r24359  
    2424    <xsl:param name="collName"/>
    2525    <xsl:param name="serviceName"/>
    26     <ul id="classifiernodelist">
     26    <table id="classifiernodelist">
    2727      <xsl:call-template name="processNodeChildren">
    2828    <xsl:with-param name='collName' select='$collName'/>
    2929    <xsl:with-param name='serviceName' select='$serviceName'/>
    3030      </xsl:call-template>
    31     </ul>
     31    </table>
    3232  </xsl:template>
    3333
    … …  
    5757 
    5858  <!-- icon + title template-->
    59   <xsl:template match="classifierNode">XXXX
     59  <xsl:template match="classifierNode">
    6060    <xsl:param name="collName"/>
    6161    <xsl:param name="serviceName"/>
    … …  
    7878    <xsl:param name="collName"/>
    7979    <xsl:param name="serviceName"/>
    80     <xsl:for-each select='classifierNode|documentNode'>
     80    <xsl:for-each select='classifierNode|documentNode'><tr>
    8181      <xsl:choose>
    8282    <xsl:when test="name()='documentNode'">
    83       <li><table><tr>
     83      <td><table><tr>
    8484        <xsl:call-template name="documentNodeWrapper">
    8585          <xsl:with-param name='collName' select='$collName'/>
    … …  
    8787        </xsl:call-template>
    8888          </tr></table>
    89       </li>
     89      </td>
    9090    </xsl:when>
    9191    <xsl:otherwise>
    92       <!--<li>--><table><tr>
     92      <td><table><tr>
    9393        <xsl:apply-templates select='.'>
    9494          <xsl:with-param name='collName' select='$collName'/>
    … …  
    9696        </xsl:apply-templates>
    9797          </tr></table>
    98       <!--</li>-->
     98      </td>
    9999      <xsl:if test="child::classifierNode or child::documentNode">
    100100        <!--recurse into the children-->
    101         <!--<li>--><ul class="childrenlist">
     101        <tr><td><table class="childrenlist">
    102102        <xsl:apply-templates select='.' mode='process-all-children'>
    103103          <xsl:with-param name='collName' select='$collName'/>
    104104          <xsl:with-param name='serviceName' select='$serviceName'/>
    105105        </xsl:apply-templates>
    106           </ul>
    107         <!--</li>-->
     106        </table></td></tr>
    108107      </xsl:if>
    109108    </xsl:otherwise>
    110109      </xsl:choose>
    111     </xsl:for-each>
     110    </tr></xsl:for-each>
    112111  </xsl:template>
    113112

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

    r24340 r24359  
    119119        <xsl:choose>
    120120            <xsl:when test="@type='classifier'">
    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>
     121                <img style="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"><xsl:attribute name="src"><xsl:text>interfaces/oran/images/itext.gif</xsl:text></xsl:attribute></img>
     124                <img style="border:0px"><xsl:attribute name="src"><xsl:text>interfaces/oran/images/itext.gif</xsl:text></xsl:attribute></img>
    125125            </xsl:when>
    126126        </xsl:choose>
    127127    </xsl:template>
    128  
     128
    129129    <xsl:template match="gsf:metadata[@format]">
    130130        <xslt:value-of disable-output-escaping="yes">
Note: See TracChangeset for help on using the changeset viewer.