Changeset 35823


Ignore:
Timestamp:
2021-12-17T13:48:24+13:00 (2 years ago)
Author:
cstephen
Message:

Upgrade from jQuery-UI 1.10.2 -> 1.13.0

Location:
main/trunk/greenstone3/web/interfaces/default_wip
Files:
32 added
8 deleted
15 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/greenstone3/web/interfaces/default_wip/interfaceConfig.xml

    r35821 r35823  
    4747    </actionList>
    4848    <optionList>
    49         <option name="cssTheme" value="interfaces/default/style/themes/main/jquery-ui-1.8.16.custom.css"/>
     49        <option name="cssTheme" value="interfaces/default_wip/style/themes/main/jquery-ui.theme.min.css"/>
    5050        <option name="highlightQueryTerms" value="true"/>
    5151        <!-- Set one or other of the following two options (berryBasket and favouriteBasket) to true -->
    … …  
    250250    </languageList>
    251251</interfaceConfig>
    252 

  • main/trunk/greenstone3/web/interfaces/default_wip/transform/javascript-global-setup.xsl

    r35821 r35823  
    159159   
    160160    <xsl:template name="include-global-javascript-functions">
    161         <script type="text/javascript" src="interfaces/default/js/javascript-global-functions.js"><xsl:text> </xsl:text></script>
    162         <script type="text/javascript" src="interfaces/default/js/GSMetadata.js"><xsl:text> </xsl:text></script>
     161        <script type="text/javascript" src="interfaces/{$interface_name}/js/javascript-global-functions.js"><xsl:text> </xsl:text></script>
     162        <script type="text/javascript" src="interfaces/{$interface_name}/js/GSMetadata.js"><xsl:text> </xsl:text></script>
    163163        <script type="text/javascript" src="interfaces/{$interface_name}/js/utility_scripts.js"><xsl:text> </xsl:text></script>
    164164

  • main/trunk/greenstone3/web/interfaces/default_wip/transform/layouts/header.xsl

    r35822 r35823  
    105105
    106106    <xsl:choose>
    107       <xsl:when test="/page/pageResponse/interfaceOptions/option[@name = 'cssTheme']/@value">
    108     <!-- Get the theme from the interfaceConfig.xml file -->
    109     <link rel="stylesheet" href="{/page/pageResponse/interfaceOptions/option[@name = 'cssTheme']/@value}" type="text/css"/>
    110       </xsl:when>
    111       <xsl:otherwise>
    112     <link rel="stylesheet" href="interfaces/{$interface_name}/style/themes/main/jquery-ui-1.8.16.custom.css" type="text/css"/>
    113       </xsl:otherwise>
     107        <xsl:when test="/page/pageResponse/interfaceOptions/option[@name = 'cssTheme']/@value"> -->
     108            <!-- Get the theme from the interfaceConfig.xml file -->
     109            <link rel="stylesheet" href="{/page/pageResponse/interfaceOptions/option[@name = 'cssTheme']/@value}" type="text/css"/>
     110        </xsl:when>
     111        <xsl:otherwise>
     112            <link rel="stylesheet" href="interfaces/{$interface_name}/style/themes/main/jquery-ui.theme.min.css" type="text/css"/>
     113        </xsl:otherwise>
    114114    </xsl:choose>
     115
     116    <link rel="stylesheet" href="interfaces/{$interface_name}/style/themes/main/jquery-ui.structure.min.css" type="text/css"/>
    115117    <link rel="stylesheet" href="interfaces/{$interface_name}/style/core.css" type="text/css"/>
    116118    <xsl:call-template name="favicon"/>
    117119   
    118120    <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery-3.6.0.min.js"><xsl:text> </xsl:text></script>
    119     <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery-ui-1.10.2.custom/js/jquery-ui-1.10.2.custom.min.js"><xsl:text> </xsl:text></script>
     121    <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery-ui-1.13.0.custom/jquery-ui.min.js"><xsl:text> </xsl:text></script>
    120122    <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery.blockUI.js"><xsl:text> </xsl:text></script>
    121123    <script type="text/javascript" src="interfaces/{$interface_name}/js/ace/ace.js"><xsl:text> </xsl:text></script>
    … …  
    638640    <script type="text/javascript">
    639641      <xsl:text disable-output-escaping="yes">
    640     $("#preferencesButton").button({icons:{primary:"ui-icon-wrench"}});
     642    $("#preferencesButton").button({icon: "ui-icon-wrench"});
    641643    $("#preferencesButton .ui-button-text").css({"padding-top":"0px", "padding-bottom":"3px"});
    642     $("#helpButton").button({icons:{primary:"ui-icon-help"}});
     644    $("#helpButton").button({icon: "ui-icon-help"});
    643645    $("#helpButton .ui-button-text").css({"padding-top":"0px", "padding-bottom":"3px"});
    644     $("#debugButton").button({icons:{primary:"ui-icon-info"}});
     646    $("#debugButton").button({icon: "ui-icon-info"});
    645647    $("#debugButton .ui-button-text").css({"padding-top":"0px", "padding-bottom":"3px"});
    646648      </xsl:text>
    647649      <xsl:choose>
    648650    <xsl:when test="/page/pageRequest/userInformation/@username">
    649       <xsl:text disable-output-escaping="yes">$("#loginButton").button({icons:{primary:"ui-icon-unlocked"}});</xsl:text>
     651      <xsl:text disable-output-escaping="yes">$("#loginButton").button({icon: "ui-icon-unlocked"});</xsl:text>
    650652    </xsl:when>
    651653    <xsl:otherwise>
    652       <xsl:text disable-output-escaping="yes">$("#loginButton").button({icons:{primary:"ui-icon-locked"}});</xsl:text>
     654      <xsl:text disable-output-escaping="yes">$("#loginButton").button({icon: "ui-icon-locked"});</xsl:text>
    653655    </xsl:otherwise>
    654656      </xsl:choose>
Note: See TracChangeset for help on using the changeset viewer.