Changeset 24510

Show
Ignore:
Timestamp:
29.08.2011 11:04:11 (8 years ago)
Author:
sjm84
Message:

Some updates, mostly to do with adding in the new document maker functionality

Location:
main/trunk/greenstone3/web/interfaces/oran
Files:
19 added
6 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/oran/interfaceConfig.xml

    r23405 r24510  
    2727      <subaction name="authen" xslt='pages/authen.xsl'/> 
    2828      <subaction name="berry" xslt='pages/berry.xsl'/> 
     29      <subaction name="documentbasket" xslt='pages/documentbasket.xsl'/> 
    2930    </action> 
    3031  </actionList> 
     
    187188    <option name="highlightQueryTerms" value="true"/> 
    188189    <option name="berryBaskets" value="true"/> 
     190    <option name="documentBasket" value="true"/> 
    189191  </optionList> 
    190192</interfaceConfig> 
  • main/trunk/greenstone3/web/interfaces/oran/transform/config_format.xsl

    r24458 r24510  
    104104                            <xslt:attribute name="href"> 
    105105                                <xslt:value-of select='$library_name'/> 
    106                                 <xsl:text>?a=d&amp;ed=1&amp;book=off&amp;c=</xsl:text> 
     106                                <xsl:text disable-output-escaping="yes">?a=d&amp;ed=1&amp;book=off&amp;c=</xsl:text> 
    107107                                <xslt:value-of select='/page/pageResponse/collection/@name'/> 
    108                                 <xsl:text>&amp;d=</xsl:text> 
     108                                <xsl:text disable-output-escaping="yes">&amp;d=</xsl:text> 
    109109                                <xslt:value-of select='@nodeID'/> 
    110                                 <xsl:text>&amp;dt=</xsl:text> 
     110                                <xsl:text disable-output-escaping="yes">&amp;dt=</xsl:text> 
    111111                                <xslt:value-of select='@docType'/> 
    112112                                <xslt:if test="@nodeType='leaf'"> 
    113                                     <xsl:text>&amp;sib=1</xsl:text> 
     113                                    <xsl:text disable-output-escaping="yes">&amp;sib=1</xsl:text> 
    114114                                </xslt:if> 
    115                                 <xsl:text>&amp;p.a=</xsl:text> 
     115                                <xsl:text disable-output-escaping="yes">&amp;p.a=</xsl:text> 
    116116                                <xslt:value-of select="/page/pageRequest/@action"/> 
    117                                 <xsl:text>&amp;p.sa=</xsl:text> 
     117                                <xsl:text disable-output-escaping="yes">&amp;p.sa=</xsl:text> 
    118118                                <xsl:value-of select="/page/pageRequest/@subaction"/> 
    119                                 <xsl:text>&amp;p.s=</xsl:text> 
     119                                <xsl:text disable-output-escaping="yes">&amp;p.s=</xsl:text> 
    120120                                <xslt:value-of select="/page/pageResponse/service/@name"/> 
    121121                            </xslt:attribute> 
     
    134134            </xsl:when> 
    135135            <xsl:when test="@type='document'"> 
    136                 <img style="border:0px"><xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'page_icon_image')"/></xsl:attribute></img>  
     136                <img style="border:0px"><xslt:attribute name="id">documentBasketBook<xslt:value-of select="/page/pageResponse/collection/@name"/>:<xslt:value-of select="@nodeID"/></xslt:attribute><xslt:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'page_icon_image')"/></xslt:attribute></img>  
    137137            </xsl:when> 
    138138        </xsl:choose> 
  • main/trunk/greenstone3/web/interfaces/oran/transform/javascript-global-setup.xsl

    r24469 r24510  
    9494            <xsl:text disable-output-escaping="yes">gs.imageURLs.loading = "</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'loading_image')"/><xsl:text disable-output-escaping="yes">";</xsl:text> 
    9595            <xsl:text disable-output-escaping="yes">gs.imageURLs.pageIcon = "</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'page_icon_image')"/><xsl:text disable-output-escaping="yes">";</xsl:text> 
     96            <xsl:text disable-output-escaping="yes">gs.imageURLs.trashFull = "</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'trash_full_image')"/><xsl:text disable-output-escaping="yes">";</xsl:text> 
    9697        </script> 
    9798    </xsl:template> 
  • main/trunk/greenstone3/web/interfaces/oran/transform/pages/classifier.xsl

    r24340 r24510  
    2121    <xsl:template match="/page/pageResponse"> 
    2222        <xsl:call-template name="classifierLoadScript"/> 
    23         <!-- this right sidebar --> 
    24         <xsl:if test="$berryBasketOn"> 
    25             <div id="rightSidebar"> 
    26                 <!-- show the berry basket if it's turned on --> 
    27                 <gslib:berryBasket/> 
    28                 <xsl:text> </xsl:text> 
    29             </div> 
    30         </xsl:if> 
     23            <!-- this right sidebar --> 
     24            <xsl:if test="$berryBasketOn or $documentBasketOn"> 
     25                <div id="rightSidebar"> 
     26                    <xsl:if test="$berryBasketOn"> 
     27                        <!-- show the berry basket if it's turned on --> 
     28                        <gslib:berryBasket/> 
     29                        <xsl:text> </xsl:text> 
     30                    </xsl:if> 
     31 
     32                    <xsl:if test="$documentBasketOn"> 
     33                        <gslib:documentBasket/> 
     34                        <xsl:text> </xsl:text> 
     35                    </xsl:if> 
     36                </div> 
     37            </xsl:if> 
    3138     
    3239        <!-- 
  • main/trunk/greenstone3/web/interfaces/oran/transform/pages/pref.xsl

    r24441 r24510  
    178178                    <br class="clear"/> 
    179179                </div> 
     180                 
     181                <!-- document maker --> 
     182                <div id="documentmakerprefs"> 
     183                    <xsl:variable name="documentbasket"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='documentbasket']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='documentbasket']/@value"/></xsl:when><xsl:otherwise>off</xsl:otherwise></xsl:choose></xsl:variable> 
     184                    <div class="paramLabel">Document Maker</div> 
     185                    <div class="paramValue"> 
     186                        <select name="documentbasket"> 
     187                            <option value="on"><xsl:if test="$documentbasket='on'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.berrybasket.on')"/></option>  
     188                            <option value="off"><xsl:if test="$documentbasket='off'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.berrybasket.off')"/></option> 
     189                        </select> 
     190                    </div> 
     191                    <br class="clear"/> 
     192                </div> 
    180193 
    181194                <!-- tidy (?) --> 
  • main/trunk/greenstone3/web/interfaces/oran/transform/util.xsl

    r24149 r24510  
    2828   
    2929  <xsl:variable name="berryBasketOn" select="/page/pageRequest/paramList/param[@name='berrybasket' and @value='on']"/> 
     30  <xsl:variable name="documentBasketOn" select="/page/pageRequest/paramList/param[@name='documentbasket' and @value='on']"/> 
    3031   
    3132  <!-- template to get the name of the current collection --> 
     
    540541  </xsl:template> 
    541542   
     543  <!-- put the drag&drop document basket on the page --> 
     544  <xsl:template name="documentBasket"> 
     545    <xsl:if test="$documentBasketOn"> 
     546      <div id="documentbasket" class="hide"> 
     547        <span>Document Basket</span> 
     548        <span id="documentBasketExpandCollapseLinks" style="display: none;"> 
     549          <a id="documentBasketExpandLink" href="javascript:showDocumentBox()">Expand</a> 
     550          <a id="documentBasketCollapseLink" style="display: none;" href="javascript:hideDocumentBox()">Collapse</a> 
     551        </span> 
     552        <div id="documenthandle"> 
     553          <span> 
     554            <xsl:text> </xsl:text> 
     555          </span> 
     556        </div> 
     557        <div id="documentpages"> 
     558          <span> 
     559            <xsl:text> </xsl:text> 
     560          </span> 
     561        </div> 
     562      </div> 
     563    </xsl:if> 
     564  </xsl:template> 
     565   
    542566  <!-- include the required javascript and css for berry baskets --> 
    543567  <xsl:template name="berryBasketHeadTags"> 
     
    552576    <script type="text/javascript" src="interfaces/{$interface_name}/js/berrybasket/berrybasket.js"><xsl:text> </xsl:text></script> 
    553577    <link rel="stylesheet" href="interfaces/{$interface_name}/style/berry.css" type="text/css"/> 
     578     
     579    <!-- Combo-handled YUI CSS files: -->  
     580    <link rel="stylesheet" type="text/css" href="interfaces/{$interface_name}/style/skin.css"/> 
     581 
     582    <script type="text/javascript" src="interfaces/{$interface_name}/js/documentbasket/documentbasket.js"><xsl:text> </xsl:text></script> 
     583    <script type="text/javascript" src="interfaces/{$interface_name}/js/documentbasket/documentBasketDragDrop.js"><xsl:text> </xsl:text></script> 
     584    <!-- Combo-handled YUI JS files: -->  
     585    <script type="text/javascript" src="interfaces/{$interface_name}/js/documentbasket/yahoo-dom-event.js"><xsl:text> </xsl:text></script> 
     586    <script type="text/javascript" src="interfaces/{$interface_name}/js/documentbasket/container_core-min.js"><xsl:text> </xsl:text></script> 
     587    <script type="text/javascript" src="interfaces/{$interface_name}/js/documentbasket/element-min.js"><xsl:text> </xsl:text></script> 
     588    <script type="text/javascript" src="interfaces/{$interface_name}/js/documentbasket/menu-min.js"><xsl:text> </xsl:text></script> 
     589    <script type="text/javascript" src="interfaces/{$interface_name}/js/documentbasket/button-min.js"><xsl:text> </xsl:text></script> 
     590    <script type="text/javascript" src="interfaces/{$interface_name}/js/documentbasket/editor-min.js"><xsl:text> </xsl:text></script>  
     591    <script type="text/javascript" src="interfaces/{$interface_name}/js/documentbasket/yuiloader-min.js"><xsl:text> </xsl:text></script> 
     592    <!--<script type="text/javascript" src="interfaces/{$interface_name}/js/documentbasket/editor-dialog.js"><xsl:text> </xsl:text></script>--> 
     593     
     594    <link rel="stylesheet" href="interfaces/{$interface_name}/style/documentbasket.css" type="text/css"/> 
    554595  </xsl:template> 
    555596