Changeset 33285 for main/trunk/greenstone3/web
- Timestamp:
- 2019-07-02T14:43:46+12:00 (5 years ago)
- Location:
- main/trunk/greenstone3/web/interfaces/default/transform
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/web/interfaces/default/transform/gslib.xsl
r33261 r33285 57 57 <xsl:value-of select="/page/pageRequest/paramList/param[@name='berrybasket']/@value"/> 58 58 </xsl:variable> 59 <xsl:variable name="favourite sbasketswitch">60 <xsl:value-of select="/page/pageRequest/paramList/param[@name='favourite sbasket']/@value"/>59 <xsl:variable name="favouritebasketswitch"> 60 <xsl:value-of select="/page/pageRequest/paramList/param[@name='favouritebasket']/@value"/> 61 61 </xsl:variable> 62 62 63 63 <xsl:variable name="berryBasketOn" select="/page/pageRequest/paramList/param[@name='berrybasket' and @value='on']"/> 64 <xsl:variable name="favourite sBasketOn" select="/page/pageRequest/paramList/param[@name='favouritesbasket' and @value='on']"/>64 <xsl:variable name="favouriteBasketOn" select="/page/pageRequest/paramList/param[@name='favouritebasket' and @value='on']"/> 65 65 <xsl:variable name="documentBasketOn" select="/page/pageRequest/paramList/param[@name='documentbasket' and @value='on']"/> 66 66 … … 763 763 --> 764 764 <xsl:template name="gotoFavourites"> 765 <xsl:if test="$favourite sBasketOn">765 <xsl:if test="$favouriteBasketOn"> 766 766 <div id="berrybasket" class="hide"> 767 767 <img src="interfaces/{$interface_name}/images/{$selected_favourite_icon}" title="click to add to favourites" width="16" height="16" border="0" /> … … 873 873 <gsf:variable name="unselected_favourite_icon_url">interfaces/<xsl:value-of select="$interface_name"/>/images/<xsl:value-of select="$unselected_favourite_icon"/></gsf:variable> 874 874 875 <xsl:if test="$favourite sBasketOn">875 <xsl:if test="$favouriteBasketOn"> 876 876 <img src="interfaces/{$interface_name}/images/{$unselected_favourite_icon}" title="click to add to favourites" width="20" height="20" border="0" onclick="toggleFavourite(this)" data-is-favourite="false"> 877 877 <xsl:attribute name="id"><xsl:value-of select="/page/pageResponse/collection/@name"/>:<xsl:value-of select="@nodeID"/></xsl:attribute> … … 910 910 <xsl:value-of select="/page/pageResponse/document/documentNode[@nodeType='root']/@nodeID"/> 911 911 </xsl:variable> 912 <xsl:if test="$favourite sBasketOn">912 <xsl:if test="$favouriteBasketOn"> 913 913 <div id="documentberries"> 914 914 <img id="{/page/pageResponse/collection/@name}:{$rootNode}" src="interfaces/{$interface_name}/images/{$unselected_favourite_icon}" alt="in basket" width="15" height="15" border="0"/> -
main/trunk/greenstone3/web/interfaces/default/transform/layouts/toc.xsl
r33261 r33285 78 78 <!-- showing gotoFavourites display-area takes priority over berryBaskets --> 79 79 <xsl:choose> 80 <xsl:when test="/page/pageResponse/interfaceOptions/option[@name = 'favourite sBaskets']/@value = 'true'">80 <xsl:when test="/page/pageResponse/interfaceOptions/option[@name = 'favouriteBasket']/@value = 'true'"> 81 81 <!-- show the goto favourites if it's turned on --> 82 82 <xsl:call-template name="gotoFavourites"/> -
main/trunk/greenstone3/web/interfaces/default/transform/pages/berry.xsl
r33261 r33285 63 63 <!-- showing favourites help text takes priority over berryBasket help text --> 64 64 <xsl:choose> 65 <xsl:when test="/page/pageResponse/interfaceOptions/option[@name = 'favourite sBaskets']/@value = 'true'">65 <xsl:when test="/page/pageResponse/interfaceOptions/option[@name = 'favouriteBasket']/@value = 'true'"> 66 66 <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.delete_help')"/> <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'favourites.delete_else')"/><xsl:text> </xsl:text> 67 67 </xsl:when> -
main/trunk/greenstone3/web/interfaces/default/transform/pages/classifier.xsl
r33261 r33285 30 30 <script type="text/javascript">$(window).load(openStoredClassifiers);</script> 31 31 <!-- this right sidebar --> 32 <xsl:if test="$berryBasketOn or $favourite sBasketOn or ($documentBasketOn and (util:contains(/page/pageRequest/userInformation/@groups, 'administrator') or util:contains(/page/pageRequest/userInformation/@groups, 'all-collections-editor') or util:contains(/page/pageRequest/userInformation/@groups, $thisCollectionEditor)))">32 <xsl:if test="$berryBasketOn or $favouriteBasketOn or ($documentBasketOn and (util:contains(/page/pageRequest/userInformation/@groups, 'administrator') or util:contains(/page/pageRequest/userInformation/@groups, 'all-collections-editor') or util:contains(/page/pageRequest/userInformation/@groups, $thisCollectionEditor)))"> 33 33 <div id="rightSidebar"> 34 34 <xsl:if test="$berryBasketOn"> … … 38 38 </xsl:if> 39 39 40 <xsl:if test="$favourite sBasketOn">40 <xsl:if test="$favouriteBasketOn"> 41 41 <!-- show the favourites 'basket' if it's turned on --> 42 42 <gslib:gotoFavourites/> … … 268 268 <!-- The berry/favourite (optional) --> 269 269 <td valign="top"> 270 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'berryBasket s']/@value = 'true'">270 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'berryBasket']/@value = 'true'"> 271 271 <xsl:call-template name="documentBerryForClassifierOrSearchPage"/> 272 272 </xsl:if> 273 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'favourite sBaskets']/@value = 'true'">273 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'favouriteBasket']/@value = 'true'"> 274 274 <xsl:call-template name="documentFavouriteForClassifierOrSearchPage"/> 275 275 </xsl:if> -
main/trunk/greenstone3/web/interfaces/default/transform/pages/help.xsl
r33280 r33285 57 57 </xsl:if> 58 58 <xsl:call-template name="documentHelp"/> 59 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name='favourite sBaskets']/@value='true'">60 <xsl:call-template name="favourite sHelp"/>59 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name='favouriteBasket']/@value='true'"> 60 <xsl:call-template name="favouriteBasketHelp"/> 61 61 </xsl:if> 62 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name='berryBasket s']/@value='true'">63 <xsl:call-template name="berry basketsHelp"/>62 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name='berryBasket']/@value='true'"> 63 <xsl:call-template name="berryBasketHelp"/> 64 64 </xsl:if> 65 65 <xsl:if test="//format/gsf:option[@name='RSS']/@value= 'true'"> … … 138 138 TODO: put some stuff here about icons found on doc pages. toc/paged docs. highlighter, image zoomer, 139 139 </xsl:template> 140 <xsl:template name="favourite sHelp">140 <xsl:template name="favouriteBasketHelp"> 141 141 <xsl:variable name="fav_icon"><img src="interfaces/{$interface_name}/images/favourite-star-transparent-unselected32.png" width="16" height="16" alt="favourites unselected"/></xsl:variable> 142 142 <xsl:variable name="fav_icon_selected"><img src="interfaces/{$interface_name}/images/favourite-star-transparent-selected32.png" width="16" height="16" alt="favourites selected"/></xsl:variable> … … 145 145 </xsl:template> 146 146 147 <xsl:template name="berry basketsHelp">147 <xsl:template name="berryBasketHelp"> 148 148 <xsl:variable name="berry_icon"><img src="interfaces/{$interface_name}/images/berry.png" alt="berry icon" width="16" height="16"/></xsl:variable> 149 149 <h3><xsl:value-of disable-output-escaping="yes" select="util:getInterfaceText($help_interface_name, /page/@lang, 'help.berrybasket_title')"/></h3><br/> -
main/trunk/greenstone3/web/interfaces/default/transform/pages/pref.xsl
r33261 r33285 50 50 <!-- <xsl:call-template name="encoding-param"/>--> 51 51 <xsl:call-template name="format-edit-param"/> 52 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'berryBasket s']/@value = 'true'">52 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'berryBasket']/@value = 'true'"> 53 53 <xsl:call-template name="berry-basket-param"/> 54 54 </xsl:if> 55 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'favourite sBaskets']/@value = 'true'">56 <xsl:call-template name="favourite s-basket-param"/>55 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'favouriteBasket']/@value = 'true'"> 56 <xsl:call-template name="favourite-basket-param"/> 57 57 </xsl:if> 58 58 <!--<xsl:call-template name="document-maker-param"/> not working at moment--> … … 173 173 174 174 175 <xsl:template name="favourite s-basket-param">176 <div id="favourite sbasketprefs">177 <xsl:variable name="favourite sbasket"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='favouritesbasket']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='favouritesbasket']/@value"/></xsl:when><xsl:otherwise>off</xsl:otherwise></xsl:choose></xsl:variable>175 <xsl:template name="favourite-basket-param"> 176 <div id="favouritebasketprefs"> 177 <xsl:variable name="favouritebasket"><xsl:choose><xsl:when test="/page/pageRequest/paramList/param[@name='favouritebasket']"><xsl:value-of select="/page/pageRequest/paramList/param[@name='favouritebasket']/@value"/></xsl:when><xsl:otherwise>off</xsl:otherwise></xsl:choose></xsl:variable> 178 178 <div class="paramLabel"> 179 <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.favourite sbasket')"/>180 </div> 181 <div class="paramValue"> 182 <select name="favourite sbasket">183 <option value="on"><xsl:if test="$favourite sbasket='on'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.on')"/></option>184 <option value="off"><xsl:if test="$favourite sbasket='off'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.off')"/></option>179 <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.favouritebasket')"/> 180 </div> 181 <div class="paramValue"> 182 <select name="favouritebasket"> 183 <option value="on"><xsl:if test="$favouritebasket='on'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.on')"/></option> 184 <option value="off"><xsl:if test="$favouritebasket='off'"><xsl:attribute name="selected"></xsl:attribute></xsl:if><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'pref.off')"/></option> 185 185 </select> 186 186 </div> -
main/trunk/greenstone3/web/interfaces/default/transform/pages/query.xsl
r33261 r33285 59 59 60 60 <xsl:template name="displayBaskets"> 61 <xsl:if test="$berryBasketOn or $favourite sBasketOn or ($documentBasketOn and (util:contains(/page/pageRequest/userInformation/@groups, 'administrator') or util:contains(/page/pageRequest/userInformation/@groups, 'all-collections-editor') or util:contains(/page/pageRequest/userInformation/@groups, $thisCollectionEditor)))">61 <xsl:if test="$berryBasketOn or $favouriteBasketOn or ($documentBasketOn and (util:contains(/page/pageRequest/userInformation/@groups, 'administrator') or util:contains(/page/pageRequest/userInformation/@groups, 'all-collections-editor') or util:contains(/page/pageRequest/userInformation/@groups, $thisCollectionEditor)))"> 62 62 <div id="rightSidebar"> 63 63 <xsl:if test="$berryBasketOn"> … … 67 67 </xsl:if> 68 68 69 <xsl:if test="$favourite sBasketOn">69 <xsl:if test="$favouriteBasketOn"> 70 70 <!-- show the favourites 'basket' if it's turned on --> 71 71 <gslib:gotoFavourites/> … … 95 95 <!-- The berry/favourite (optional) --> 96 96 <td valign="top"> 97 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'berryBasket s']/@value = 'true'">97 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'berryBasket']/@value = 'true'"> 98 98 <xsl:call-template name="documentBerryForClassifierOrSearchPage"/> 99 99 </xsl:if> 100 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'favourite sBaskets']/@value = 'true'">100 <xsl:if test="/page/pageResponse/interfaceOptions/option[@name = 'favouriteBasket']/@value = 'true'"> 101 101 <xsl:call-template name="documentFavouriteForClassifierOrSearchPage"/> 102 102 </xsl:if>
Note:
See TracChangeset
for help on using the changeset viewer.