Changeset 35822

Timestamp:

2021-12-17T10:16:06+13:00 (2 years ago)

Author:

cstephen

Message:

Migrate from jQuery 1.10.2 -> jQuery 3.6.0

Location:

main/trunk/greenstone3/web/interfaces/default_wip

Files:

• js/classifier_scripts.js (modified) (2 diffs)
• js/debug_scripts.js (modified) (17 diffs)
• js/document_scripts.js (modified) (18 diffs)
• js/documentbasket/featuredimagezoomer.js (modified) (3 diffs)
• js/documentedit_scripts.js (modified) (6 diffs)
• js/documentedit_scripts_util.js (modified) (4 diffs)
• js/format_document.js (modified) (2 diffs)
• js/format_jquery_prototypes.js (modified) (1 diff)
• js/format_util.js (modified) (4 diffs)
• js/gui_div.js (modified) (7 diffs)
• js/hierarchy.js (modified) (3 diffs)
• js/javascript-global-functions.js (modified) (2 diffs)
• js/jquery-1.10.2.min.map (deleted)
• js/jquery-1.4.2.js (deleted)
• js/jquery-3.6.0.min.js (added)
• js/jquery-3.6.0.min.map (added)
• js/jquery-ui-1.10.2.custom/index.html (modified) (1 diff)
• js/jquery-ui-1.10.2.custom/js/jquery-ui-1.10.2.custom.js (modified) (3 diffs)
• js/jquery-ui.min.js (deleted)
• js/jquery.blockUI.js (modified) (5 diffs)
• js/jquery.blockUI.js_2.50 (deleted)
• js/jquery.js (deleted)
• js/jquery.min.js (deleted)
• js/jquery.selectboxes.js (modified) (1 diff)
• js/map-scripts.js (modified) (5 diffs)
• js/ui.nestedSortable.js (modified) (1 diff)
• js/visual-xml-editor.js (modified) (11 diffs)
• transform/depositor/de_page1.xsl (modified) (3 diffs)
• transform/depositor/de_page4.xsl (modified) (3 diffs)
• transform/depositor/depositor.xsl (modified) (3 diffs)
• transform/expand-gsf.xsl (modified) (2 diffs)
• transform/layouts/header.xsl (modified) (5 diffs)
• transform/layouts/toc.xsl (modified) (1 diff)
• transform/pages/authen.xsl (modified) (2 diffs)
• transform/pages/classifier.xsl (modified) (1 diff)
• transform/pages/document.xsl (modified) (3 diffs)
• transform/pages/pref.xsl (modified) (1 diff)
• transform/pages/verify.xsl (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default_wip/js/classifier_scripts.js

@@ -144 +144 @@
         
         $.ajax(url)
-        .success(function(data)
+        .done(function(data)
         {
             var newDiv = $("<div>");                                        
@@ -171 +171 @@
             }
         })
-        .error(function()
+        .fail(function()
         {
             sectionToggle.attr("src", gs.imageURLs.expand);
         })
-        .complete(function()
+        .always(function()
         {
             inProgress[sectionID] = false;

main/trunk/greenstone3/web/interfaces/default_wip/js/debug_scripts.js

@@ -131 +131 @@
     {
         $.ajax(document.URL)
-        .success(function(response)
+        .done(function(response)
         {
             //Get the body text from the response
@@ -156 +156 @@
             addMouseEventsToDebugElements(debugElems);
         })
-        .error(function()
+        .fail(function()
         {
             alert("There was an error reloading the page, please reload manually.");
@@ -224 +224 @@
         
         _backButton = $("<button>Back button</button>").attr("id", "veBack");
-        _backButton.click(backForwardFunction);
+        _backButton.on("click", backForwardFunction);
         _styleFunctions.push(function(){_backButton.button({icons:{primary:"ui-icon-triangle-1-w"}, text:false, disabled:true})});
     
         _forwardButton = $("<button>Forward button</button>").attr("id", "veForwards");
-        _forwardButton.click(backForwardFunction);
+        _forwardButton.on("click", backForwardFunction);
         _styleFunctions.push(function(){_forwardButton.button({icons:{primary:"ui-icon-triangle-1-e"}, text:false, disabled:true})});
 
         //Changes the template list to what is currently selected
         _currentSelectionButton = $("<button>Current selection button</button>");
-        _currentSelectionButton.click(function()
+        _currentSelectionButton.on("click", function()
         {
             _fileSelector.find("option").eq(0).prop("selected", true);
@@ -259 +259 @@
         //Used to enable the selector to get the templates of a particular area of the page
         _enableSelectorButton = $("<button>Select an element</button>");
-        _enableSelectorButton.click(function()
+        _enableSelectorButton.on("click", function()
         {
             _enableSelectorButton.button("option", "label", "Select new element");
-            $("a").click(function(e)
+            $("a").on("click", function(e)
             {
                 e.preventDefault();
@@ -274 +274 @@
         //Used to minimise/restore the editor
         _closeEditorButton = $("<button>Close editor</button>");
-        _closeEditorButton.click(function()
+        _closeEditorButton.on("click", function()
         {
             if(_closeEditorButton.button("option", "label") == "Close editor")
@@ -292 +292 @@
         //Used to save any changes that have been made to this template
         _saveButton = $("<button>Save changes</button>");
-        _saveButton.click(function()
+        _saveButton.on("click", function()
         {
             if(_editor)
@@ -329 +329 @@
 
                 $.post(url, parameters)
-                .success(function()
+                .done(function()
                 {
                     $.ajax(gs.xsltParams.library_name + "?a=s&sa=c")
-                    .success(function()
+                    .done(function()
                     {
                         partialPageReload(function(){$.unblockUI();});
                     })
-                    .error(function()
+                    .fail(function()
                     {
                         $.unblockUI();
                         alert("Error reloading collection.");
                     })
-                    .complete(function()
+                    .always(function()
                     {
                         _saveButton.button("option", "disabled", false);
                     });
                 })
-                .error(function()
+                .fail(function()
                 {
                     alert("There was an error sending the request to the server, please try again.");
@@ -356 +356 @@
         //Used to switch between the XML and Visual editors
         _swapEditorButton = $("<button>Switch to XML editor</button>");
-        _swapEditorButton.button().click(function()
+        _swapEditorButton.button().on("click", function()
         {
             if(_vEditor && _textEditor)
@@ -402 +402 @@
 
         undoButton = $("<button>Undo</button>");
-        undoButton.click(function()
+        undoButton.on("click", function()
         {
             if(_isVisualEditor)
@@ -497 +497 @@
         var url = gs.xsltParams.library_name + "?a=g&rt=r&s=GetXSLTFilesForCollection&s1.interfaceName=" + gs.xsltParams.interface_name + "&s1.siteName=" + gs.xsltParams.site_name + "&s1.collectionName=" + gs.cgiParams.c;
         $.ajax(url)
-        .success(function(response)
+        .done(function(response)
         {
             var listStartIndex = response.indexOf("<fileListJSON>") + "<fileListJSON>".length;
@@ -532 +532 @@
             });
         })
-        .error(function()
+        .fail(function()
         {
             console.log("Error retrieving XSLT files");
@@ -608 +608 @@
         var getURL = gs.xsltParams.library_name + "?a=g&rt=r&s=GetTemplateListFromFile&s1.fileName=" + filename + "&s1.locationName=" + location + "&s1.interfaceName=" + gs.xsltParams.interface_name + "&s1.siteName=" + gs.xsltParams.site_name + "&s1.collectionName=" + gs.cgiParams.c;
         $.ajax(getURL)
-        .success(function(templateResponse)
+        .done(function(templateResponse)
         {
             var templateListStart = templateResponse.indexOf("<templateList>") + "<templateList>".length;
@@ -691 +691 @@
 
         $.post(url, params)
-        .success(function(response)
+        .done(function(response)
         {
             var template;
@@ -754 +754 @@
             }
         })
-        .error(function()
+        .fail(function()
         {
             console.log("Error getting the XML template from the file");
@@ -809 +809 @@
     var addMouseEventsToDebugElements = function(debugElems)
     {
-        debugElems.click(function(e)
+        debugElems.on("click", function(e)
         {
             if(_debugOn)
@@ -935 +935 @@
             var enableGBButtonHolder = $("<div>", {"title":"Enable Greenbug", "id":"gbEnableButton", "class":"ui-state-default ui-corner-all"});
             enableGBButtonHolder.append($("<img>", {"src":gs.imageURLs.greenBug}));
-            enableGBButtonHolder.click(function()
+            enableGBButtonHolder.on("click", function()
             {
                 var url = document.URL;
@@ -968 +968 @@
 
 //The code entry point
-$(window).load(function()
+$(window).on("load", function()
 {
     var debugWidget = new DebugWidget();

main/trunk/greenstone3/web/interfaces/default_wip/js/document_scripts.js

@@ -73 +73 @@
     
     $.ajax(url)
-    .success(function(response)
+    .done(function(response)
     {
         if(response)
@@ -93 +93 @@
         }
     })
-    .error(function()
+    .fail(function()
     {
         callback(null);
@@ -128 +128 @@
     
     $.ajax(url)
-    .success(function(response)
+    .done(function(response)
     {
         if(response)
@@ -150 +150 @@
         }
     })
-    .error(function()
+    .fail(function()
     {
         callback(null);
@@ -462 +462 @@
 
     $.ajax(url)
-    .success(function(response)
+    .done(function(response)
     {
         if(response)
@@ -479 +479 @@
         }
     })
-    .error(function()
+    .fail(function()
     {
         setTimeout(function(){loadTopLevelPage(callbackFunction, customURL);}, 1000);
@@ -538 +538 @@
     else {  
     $.ajax(url)
-        .success(retrieveFullTableOfContentsSuccess)
-        .error(function() {
+        .done(retrieveFullTableOfContentsSuccess)
+        .fail(function() {
         setTimeout(retrieveFullTableOfContents, 1000);
         });
@@ -618 +618 @@
     $("#extractDocButton").attr("disabled", "disabled").html("Extracting document...");
     $.ajax(url)
-    .success(function(response)
+    .done(function(response)
     {
         $("#extractDocButton").html("Building collection...");
         gs.functions.buildCollections([gs.cgiParams.c], function()
         {
-            $("#extractDocButton").removeAttr("disabled").html("Extract these pages to document");
+            $("#extractDocButton").prop("disabled", false).html("Extract these pages to document");
         });
     })
-    .error(function()
-    {
-        $("#extractDocButton").removeAttr("disabled").html("Extract these pages to document");
+    .fail(function()
+    {
+        $("#extractDocButton").prop("disabled", false).html("Extract these pages to document");
     });
 }
@@ -705 +705 @@
 
     $.ajax(url)
-    .success(function(response)
+    .done(function(response)
     {
         var tableOfContents = $("#tableOfContents");
@@ -714 +714 @@
         loading.remove();
     })
-    .error(function()
+    .fail(function()
     {
         setTimeout(function(){retrieveTableOfContentsAndTitles();}, 1000);
@@ -769 +769 @@
         {
             currentImage.attr("onclick", "");
-            currentImage.click(function()
+            currentImage.on("click", function()
             {
                 var sliderDiv = currentImage.parents("table").first().next();
@@ -972 +972 @@
 
         $.ajax(url)
-        .success(function(text)
+        .done(function(text)
              {
             var hrefStart = text.indexOf("src=\"") + 5;
@@ -986 +986 @@
 
             var image = $("<img>");
-            image.load(function()
+            image.on("load", function()
             {
                 $(page.link).html("");
@@ -993 +993 @@
                 page.imageLoaded = true;
             });
-            image.error(function()
+            image.on("error", function()
             {
                 if(!attemptNumber || attemptNumber < 3)
@@ -1012 +1012 @@
             var title = text.substring(titleStart, titleEnd);
         })
-        .error(function()
+        .fail(function()
         {
             page.failed = true;
@@ -1307 +1307 @@
     {
         url:url,
-        success: function(data)
+        done: function(data)
         {
             var startIndex = data.indexOf(">", data.indexOf(">") + 1) + 1;
@@ -1422 +1422 @@
     var setLink = function(currentLink, index)
     {
-        $(currentLink).click(function()
+        $(currentLink).on("click", function()
         {
             _inTransition = true;
@@ -1465 +1465 @@
     }
 
-    _nextButton.click(this.nextImage);
-    _prevButton.click(this.prevImage);
-}
+    _nextButton.on("click", this.nextImage);
+    _prevButton.on("click", this.prevImage);
+}

main/trunk/greenstone3/web/interfaces/default_wip/js/documentbasket/featuredimagezoomer.js

@@ -176 +176 @@
             var imgcoords=getcoords()
             $statusdiv.css({left:imgcoords.left+w/2-$statusdiv.width()/2, top:imgcoords.top+h/2-$statusdiv.height()/2, visibility:'visible'})
-            $bigimage.bind('loadevt', function(){ //magnified image ONLOAD event function (to be triggered later)
+            $bigimage.on('loadevt', function(){ //magnified image ONLOAD event function (to be triggered later)
                 $img.css({opacity:1}) //restore thumb image opacity
                 $statusdiv.empty().css({border:'1px solid black', background:'#C0C0C0', padding:'4px', font:'bold 13px Arial', opacity:0.8}).hide().removeClass('preloadevt');
@@ -203 +203 @@
                 }).css({cursor: fiz.magnifycursor});
                 if (setting.zoomrange && setting.zoomrange[1]>setting.zoomrange[0]){ //if zoom range enabled
-                    $tracker.bind('DOMMouseScroll mousewheel', function(e){
+                    $tracker.on('DOMMouseScroll mousewheel', function(e){
                         fiz.magnifyimage($tracker, e, setting.zoomrange);
                         e.preventDefault();
@@ -213 +213 @@
             }
             else{
-                $bigimage.bind('load', function(){$bigimage.trigger('loadevt')})
+                $bigimage.on('load', function(){$bigimage.trigger('loadevt')})
             }
         })

main/trunk/greenstone3/web/interfaces/default_wip/js/documentedit_scripts.js

@@ -80 +80 @@
             "href": "javascript:;"
         });
-    newLink.click(function () {
+    newLink.on("click", function () {
         if (metaTable.css("display") == "none") {
             linkLabel.html(gs.text.de.hide_metadata);
@@ -203 +203 @@
             "href": "javascript:;"
         });
-    newLink.click(function () {
+    newLink.on("click", function () {
         //console.log(" Show/Hide Map Editor ");
         var clicked_mapEditor = gsmap_store["map-" + id];
@@ -326 +326 @@
                     "class": "ui-state-default ui-corner-all"
                 });
-            saveButton.click(save);
+            saveButton.on("click", save);
             saveButton.html(gs.text.de.save);
             editBar.append(saveButton);
@@ -334 +334 @@
                     "class": "ui-state-default ui-corner-all"
                 });
-            rebuildButton.click(rebuildCurrentCollection);
+            rebuildButton.on("click", rebuildCurrentCollection);
             rebuildButton.html(gs.text.de.rebuild);
             editBar.append(rebuildButton);
@@ -342 +342 @@
                     "class": "ui-state-default ui-corner-all"
                 });
-            saveAndRebuildButton.click(saveAndRebuild);
+            saveAndRebuildButton.on("click", saveAndRebuild);
             saveAndRebuildButton.html(gs.text.de.saverebuild);
             editBar.append(saveAndRebuildButton);
@@ -409 +409 @@
 function enableSaveButtons(enabled) {
     if (enabled) {
-        $("#saveButton, #rebuildButton, #saveAndRebuildButton").removeAttr("disabled");
+        $("#saveButton, #rebuildButton, #saveAndRebuildButton").prop("disabled", false);
     } else {
-        $("#saveButton, #rebuildButton, #saveAndRebuildButton").attr("disabled", "disabled");
+        $("#saveButton, #rebuildButton, #saveAndRebuildButton").prop("disabled", true);
     }
 }

main/trunk/greenstone3/web/interfaces/default_wip/js/documentedit_scripts_util.js

@@ -194 +194 @@
   if (enabled) {
     $("#saveButton, #quickSaveButton").html(gs.text.de.save_changes);
-    $("#saveButton, #quickSaveButton").removeAttr("disabled");
+    $("#saveButton, #quickSaveButton").prop("disabled", false);
 
   } else {
     $("#saveButton, #quickSaveButton").html(gs.text.de.saving + "...");
-    $("#saveButton, #quickSaveButton").attr("disabled", "disabled");
+    $("#saveButton, #quickSaveButton").prop("disabled", true);
    
   }
@@ -1087 +1087 @@
 
     addRowButton.html(gs.text.de.add_new_metadata);
-    addRowButton.click(function() 
+    addRowButton.on("click", function() 
     { 
             var name = metaNameField.val();
@@ -1106 +1106 @@
     var addAllButton = $("<button>",{"class": "ui-state-default ui-corner-all", "style": "margin: 5px;"});
     addAllButton.html(gs.text.de.add_all_metadata);
-    addAllButton.click(function()
+    addAllButton.on("click", function()
                {
                    for(var i=0; i<availableMetadataElements.length; i++) {
@@ -1165 +1165 @@
     var newCell = $("<td>");
     var removeLink = $("<a>"+gs.text.de.remove+"</a>", {"href": "javascript:;"});
-    removeLink.click(function()
+    removeLink.on("click", function()
     {
         var undo = new Array();

main/trunk/greenstone3/web/interfaces/default_wip/js/format_document.js

@@ -4 +4 @@
 $(document).ready(function(){
 
-        $('.sectionHeader').click(function () {
+        $('.sectionHeader').on("click", function () {
             console.log('section Header click *');
             getXSLT("sectionHeader");
@@ -10 +10 @@
             });
 
-        $('.sectionContainer').click(function () {
+        $('.sectionContainer').on("click", function () {
             console.log('section Container click *');
             getXSLT("sectionContainer");

main/trunk/greenstone3/web/interfaces/default_wip/js/format_jquery_prototypes.js

@@ -28 +28 @@
         type: "GET",
         url: "?a=g&s=CoverageMetadataRetrieve&o=xml&rt=r&c=" + host_info.collection_name,
-        success: function(data) 
+        done: function(data) 
         {
             var str = "<select name=\"meta_select\" onChange=\"onSelectChange(this)\">";

main/trunk/greenstone3/web/interfaces/default_wip/js/format_util.js

@@ -400 +400 @@
     console.log('function bind_tables()');
 
-    $('#sectionHeader').click(function () {
+    $('#sectionHeader').on("click", function () {
          console.log('section Header click *');
          return true;
     });
     
-    $('#sectionContainer').click(function () {
+    $('#sectionContainer').on("click", function () {
          console.log('section Container click *');
          return true;
@@ -524 +524 @@
     });
 
-    $('.gsf_template').click(function () {
+    $('.gsf_template').on("click", function () {
          console.log('gsf_template class click');
          return false;
@@ -563 +563 @@
     });
 
-    $('.td-div').click(function () {    
+    $('.td-div').on("click", function () {    
          //console.log('td class click');
          return true;
@@ -715 +715 @@
 {
     console.log('function bind_minmax_remove()');
-    $('a.minmax').bind('click', toggleContent);
-    $('a.remove').bind('click', removeContent);
+    $('a.minmax').on('click', toggleContent);
+    $('a.remove').on('click', removeContent);
 };
 

main/trunk/greenstone3/web/interfaces/default_wip/js/gui_div.js

@@ -371 +371 @@
     /* DOCUMENT SPECIFIC FUNCTIONS */
 
-    $('.sectionHeader').click(function () {
+    $('.sectionHeader').on("click", function () {
         console.log('section Header click *');
         getXSLT("sectionHeader");
@@ -377 +377 @@
     });
 
-    $('.sectionContainer').click(function () {
+    $('.sectionContainer').on("click", function () {
         console.log('section Container click *');
         getXSLT("sectionContainer");
@@ -405 +405 @@
         type: "GET",
         url: "?a=g&s=CoverageMetadataRetrieve&o=xml&rt=r&c=" + collection,
-        success: function(data) 
+        done: function(data) 
         {
             var str = "<select name=\"meta_select\" onChange=\"onSelectChange(this)\">";
@@ -951 +951 @@
     console.log('function bind_tables()');
 
-    $('#sectionHeader').click(function () {
+    $('#sectionHeader').on("click", function () {
          console.log('section Header click *');
          return true;
     });
     
-    $('#sectionContainer').click(function () {
+    $('#sectionContainer').on("click", function () {
          console.log('section Container click *');
          return true;
@@ -1070 +1070 @@
     });
 
-    $('.gsf_template').click(function () {
+    $('.gsf_template').on("click", function () {
          console.log('gsf_template class click');
          return false;
@@ -1107 +1107 @@
     });
 
-    $('.td-div').click(function () {    
+    $('.td-div').on("click", function () {    
          //console.log('td class click');
          return true;
@@ -1255 +1255 @@
 {
     console.log('function bind_minmax_remove()');
-    $('a.minmax').bind('click', toggleContent);
-    $('a.remove').bind('click', removeContent);
+    $('a.minmax').on('click', toggleContent);
+    $('a.remove').on('click', removeContent);
 };
 

main/trunk/greenstone3/web/interfaces/default_wip/js/hierarchy.js

@@ -75 +75 @@
                  }
                  else {
-                 //wrap elements in hierarchy level
-                        var levelMenu = '<ul>';
-                        for(var key in levelItems)
+                    //wrap elements in hierarchy level
+                    var levelMenu = '<ul>';
+                    for(var key in levelItems)
+                    {
+                        //Fill menu with items
+                        levelMenu += levelItems[key];
+                    }
+                    levelMenu += "</ul>";
+                    menuItem.append(levelMenu);
+                    menuItem.find("li")
+                        .on("mouseenter", function()
                         {
-                            //Fill menu with items
-                            levelMenu += levelItems[key];
-                        }
-                        levelMenu += "</ul>";
-                        menuItem.append(levelMenu);
-                        menuItem.find("li").hover(
-                            function(){openHierarchyMenuLevel(this);}
-                            ,
-                            function(){closeHierarchyMenuLevel(this);}
-                        );
-                        
-                        //menuItem.find('ul');
-                        menuItem.children('ul').slideDown();
-                 }
-                 
+                            openHierarchyMenuLevel(this);
+                        })
+                        .on("mouseleave", function()
+                        {
+                            closeHierarchyMenuLevel(this);
+                        });
+                    
+                    //menuItem.find('ul');
+                    menuItem.children('ul').slideDown();
+                }
             } else {
                 //stop animation
@@ -144 +147 @@
 function setHierarchyHoverEvent(father,className)
 {
-     
-    $(father).find(className).hover(function() 
-    {
-        openHierarchyMenuLevel(this);
-    }, function() {
-        closeHierarchyMenuLevel(this);
-    });
+    $(father).find(className)
+        .on("mouseenter", function()
+        {
+            openHierarchyMenuLevel(this);
+        })
+        .on("mouseleave", function()
+        {
+            closeHierarchyMenuLevel(this);
+        });
     
 }
@@ -183 +188 @@
         $(row).each(function(){setHierarchyHoverEvent($(this),".metaDataHierarchyMenu ul li")});
         //Set menu name or SuggestionsMenu on change of textarea set menu name to appropriate menu item if exists
-        $(row).find('.metaTableCellArea').bind('input propertychange',function()
+        $(row).find('.metaTableCellArea').on('input propertychange',function()
         {
             var input = $(this).val();

main/trunk/greenstone3/web/interfaces/default_wip/js/javascript-global-functions.js

@@ -549 +549 @@
     // since get-meta-array and especially set-meta-array can be large, e.g. for user comments.
     $.ajax({url: url, async: async_setting, type: method, data: data})
-        .success(function(response) {
+        .done(function(response) {
         ajaxResponse = response;
 //      console.log("** (" + callingFunction + ") Response received from server: " + ajaxResponse);
@@ -561 +561 @@
         }
         })
-        .error(function(response) {
+        .fail(function(response) {
             if(errorResponseFunction != null) { 
                 errorResponseFunction(response);

main/trunk/greenstone3/web/interfaces/default_wip/js/jquery-ui-1.10.2.custom/index.html

@@ -96 +96 @@
             value: 20
         });
-        
-
-        // Hover states on the static widgets
-        $( "#dialog-link, #icons li" ).hover(
-            function() {
+
+        $( "#dialog-link, #icons li" )
+            .on("mouseenter", function()
+            {
                 $( this ).addClass( "ui-state-hover" );
-            },
-            function() {
+            })
+            .on("mouseleave", function()
+            {
                 $( this ).removeClass( "ui-state-hover" );
-            }
-        );
+            });
     });
     </script>

main/trunk/greenstone3/web/interfaces/default_wip/js/jquery-ui-1.10.2.custom/js/jquery-ui-1.10.2.custom.js

@@ -6138 +6138 @@
                     data: request,
                     dataType: "json",
-                    success: function( data ) {
+                    done: function( data ) {
                         response( data );
                     },
-                    error: function() {
+                    fail: function() {
                         response( [] );
                     }
@@ -12266 +12266 @@
 
             this.xhr
-                .success(function( response ) {
+                .done(function( response ) {
                     // support: jQuery <1.8
                     // http://bugs.jquery.com/ticket/11778
@@ -12274 +12274 @@
                     }, 1 );
                 })
-                .complete(function( jqXHR, status ) {
+                .always(function( jqXHR, status ) {
                     // support: jQuery <1.8
                     // http://bugs.jquery.com/ticket/11778

main/trunk/greenstone3/web/interfaces/default_wip/js/jquery.blockUI.js

@@ -1 +1 @@
 /*!
  * jQuery blockUI plugin
- * Version 2.66.0-2013.10.09
+ * Version 2.70.0-2014.11.23
  * Requires jQuery v1.7 or later
  *
@@ -108 +108 @@
         };
 
-        $.blockUI.version = 2.66; // 2nd generation blocking at no extra cost!
+        $.blockUI.version = 2.70; // 2nd generation blocking at no extra cost!
 
         // override these in your code to change the default behavior and style
@@ -427 +427 @@
                     lyr3.show();
                 if (opts.onBlock)
-                    opts.onBlock();
+                    opts.onBlock.bind(lyr3)();
             }
 
@@ -516 +516 @@
                 data.el.style.display = data.display;
                 data.el.style.position = data.position;
+                data.el.style.cursor = 'default'; // #59
                 if (data.parent)
                     data.parent.appendChild(data.el);
@@ -551 +552 @@
             var events = 'mousedown mouseup keydown keypress keyup touchstart touchend touchmove';
             if (b)
-                $(document).bind(events, opts, handler);
+                $(document).on(events, opts, handler);
             else
-                $(document).unbind(events, handler);
+                $(document).off(events, handler);
 
         // former impl...

main/trunk/greenstone3/web/interfaces/default_wip/js/jquery.selectboxes.js

@@ -391 +391 @@
 {
     var w = which || "selected";
-    if($(to).size() == 0) return this;
+    if($(to).length == 0) return this;
     this.each(
         function()

main/trunk/greenstone3/web/interfaces/default_wip/js/map-scripts.js

@@ -73 +73 @@
     {
         var startStopCheckbox = $("<input>", {"type": "checkbox", "checked": _scrollThroughDefault, "id": "scrollCheckbox"});
-        startStopCheckbox.click(function()
+        startStopCheckbox.on("click", function()
         {
             // http://stackoverflow.com/questions/901712/how-to-check-if-a-checkbox-is-checked-in-jquery
@@ -278 +278 @@
     
     $.ajax({type:"POST", url:url, data:data})
-    .success(function(responseText)
+    .done(function(responseText)
     {
         //console.log("*** responseText (first 250) = " + responseText.substring(0,256));
@@ -986 +986 @@
     var url = gs.xsltParams.library_name + "?a=b&rt=s&s=ClassifierBrowse&c=" + gs.cgiParams.c + "&cl=" + sectionID + "&excerptid=jsonNodes";
     $.ajax(url)
-    .success(function(responseText)
+    .done(function(responseText)
     {
         var startIndex = responseText.indexOf(">");
@@ -1025 +1025 @@
         //console.log("getSub Classifier -> updateMap()");
     })
-    .error(function()
+    .fail(function()
     {
         //console.log("Error getting subclassifiers");
@@ -1094 +1094 @@
         var url = gs.xsltParams.library_name + "?a=q&s=RawQuery&rt=rd&c=" + gs.cgiParams.c + "&s1.rawquery=" + query + "&excerptid=nearbyDocs&ilt=" + inlineTemplate.replace(/ /, "%20");
     $.ajax(url)
-    .success(function(response)
+    .done(function(response)
     {
         response = response.replace(/<img src="[^"]*map_marker.png"[^>]*>/g, "");

main/trunk/greenstone3/web/interfaces/default_wip/js/ui.nestedSortable.js

@@ -69 +69 @@
             var validHandle = false;
 
-            $(this.options.handle, currentItem).find("*").andSelf().each(function() { if(this == event.target) validHandle = true; });
+            $(this.options.handle, currentItem).find("*").addBack().each(function() { if(this == event.target) validHandle = true; });
             if(!validHandle) return false;
         }

main/trunk/greenstone3/web/interfaces/default_wip/js/visual-xml-editor.js

@@ -291 +291 @@
 
             $.ajax(url)
-            .success(function(response)
+            .done(function(response)
             {
                 startIndex = response.search("<templateList>") + "<templateList>".length;
@@ -323 +323 @@
                 }
             })
-            .error(function()
+            .fail(function()
             {
                 console.log("Error retrieving GSLIB templates");
@@ -383 +383 @@
         var customElemHolder = $("<div>");
         var customCreateButton = $("<button>Create element</button>");
-        customCreateButton.click(function()
+        customCreateButton.on("click", function()
         {
             var elemName = customInput.val();
@@ -648 +648 @@
 
         var _editButton = $("<button>Edit text</button>");
-        _editButton.click(function()
+        _editButton.on("click", function()
         {
             if(_editButton.button("option", "label") == "Edit text")
@@ -768 +768 @@
             var link = $("<a href=\"javascript:;\">edit</a>");
 
-            link.click(function()
+            link.on("click", function()
             {
                 _thisAttr.editMode();
@@ -781 +781 @@
             var cell = $("<td>", {"class":"veDeleteCell"});
             var link = $("<a href=\"javascript:;\">delete</a>");
-            link.click(function()
+            link.on("click", function()
             {
                 _transactions.push({type:"remAttr", elem:_xmlElem, row:_row, rowParent:_row.parent(), name:_name, value:_value});
@@ -824 +824 @@
             editLink.text("done");
             editLink.off("click");
-            editLink.click(function()
+            editLink.on("click", function()
             {
                 _thisAttr.saveEdits();
@@ -871 +871 @@
             editLink.text("edit");
             editLink.off("click");
-            editLink.click(function()
+            editLink.on("click", function()
             {
                 _thisAttr.editMode();
@@ -1175 +1175 @@
             var errorFunction = function()
             {
-                $.ajax(url).success(successFunction).error(errorFunction);
+                $.ajax(url).done(successFunction).fail(errorFunction);
             }
             
-            $.ajax(url).success(successFunction).error(errorFunction);
+            $.ajax(url).done(successFunction).fail(errorFunction);
         }
 
@@ -1248 +1248 @@
 
                 var addButton = $("<button>Add attribute</button>");
-                addButton.click(function()
+                addButton.on("click", function()
                 {
                     var newAtt;
@@ -1330 +1330 @@
                 event.stopPropagation();
             });
-            _div.click(function(event)
+            _div.on("click", function(event)
             {
                 event.stopPropagation();

main/trunk/greenstone3/web/interfaces/default_wip/transform/depositor/de_page1.xsl

@@ -27 +27 @@
                 <script type="text/javascript">
                     <xsl:text disable-output-escaping="yes">
-                        $("#addNewMD").click(function()
+                        $("#addNewMD").on("click", function()
                         {
                             var val = $("#newMDName").val();
@@ -50 +50 @@
                 <script type="text/javascript">
                     <xsl:text disable-output-escaping="yes">
-                        $("#clearSaved").click(function()
+                        $("#clearSaved").on("click", function()
                         {
                             $.ajax(gs.xsltParams.library_name + "?a=de&amp;sa=clearcache")
-                            .success(function()
+                            .done(function()
                             {
                                 document.location.href = gs.xsltParams.library_name + "?a=de&amp;sa=getwizard&amp;depage=1&amp;c=" + gs.cgiParams.c;
@@ -64 +64 @@
     </xsl:template>
 </xsl:stylesheet>  
-

main/trunk/greenstone3/web/interfaces/default_wip/transform/depositor/de_page4.xsl

@@ -17 +17 @@
             <xsl:text disable-output-escaping="yes">
                 {
-                    $(window).load(function()
+                    $(window).on("load", function()
                     {
                         $("#progressBar").html($("#progressBar").html() + "&lt;br/&gt;Moving file into collection...");
                         var url = gs.xsltParams.library_name + "?a=de&amp;sa=depositFile&amp;ro=1&amp;c=" + gs.cgiParams.c + "&amp;fileToAdd=" + gs.deSavedMetadata["md___ex.Filename"];
-                        $.ajax(url).success(function(response)
+                        $.ajax(url).done(function(response)
                         {
                             $("#progressBar").html($("#progressBar").html() + "&lt;br/&gt;Importing collection...");
@@ -46 +46 @@
                                         $("#progressBar").html($("#progressBar").html() + "&lt;br/&gt;Collection built...");
                                         $("#progressBar").html($("#progressBar").html() + "&lt;br/&gt;Reloading Greenstone...");
-                                        $.ajax(gs.xsltParams.library_name + "?a=s&amp;sa=c").success(function()
+                                        $.ajax(gs.xsltParams.library_name + "?a=s&amp;sa=c").done(function()
                                         {
                                             $("#progressBar").html($("#progressBar").html() + "&lt;br/&gt;Done!");
                                         })
-                                        .error(function()
+                                        .fail(function()
                                         {
                                             $("#progressBar").html($("#progressBar").html() + "&lt;br/&gt;Reload failed, please restart Greenstone manually.");
@@ -72 +72 @@
     </xsl:template>
 </xsl:stylesheet>  
-

main/trunk/greenstone3/web/interfaces/default_wip/transform/depositor/depositor.xsl

@@ -58 +58 @@
             <xsl:text disable-output-escaping="yes">
                 {
-                    $(window).load(function()
+                    $(window).on("load", function()
                     {
                         var cachedMetadata = [];
@@ -101 +101 @@
                         }
 
-                        $(".wizardStepLink a").click(function()
+                        $(".wizardStepLink a").on("click", function()
                         {
                             var requestedPage = $(this).attr("page");
@@ -123 +123 @@
     </xsl:template>
 </xsl:stylesheet>  
-

main/trunk/greenstone3/web/interfaces/default_wip/transform/expand-gsf.xsl

@@ -424 +424 @@
                         </xsl:choose>               
                     </xslt:attribute>
+                    <xsl:if test="@alt">
+                        <xslt:attribute name='alt'>
+                            <xsl:value-of select="@alt" />
+                        </xslt:attribute>
+                    </xsl:if>
                 </img>
             </xsl:when>
@@ -756 +761 @@
 
 </xsl:stylesheet>
-
-

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

@@ -116 +116 @@
     <xsl:call-template name="favicon"/>
     
-    <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery.min.js"><xsl:text> </xsl:text></script>
+    <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery-3.6.0.min.js"><xsl:text> </xsl:text></script>
     <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>
     <script type="text/javascript" src="interfaces/{$interface_name}/js/jquery.blockUI.js"><xsl:text> </xsl:text></script>
@@ -496 +496 @@
     <xsl:when test="$isEditingAvailable = '1' and $userHasEditPermission = '1'"><xsl:text disable-output-escaping="yes">
     .html((gs.userInformation.editEnabled == "true") ? "</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'menu.disable_edit_mode')"/><xsl:text disable-output-escaping="yes">" : "</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'menu.enable_edit_mode')"/><xsl:text disable-output-escaping="yes">")
-    .click(function()
+    .on("click", function()
     {
     var c_url = gs.xsltParams.library_name + "?a=g&amp;rt=ro&amp;s=ChangeUserEditMode&amp;s1.username=" + gs.userInformation.username + "&amp;s1.enabled=" + ((gs.userInformation.editEnabled == "true") ? "false" : "true");
     $.ajax(c_url)
-    .success(function(response)
+    .done(function(response)
     {
     //location.reload(true); // need to set docEdit=0 if we have just disabled editing
@@ -508 +508 @@
     </xsl:text></xsl:when><xsl:otherwise><xsl:variable name="reason"><xsl:choose><xsl:when test="$isEditingAvailable != '1'"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.error_unavailable')"/></xsl:when><xsl:when test="$userHasEditPermission != '1'"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.error_wrong_group')"/></xsl:when></xsl:choose><xsl:text> </xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.error_contact_admin', $siteAdmin)"/></xsl:variable><xsl:text disable-output-escaping="yes">
     .html("</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.error')"/><xsl:text disable-output-escaping='yes'>")
-    .click(function()
+    .on("click", function()
     {
     alert("</xsl:text><xsl:value-of select="$reason"/><xsl:text disable-output-escaping='yes'>");
@@ -820 +820 @@
     <script src="interfaces/{$interface_name}/js/map-scripts-shapes-util.js" type="text/javascript"><xsl:text> </xsl:text></script>
     <script src="interfaces/{$interface_name}/js/map-scripts.js" type="text/javascript"><xsl:text> </xsl:text></script>
-    <script type="text/javascript">$(window).load(initializeMapScripts);</script>
+    <script type="text/javascript">$(window).on("load", initializeMapScripts);</script>
   </xsl:template>
 
@@ -834 +834 @@
     <script src="interfaces/{$interface_name}/js/panoramaMarker.js" type="text/javascript"><xsl:text> </xsl:text></script>
     <script src="interfaces/{$interface_name}/js/panoramaViewer.js" type="text/javascript"><xsl:text> </xsl:text></script>
-    <script type="text/javascript">$(window).load(initPanoramaViewer);$(window).load(_animate);</script>
+    <script type="text/javascript">$(window).on("load", initPanoramaViewer);$(window).on("load", _animate);</script>
   </xsl:template>
 

main/trunk/greenstone3/web/interfaces/default_wip/transform/layouts/toc.xsl

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0"
-    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:java="http://xml.apache.org/xslt/java"
-    xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
-    xmlns:gslib="http://www.greenstone.org/skinning"
-    xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
-    extension-element-prefixes="java util"
-    exclude-result-prefixes="java util gsf">
-    
-    <xsl:template name="rightSidebarTOC">
-      <div id="rightSidebar">
-        <xsl:choose>
-          <xsl:when test="@docType = 'simple'">
-        <xsl:for-each select=".">
-          <xsl:call-template name="displayCoverImage"/>
-        </xsl:for-each>
-        <xsl:call-template name="viewOptions"/>
-        <!--<xsl:text>  </xsl:text>-->
-          </xsl:when>
-        <xsl:otherwise>
-          <xsl:for-each select="documentNode[1]">
-        <xsl:call-template name="displayCoverImage"/>
-          </xsl:for-each>
-          <xsl:call-template name="viewOptions"/>
-          <xsl:call-template name="displayTOC"/>
-        </xsl:otherwise>
-      </xsl:choose>
-      </div>
-    </xsl:template>
-    
-    <!-- this is called in the context of the top level node with the metadataList. For a simple doc, this is the document node. For a comples document, this is the first documentNode hcild of the document node. -->
-    <xsl:template name="displayCoverImage">
-      <xsl:variable name="hasCover"><gsf:metadata name="hascover"/></xsl:variable>
-      <xsl:if test="$hasCover = '1' and (not(/page/pageResponse/format[@type='display']/gsf:option[@name='coverImage']) or /page/pageResponse/format[@type='display']/gsf:option[@name='coverImage']/@value='true')">
-        <!-- the book's cover image -->
-        <div id="coverImage">
-          <img>
-        <xsl:attribute name="src"><xsl:value-of select="$httpPath"/>/index/assoc/<gsf:metadata name="assocfilepath" pos="1"/>/cover.jpg</xsl:attribute>
-          </img><xsl:text> </xsl:text>
-        </div>
-      </xsl:if>
-    </xsl:template> 
-    
-    <xsl:template name="displayTOC">
-      <xsl:if test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='TOC']) or /page/pageResponse/format[@type='display']/gsf:option[@name='TOC']/@value='true'">
-        <div class="tableOfContentsContainer ui-state-default">
-            <table class="tocTable ui-widget-content">
-                <tr>
-                    <td id="unfloatTOCButton" style="display:none;">
-                        <a href="javascript:floatMenu(false);">
-                            <img class="icon" style="padding-top:3px;">
-                                <xsl:attribute name="src">
-                                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'left_arrow_image')"/>
-                                </xsl:attribute>
-                            </img>
-                        </a>
-                    </td>
-                    <td style="vertical-align:top; text-align:right;">
-                        <a id="sidebarMinimizeButton" href="javascript:minimizeSidebar();" style="float: right; font-size:0.6em;">
-                            <img class="icon" style="padding-top:3px;">
-                                <xsl:attribute name="src">
-                                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'collapse_image')"/>
-                                </xsl:attribute>
-                            </img>
-                        </a>
-                        <a id="sidebarMaximizeButton" href="javascript:maximizeSidebar();" style="float: right; font-size:0.6em; display:none;">
-                            <img class="icon" style="padding-top:3px;">
-                                <xsl:attribute name="src">
-                                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'expand_image')"/>
-                                </xsl:attribute>
-                            </img>
-                        </a>
-                    </td>
-                </tr>
-                <tr><td id="tdContentsArea">
-                    <div id="contentsArea"> 
-                            <!-- showing gotoFavourites display-area takes priority over berryBaskets -->
-                            <xsl:choose>
-                          <xsl:when test="/page/pageResponse/interfaceOptions/option[@name = 'favouriteBasket']/@value = 'true'">
-                            <!-- show the goto favourites if it's turned on -->
-                            <xsl:call-template name="gotoFavourites"/>
-                          </xsl:when>
-                          <xsl:otherwise>
-                            <!-- show the berry basket if it's turned on -->
-                            <xsl:call-template name="berryBasket"/>
-                          </xsl:otherwise>
-                        </xsl:choose>
-
-                        <!-- add in expand and contract document links -->
-                        <xsl:call-template name="expandContractDocumentLinks"/>
-                        <!-- dynamically get the contents (if enabled) -->
-                        <xsl:choose>
-                            <xsl:when test="/page/pageResponse/document/@docType = 'paged' or /page/pageResponse/document/@docType = 'pagedhierarchy'">
-                                <gsf:image type="Thumb"/>
-                                <!-- Table of contents will be dynamically retrieved when viewing a paged document -->
-                                <script type="text/javascript">
-                                    <xsl:text disable-output-escaping="yes">
-                                        $(window).load(function()
-                                        {
-                                            retrieveTableOfContentsAndTitles();
-                                                <!--setUpFilterButtons();-->
-                                        });
-                                    </xsl:text>
-                                </script>
-                                
-                                <div id="tableOfContents"><xsl:text> </xsl:text></div>
-                                <div id="tocLoadingImage" style="text-align:center;">
-                                    <img src="{util:getInterfaceText($interface_name, /page/@lang, 'loading_image')}"/><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.loading')"/><xsl:text>...</xsl:text>
-                                </div>
-                                <label for="filterText"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.filter_pages')"/><xsl:text>: </xsl:text></label><span id="filterOnButtons" style="float: right;">...</span><input id="filterText" type="text" style="width: 100%;"/>
-<!--                                <xsl:if test="/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true'">-->
- <xsl:if test="/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true' and /page/pageRequest/paramList/param[@name='docEdit']/@value = '1'  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))">
-                                  <a href="javascript:extractFilteredPagesToOwnDocument();"><button id="extractDocButton"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.extract_pages')"/></button></a>
-                                </xsl:if>
-                            </xsl:when>
-                            <xsl:when test="not(/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or /page/pageRequest/paramList/param[@name = 'ec']/@value = '1')">
-                                <div id="tableOfContents">
-                                    <div id="tocLoadingImage" style="text-align:center;">
-                                        <img src="{util:getInterfaceText($interface_name, /page/@lang, 'loading_image')}"/><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.loading')"/><xsl:text>...</xsl:text>
-                                    </div>
-                                </div>
-                                <script type="text/javascript">
-                                    <xsl:text disable-output-escaping="yes">
-                                        $(window).load(function()
-                                        {
-                                            retrieveFullTableOfContents();
-                                        });
-                                    </xsl:text>
-                                </script>
-                            </xsl:when>
-                            <xsl:otherwise>
-                             
-                                <div id="tableOfContents">
-                                  <!-- if ed=1 or ec=1 then we have the complete section hierarchy in the page xml source, so we don't need an ajax call to get the table of contents, we just generate it from the list of nodes -->
-                                    <xsl:attribute name="class"> <!-- do we ever need this ?? -->
-                                        <xsl:choose>
-                                            <xsl:when test="count(//documentNode) > 1">visible</xsl:when>
-                                            <xsl:otherwise>hidden</xsl:otherwise>
-                                        </xsl:choose>
-                                    </xsl:attribute>
-                                    <xsl:for-each select="documentNode">
-                                        <xsl:call-template name="documentNodeTOC"/>
-                                    </xsl:for-each>
-                                </div>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </div>
-                </td></tr>
-            </table>
-        </div>
-      </xsl:if>
-    </xsl:template>
-    
-    <!-- This template is used to display the table of contents -->
-    <xsl:template name="documentNodeTOC">
-        <ul>
-            <table><tr>
-                <!-- The expand/collapse button (not displayed for the top level node) -->
-                <xsl:if test="util:hashToDepthClass(@nodeID) != 'sectionHeaderDepthTitle'">
-                    <td>
-                        <xsl:choose>
-                            <xsl:when test="documentNode">
-                                <img id="ttoggle{@nodeID}" onclick="toggleSection('{@nodeID}');" class="icon">
-                                    <xsl:attribute name="src">
-                                        <xsl:choose>
-                                            <xsl:when test="/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or /page/pageResponse/document/@selectedNode = @nodeID">
-                                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'collapse_image')"/>
-                                            </xsl:when>
-                                            <xsl:otherwise>
-                                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'expand_image')"/>
-                                            </xsl:otherwise>
-                                        </xsl:choose>
-                                    </xsl:attribute>
-                                </img>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:attribute name="class">emptyIcon</xsl:attribute>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </td>
-                </xsl:if>
-                
-                <!-- The chapter/page icon -->
-                <td>
-                    <img>
-                        <xsl:if test="not(documentNode)">
-                            <xsl:attribute name="class">leafNode</xsl:attribute>
-                        </xsl:if>
-                        
-                        <xsl:attribute name="src">
-                            <xsl:choose>
-                                <xsl:when test="not(documentNode)">
-                                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'page_image')"/> 
-                                </xsl:when>
-                                <xsl:otherwise>
-                                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'chapter_image')"/>
-                                </xsl:otherwise>
-                            </xsl:choose>
-                        </xsl:attribute>
-                    </img>
-                </td>
-                
-                <!-- The section name, links to the section in the document -->
-                <td class="tocTextCell">                
-                    <a id="toclink{@nodeID}" href="javascript:focusSection('{@nodeID}');">
-                        <xsl:if test="util:hashToSectionId(@nodeID)">
-                          <span class="tocSectionNumber"><xsl:value-of select="util:hashToSectionId(@nodeID)"/><!--<xsl:text> </xsl:text>--></span></xsl:if><span class="tocSectionTitle"><xsl:call-template name="sectionHeading"/></span></a>
-                    
-                </td>
-            </tr></table>
-        
-            <!-- display any child items -->        
-            <xsl:if test="documentNode">
-                <li id="toc{@nodeID}">
-                    <xsl:attribute name="style">
-                        <xsl:choose>
-                            <xsl:when test="/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or /page/pageResponse/document/@selectedNode = @nodeID">
-                                <xsl:text>display:block;</xsl:text>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <xsl:text>display:none;</xsl:text>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </xsl:attribute>
-                    <xsl:for-each select="documentNode">
-                        <xsl:call-template name="documentNodeTOC"/>
-                    </xsl:for-each>
-                </li>
-            </xsl:if>
-            
-        </ul>
-    </xsl:template>
-    
-    <xsl:template name="viewOptions">
-        <div id="viewAndZoomOptions" class="ui-state-default ui-corner-all">
-            <ul id="viewOptions">
-                <!-- Paged-image document options -->
-                            <xsl:if test="count(//documentNode/metadataList/metadata[@name = 'Screen']) > 0 or /page/pageResponse/document/@docType = 'paged' or /page/pageResponse/document/@docType = 'pagedhierarchy'">
-                                <!-- view selection option -->
-                  <xsl:if test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='viewSelection']) or /page/pageResponse/format[@type='display']/gsf:option[@name='viewSelection']/@value='true'">
-                <li id="pagedImageOptions">
-                    <select id="viewSelection" onchange="changeView();">
-                        <xsl:choose>
-                            <xsl:when test="/page/pageRequest/paramList/param[@name = 'view']/@value = 'image'">
-                                <option><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.default_view')"/></option>
-                                <option selected="true"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.image_view')"/></option>
-                                <option><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.text_view')"/></option>
-                            </xsl:when>
-                            <xsl:when test="/page/pageRequest/paramList/param[@name = 'view']/@value = 'text'">
-                                <option><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.default_view')"/></option>
-                                <option><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.image_view')"/></option>
-                                <option selected="true"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.text_view')"/></option>
-                            </xsl:when>
-                            <xsl:otherwise>
-                                <option selected="true"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.default_view')"/></option>
-                                <option><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.image_view')"/></option>
-                                <option><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.text_view')"/></option>
-                            </xsl:otherwise>
-                        </xsl:choose>
-                    </select>
-                </li>
-                </xsl:if>
-                <!-- Slide-show options -->
-                <xsl:if test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='slideShow']) or /page/pageResponse/format[@type='display']/gsf:option[@name='slideShow']/@value='true'">
-                <li id="slideShowOptions">
-                    <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.slideshowTooltip')"/></xsl:attribute>
-                    <img onclick="showSlideShow()">
-                        <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'slideshow_image')"/></xsl:attribute>
-                    </img>
-                </li>
-                    </xsl:if> 
-                </xsl:if>
-                <!-- Realistic books link -->
-                <xsl:if test="/page/pageResponse/collection[@name = $collName]/metadataList/metadata[@name = 'tidyoption'] = 'tidy'">
-                    <li>
-                        <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.realisticBooksTooltip')"/></xsl:attribute>
-                        <img id="rbOptionImage" onclick="bookInit();">
-                            <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'realistic_books_image')"/></xsl:attribute>
-                        </img>
-                        <input id="rbOption" type="checkbox" onclick="bookInit();" class="optionCheckBox"/>
-                    </li>
-                </xsl:if>
-                
-                <!-- Highlight on/off button -->
-                <xsl:if test="util:contains(/page/pageRequest/paramList/param[@name = 'p.s']/@value, 'Query') and not(metadataList/metadata[@name='NoText']) and not(/page/pageResponse/format[@type='display']/gsf:option[@name='disableSearchTermHighlighting']/@value='true')">
-                    <li>
-                        <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.highlightTooltip')"/></xsl:attribute>
-                        <img onclick="swapHighlight(true);">
-                            <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'highlight_image')"/></xsl:attribute>
-                        </img>
-                        <input id="highlightOption" type="checkbox" class="optionCheckBox" onclick="swapHighlight(false);">
-                            <xsl:if test="not(/page/pageRequest/paramList/param[@name = 'hl']/@value = 'off')">
-                                <xsl:attribute name="checked">checked</xsl:attribute>
-                            </xsl:if>
-                        </input>
-                    </li>
-                </xsl:if><xsl:text> </xsl:text>
-                
-                <!-- Zoom on/off button -->
-      <xsl:if test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='disableZoom']) or /page/pageResponse/format[@type='display']/gsf:option[@name='disableZoom']/@value='false'">
-
-                <li id="zoomOptions" style="display:none;">
-                    <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.zoomTooltip')"/></xsl:attribute>
-                    <img id="zoomToggleImage">
-                        <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'zoom_image')"/></xsl:attribute>
-                    </img>
-                    <input id="zoomToggle" type="checkbox"/>
-                    <script type="text/javascript">
-                        <xsl:text disable-output-escaping="yes">
-                            $("#zoomToggle").change(function()
-                            {
-                                _imageZoomEnabled = $("#zoomToggle").prop("checked");
-                            });
-                            
-                            $("#zoomToggleImage").click(function()
-                            {
-                                $("#zoomToggle").prop("checked", !$("#zoomToggle").prop("checked"));
-                                _imageZoomEnabled = $("#zoomToggle").prop("checked");
-                            });
-                        </xsl:text>
-                    </script>
-                </li>
-      </xsl:if>
-                <!-- Floating TOC on/off button -->
-                <xsl:if test="count(//documentNode) > 0 and (not(/page/pageResponse/format[@type='display']/gsf:option[@name='TOC']) or /page/pageResponse/format[@type='display']/gsf:option[@name='TOC']/@value='true')">
-                    <li id="floatingTOCOptions">
-                        <xsl:attribute name="title"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.floatingTooltip')"/></xsl:attribute>
-                        <img id="floatTOCToggleImage">
-                            <xsl:attribute name="src"><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'float_toc_image')"/></xsl:attribute>
-                        </img>
-                        <input id="floatTOCToggle" type="checkbox"/>
-                        <script type="text/javascript">
-                            <xsl:text disable-output-escaping="yes">
-                                $("#floatTOCToggle").prop("checked", false);
-                                $("#floatTOCToggle").click(function()
-                                {
-                                    floatMenu($("#floatTOCToggle").prop("checked"));
-                                });
-                                
-                                $("#floatTOCToggleImage").click(function()
-                                {
-                                    $("#floatTOCToggle").prop("checked", !$("#floatTOCToggle").prop("checked"))
-                                    floatMenu($("#floatTOCToggle").prop("checked"));
-                                });
-                            </xsl:text>
-                        </script>
-                    </li>
-                    <xsl:if test="/page/pageRequest/paramList/param[@name='ftoc']/@value = '1'">
-                        <script type="text/javascript">
-                            <xsl:text disable-output-escaping="yes">
-                                $(window).load(function()
-                                {
-                                    $("#floatTOCToggle").prop("checked", true);
-                                    floatMenu(true);
-                                });
-                            </xsl:text>
-                        </script>
-                    </xsl:if>
-                </xsl:if>
-            </ul>
-            <div style="clear:both;"><xsl:text> </xsl:text></div>
-        </div>
-    </xsl:template>
+    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:java="http://xml.apache.org/xslt/java"
+    xmlns:util="xalan://org.greenstone.gsdl3.util.XSLTUtil"
+    xmlns:gslib="http://www.greenstone.org/skinning"
+    xmlns:gsf="http://www.greenstone.org/greenstone3/schema/ConfigFormat"
+    extension-element-prefixes="java util"
+    exclude-result-prefixes="java util gsf">
+
+    <xsl:template name="rightSidebarTOC">
+        <div id="rightSidebar">
+            <xsl:choose>
+                <xsl:when test="@docType = 'simple'">
+                    <xsl:for-each select=".">
+                        <xsl:call-template name="displayCoverImage"/>
+                    </xsl:for-each>
+                    <xsl:call-template name="viewOptions"/>
+                    <!--<xsl:text>  </xsl:text>-->
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:for-each select="documentNode[1]">
+                        <xsl:call-template name="displayCoverImage"/>
+                    </xsl:for-each>
+                    <xsl:call-template name="viewOptions"/>
+                    <xsl:call-template name="displayTOC"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </div>
+    </xsl:template>
+
+    <!-- this is called in the context of the top level node with the metadataList. For a simple doc, this is the document node. For a comples document, this is the first documentNode hcild of the document node. -->
+    <xsl:template name="displayCoverImage">
+        <xsl:variable name="hasCover">
+            <gsf:metadata name="hascover"/>
+        </xsl:variable>
+        <xsl:if test="$hasCover = '1' and (not(/page/pageResponse/format[@type='display']/gsf:option[@name='coverImage']) or /page/pageResponse/format[@type='display']/gsf:option[@name='coverImage']/@value='true')">
+            <!-- the book's cover image -->
+            <div id="coverImage">
+                <img>
+                    <xsl:attribute name="src">
+                        <xsl:value-of select="$httpPath"/>/index/assoc/<gsf:metadata name="assocfilepath" pos="1"/>/cover.jpg
+                    </xsl:attribute>
+                </img>
+                <xsl:text> </xsl:text>
+            </div>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template name="displayTOC">
+        <xsl:if test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='TOC']) or /page/pageResponse/format[@type='display']/gsf:option[@name='TOC']/@value='true'">
+            <div class="tableOfContentsContainer ui-state-default">
+                <table class="tocTable ui-widget-content">
+                    <tr>
+                        <td id="unfloatTOCButton" style="display:none;">
+                            <a href="javascript:floatMenu(false);">
+                                <img class="icon" style="padding-top:3px;">
+                                    <xsl:attribute name="src">
+                                        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'left_arrow_image')"/>
+                                    </xsl:attribute>
+                                </img>
+                            </a>
+                        </td>
+                        <td style="vertical-align:top; text-align:right;">
+                            <a id="sidebarMinimizeButton" href="javascript:minimizeSidebar();" style="float: right; font-size:0.6em;">
+                                <img class="icon" style="padding-top:3px;">
+                                    <xsl:attribute name="src">
+                                        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'collapse_image')"/>
+                                    </xsl:attribute>
+                                </img>
+                            </a>
+                            <a id="sidebarMaximizeButton" href="javascript:maximizeSidebar();" style="float: right; font-size:0.6em; display:none;">
+                                <img class="icon" style="padding-top:3px;">
+                                    <xsl:attribute name="src">
+                                        <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'expand_image')"/>
+                                    </xsl:attribute>
+                                </img>
+                            </a>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td id="tdContentsArea">
+                            <div id="contentsArea">
+                                <!-- showing gotoFavourites display-area takes priority over berryBaskets -->
+                                <xsl:choose>
+                                    <xsl:when test="/page/pageResponse/interfaceOptions/option[@name = 'favouriteBasket']/@value = 'true'">
+                                        <!-- show the goto favourites if it's turned on -->
+                                        <xsl:call-template name="gotoFavourites"/>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <!-- show the berry basket if it's turned on -->
+                                        <xsl:call-template name="berryBasket"/>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+
+                                <!-- add in expand and contract document links -->
+                                <xsl:call-template name="expandContractDocumentLinks"/>
+                                <!-- dynamically get the contents (if enabled) -->
+                                <xsl:choose>
+                                    <xsl:when test="/page/pageResponse/document/@docType = 'paged' or /page/pageResponse/document/@docType = 'pagedhierarchy'">
+                                        <gsf:image type="Thumb"/>
+                                        <!-- Table of contents will be dynamically retrieved when viewing a paged document -->
+                                        <script type="text/javascript">
+                                            <xsl:text disable-output-escaping="yes">
+                                                $(window).on("load", function()
+                                                {
+                                                    retrieveTableOfContentsAndTitles();
+                                                    <!--setUpFilterButtons();-->
+                                                });
+                                            </xsl:text>
+                                        </script>
+
+                                        <div id="tableOfContents">
+                                            <xsl:text> </xsl:text>
+                                        </div>
+
+                                        <div id="tocLoadingImage" style="text-align:center;">
+                                            <img src="{util:getInterfaceText($interface_name, /page/@lang, 'loading_image')}"/>
+                                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.loading')"/>
+                                            <xsl:text>...</xsl:text>
+                                        </div>
+
+                                        <label for="filterText">
+                                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.filter_pages')"/>
+                                            <xsl:text>: </xsl:text>
+                                        </label>
+                                        <span id="filterOnButtons" style="float: right;">...</span>
+                                        <input id="filterText" type="text" style="width: 100%;" />
+
+                                        <!-- <xsl:if test="/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true'"> -->
+                                        <xsl:if test="/page/pageRequest/userInformation and /page/pageRequest/userInformation/@editEnabled = 'true' and /page/pageRequest/paramList/param[@name='docEdit']/@value = '1'  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))">
+                                            <a href="javascript:extractFilteredPagesToOwnDocument();">
+                                                <button id="extractDocButton">
+                                                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'de.extract_pages')"/>
+                                                </button>
+                                            </a>
+                                        </xsl:if>
+                                    </xsl:when>
+                                    <xsl:when test="not(/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or /page/pageRequest/paramList/param[@name = 'ec']/@value = '1')">
+                                        <div id="tableOfContents">
+                                            <div id="tocLoadingImage" style="text-align:center;">
+                                                <img src="{util:getInterfaceText($interface_name, /page/@lang, 'loading_image')}"/>
+                                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.loading')"/>
+                                                <xsl:text>...</xsl:text>
+                                            </div>
+                                        </div>
+                                        <script type="text/javascript">
+                                            <xsl:text disable-output-escaping="yes">
+                                                $(window).on("load", function()
+                                                {
+                                                    retrieveFullTableOfContents();
+                                                });
+                                            </xsl:text>
+                                        </script>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+
+                                        <div id="tableOfContents">
+                                            <!-- if ed=1 or ec=1 then we have the complete section hierarchy in the page xml source, so we don't need an ajax call to get the table of contents, we just generate it from the list of nodes -->
+                                            <xsl:attribute name="class"> <!-- do we ever need this ?? -->
+                                                <xsl:choose>
+                                                    <xsl:when test="count(//documentNode) > 1">visible</xsl:when>
+                                                    <xsl:otherwise>hidden</xsl:otherwise>
+                                                </xsl:choose>
+                                            </xsl:attribute>
+
+                                            <xsl:for-each select="documentNode">
+                                                <xsl:call-template name="documentNodeTOC"/>
+                                            </xsl:for-each>
+                                        </div>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </div>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </xsl:if>
+    </xsl:template>
+
+    <!-- This template is used to display the table of contents -->
+    <xsl:template name="documentNodeTOC">
+        <table>
+            <tr>
+                <!-- The expand/collapse button (not displayed for the top level node) -->
+                <xsl:if test="util:hashToDepthClass(@nodeID) != 'sectionHeaderDepthTitle'">
+                    <td>
+                        <xsl:choose>
+                            <xsl:when test="documentNode">
+                                <img id="ttoggle{@nodeID}" onclick="toggleSection('{@nodeID}');" class="icon">
+                                    <xsl:attribute name="src">
+                                        <xsl:choose>
+                                            <xsl:when test="/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or /page/pageResponse/document/@selectedNode = @nodeID">
+                                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'collapse_image')"/>
+                                            </xsl:when>
+                                            <xsl:otherwise>
+                                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'expand_image')"/>
+                                            </xsl:otherwise>
+                                        </xsl:choose>
+                                    </xsl:attribute>
+                                </img>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <xsl:attribute name="class">emptyIcon</xsl:attribute>
+
+                                <!--
+                                    Prevent the <td> element being self-closed, which would be invalid according to the HTML spec.
+                                    This is also an identified issue in jQuery > 3.5.0
+                                -->
+                                <xsl:text> </xsl:text>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </td>
+                </xsl:if>
+
+                <!-- The chapter/page icon -->
+                <td>
+                    <img>
+                        <xsl:if test="not(documentNode)">
+                            <xsl:attribute name="class">leafNode</xsl:attribute>
+                        </xsl:if>
+
+                        <xsl:attribute name="src">
+                            <xsl:choose>
+                                <xsl:when test="not(documentNode)">
+                                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'page_image')"/> 
+                                </xsl:when>
+                                <xsl:otherwise>
+                                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'chapter_image')"/>
+                                </xsl:otherwise>
+                            </xsl:choose>
+                        </xsl:attribute>
+                    </img>
+                </td>
+
+                <!-- The section name, links to the section in the document -->
+                <td class="tocTextCell">
+                    <a id="toclink{@nodeID}" href="javascript:focusSection('{@nodeID}');">
+                        <xsl:if test="util:hashToSectionId(@nodeID)">
+                            <span class="tocSectionNumber">
+                                <xsl:value-of select="util:hashToSectionId(@nodeID)"/><!--<xsl:text> </xsl:text>-->
+                            </span>
+                        </xsl:if>
+                        <span class="tocSectionTitle">
+                            <xsl:call-template name="sectionHeading"/>
+                        </span>
+                    </a>
+                </td>
+            </tr>
+        </table>
+
+        <!-- display any child items -->
+        <xsl:if test="documentNode">
+            <div id="toc{@nodeID}">
+                <xsl:attribute name="style">
+                    <xsl:choose>
+                        <xsl:when test="/page/pageRequest/paramList/param[@name = 'ed']/@value = '1' or /page/pageResponse/document/@selectedNode = @nodeID">
+                            <xsl:text>display:block;</xsl:text>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <xsl:text>display:none;</xsl:text>
+                        </xsl:otherwise>
+                    </xsl:choose>
+                </xsl:attribute>
+                <xsl:for-each select="documentNode">
+                    <xsl:call-template name="documentNodeTOC"/>
+                </xsl:for-each>
+            </div>
+        </xsl:if>
+    </xsl:template>
+
+    <xsl:template name="viewOptions">
+        <div id="viewAndZoomOptions" class="ui-state-default ui-corner-all">
+            <ul id="viewOptions">
+                <!-- Paged-image document options -->
+                <xsl:if test="count(//documentNode/metadataList/metadata[@name = 'Screen']) > 0 or /page/pageResponse/document/@docType = 'paged' or /page/pageResponse/document/@docType = 'pagedhierarchy'">
+                    <!-- view selection option -->
+                    <xsl:if test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='viewSelection']) or /page/pageResponse/format[@type='display']/gsf:option[@name='viewSelection']/@value='true'">
+                        <li id="pagedImageOptions">
+                            <select id="viewSelection" onchange="changeView();">
+                                <xsl:choose>
+                                    <xsl:when test="/page/pageRequest/paramList/param[@name = 'view']/@value = 'image'">
+                                        <option>
+                                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.default_view')"/>
+                                        </option>
+                                        <option selected="true">
+                                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.image_view')"/>
+                                        </option>
+                                        <option>
+                                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.text_view')"/>
+                                        </option>
+                                    </xsl:when>
+                                    <xsl:when test="/page/pageRequest/paramList/param[@name = 'view']/@value = 'text'">
+                                        <option>
+                                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.default_view')"/>
+                                        </option>
+                                        <option>
+                                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.image_view')"/>
+                                        </option>
+                                        <option selected="true">
+                                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.text_view')"/>
+                                        </option>
+                                    </xsl:when>
+                                    <xsl:otherwise>
+                                        <option selected="true">
+                                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.default_view')"/>
+                                        </option>
+                                        <option>
+                                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.image_view')"/>
+                                        </option>
+                                        <option>
+                                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.text_view')"/>
+                                        </option>
+                                    </xsl:otherwise>
+                                </xsl:choose>
+                            </select>
+                        </li>
+                    </xsl:if>
+
+                    <!-- Slide-show options -->
+                    <xsl:if test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='slideShow']) or /page/pageResponse/format[@type='display']/gsf:option[@name='slideShow']/@value='true'">
+                        <li id="slideShowOptions">
+                            <xsl:attribute name="title">
+                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.slideshowTooltip')"/>
+                            </xsl:attribute>
+                            <img onclick="showSlideShow()">
+                                <xsl:attribute name="src">
+                                    <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'slideshow_image')"/>
+                                </xsl:attribute>
+                            </img>
+                        </li>
+                    </xsl:if>
+                </xsl:if>
+                <!-- Realistic books link -->
+                <xsl:if test="/page/pageResponse/collection[@name = $collName]/metadataList/metadata[@name = 'tidyoption'] = 'tidy'">
+                    <li>
+                        <xsl:attribute name="title">
+                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.realisticBooksTooltip')"/>
+                        </xsl:attribute>
+                        <img id="rbOptionImage" onclick="bookInit();">
+                            <xsl:attribute name="src">
+                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'realistic_books_image')"/>
+                            </xsl:attribute>
+                        </img>
+                        <input id="rbOption" type="checkbox" onclick="bookInit();" class="optionCheckBox"/>
+                    </li>
+                </xsl:if>
+
+                <!-- Highlight on/off button -->
+                <xsl:if test="util:contains(/page/pageRequest/paramList/param[@name = 'p.s']/@value, 'Query') and not(metadataList/metadata[@name='NoText']) and not(/page/pageResponse/format[@type='display']/gsf:option[@name='disableSearchTermHighlighting']/@value='true')">
+                    <li>
+                        <xsl:attribute name="title">
+                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.highlightTooltip')"/>
+                        </xsl:attribute>
+                        <img onclick="swapHighlight(true);">
+                            <xsl:attribute name="src">
+                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'highlight_image')"/>
+                            </xsl:attribute>
+                        </img>
+                        <input id="highlightOption" type="checkbox" class="optionCheckBox" onclick="swapHighlight(false);">
+                            <xsl:if test="not(/page/pageRequest/paramList/param[@name = 'hl']/@value = 'off')">
+                                <xsl:attribute name="checked">checked</xsl:attribute>
+                            </xsl:if>
+                        </input>
+                    </li>
+                </xsl:if>
+                <xsl:text> </xsl:text>
+
+                <!-- Zoom on/off button -->
+                <xsl:if test="not(/page/pageResponse/format[@type='display']/gsf:option[@name='disableZoom']) or /page/pageResponse/format[@type='display']/gsf:option[@name='disableZoom']/@value='false'">
+                    <li id="zoomOptions" style="display:none;">
+                        <xsl:attribute name="title">
+                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.zoomTooltip')"/>
+                        </xsl:attribute>
+                        <img id="zoomToggleImage">
+                            <xsl:attribute name="src">
+                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'zoom_image')"/>
+                            </xsl:attribute>
+                        </img>
+                        <input id="zoomToggle" type="checkbox"/>
+                        <script type="text/javascript">
+                            <xsl:text disable-output-escaping="yes">
+                                $("#zoomToggle").change(function()
+                                {
+                                    _imageZoomEnabled = $("#zoomToggle").prop("checked");
+                                });
+                                
+                                $("#zoomToggleImage").on("click", function()
+                                {
+                                    $("#zoomToggle").prop("checked", !$("#zoomToggle").prop("checked"));
+                                    _imageZoomEnabled = $("#zoomToggle").prop("checked");
+                                });
+                            </xsl:text>
+                        </script>
+                    </li>
+                </xsl:if>
+
+                <!-- Floating TOC on/off button -->
+                <xsl:if test="count(//documentNode) > 0 and (not(/page/pageResponse/format[@type='display']/gsf:option[@name='TOC']) or /page/pageResponse/format[@type='display']/gsf:option[@name='TOC']/@value='true')">
+                    <li id="floatingTOCOptions">
+                        <xsl:attribute name="title">
+                            <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'doc.floatingTooltip')"/>
+                        </xsl:attribute>
+                        <img id="floatTOCToggleImage">
+                            <xsl:attribute name="src">
+                                <xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'float_toc_image')"/>
+                            </xsl:attribute>
+                        </img>
+                        <input id="floatTOCToggle" type="checkbox"/>
+                        <script type="text/javascript">
+                            <xsl:text disable-output-escaping="yes">
+                                $("#floatTOCToggle").prop("checked", false);
+                                $("#floatTOCToggle").on("click", function()
+                                {
+                                    floatMenu($("#floatTOCToggle").prop("checked"));
+                                });
+                                
+                                $("#floatTOCToggleImage").on("click", function()
+                                {
+                                    $("#floatTOCToggle").prop("checked", !$("#floatTOCToggle").prop("checked"))
+                                    floatMenu($("#floatTOCToggle").prop("checked"));
+                                });
+                            </xsl:text>
+                        </script>
+                    </li>
+                    <xsl:if test="/page/pageRequest/paramList/param[@name='ftoc']/@value = '1'">
+                        <script type="text/javascript">
+                            <xsl:text disable-output-escaping="yes">
+                                $(window).on("load", function()
+                                {
+                                    $("#floatTOCToggle").prop("checked", true);
+                                    floatMenu(true);
+                                });
+                            </xsl:text>
+                        </script>
+                    </xsl:if>
+                </xsl:if>
+            </ul>
+            <div style="clear:both;">
+                <xsl:text> </xsl:text>
+            </div>
+        </div>
+    </xsl:template>
 </xsl:stylesheet>

main/trunk/greenstone3/web/interfaces/default_wip/transform/pages/authen.xsl

@@ -120 +120 @@
                                                 var </xsl:text><xsl:value-of select="$message-pos"/><xsl:text disable-output-escaping="yes"> = "</xsl:text><xsl:value-of select="util:getInterfaceText($interface_name, /page/@lang, 'authen.delete_warning')"/><xsl:text disable-output-escaping="yes">" + </xsl:text><xsl:value-of select="$user-pos"/><xsl:text disable-output-escaping="yes"> + "?";
                                                 var button = $("#delUser" + </xsl:text><xsl:value-of select="$user-pos"/><xsl:text disable-output-escaping="yes">);
-                                                button.click(function()
+                                                button.on("click", function()
                                                 {
                                                     if(confirm(</xsl:text><xsl:value-of select="$message-pos"/><xsl:text disable-output-escaping="yes">))
@@ -472 +472 @@
         <script type="text/javascript">
           <xsl:text disable-output-escaping="yes">
-            $("#submitButton").click(function()
+            $("#submitButton").on("click", function()
             {
               var passwordOne = $("#passwordOne");

main/trunk/greenstone3/web/interfaces/default_wip/transform/pages/classifier.xsl

@@ -31 +31 @@
       <xsl:text></xsl:text>
     </script>
-    <script type="text/javascript">$(window).load(openStoredClassifiers);</script>
+    <script type="text/javascript">$(window).on("load", openStoredClassifiers);</script>
 
     <!-- 

main/trunk/greenstone3/web/interfaces/default_wip/transform/pages/document.xsl

@@ -366 +366 @@
                 <xsl:text disable-output-escaping="yes">
 
-                    $(window).load(function()
+                    $(window).on("load", function()
                     {
                         if(gs.cgiParams.docEdit == "1")
@@ -518 +518 @@
                 <script type="text/javascript">
                     <xsl:text disable-output-escaping="yes">
-                        $(window).load(function()
+                        $(window).on("load", function()
                         {
                             var sectionID = gs.cgiParams.d;
@@ -554 +554 @@
                 <script type="text/javascript">
                     <xsl:text disable-output-escaping="yes">
-                        $(window).load(function()
+                        $(window).on("load", function()
                         {
                             loadTopLevelPage(function()

main/trunk/greenstone3/web/interfaces/default_wip/transform/pages/pref.xsl

@@ -106 +106 @@
             
             YAHOO.util.Event.addListener(window, 'load', pageLoad);
-            $(window).bind("beforeunload", unsavedChanges);
+            $(window).on("beforeunload", unsavedChanges);
         </xsl:text></script>
     </xsl:template>

main/trunk/greenstone3/web/interfaces/default_wip/transform/pages/verify.xsl

@@ -72 +72 @@
             type: 'POST',
             data: $('#verifyform').serialize(),
-            success: function(){
+            done: function(){
             window.location.href='</xsl:text><xsl:value-of select="$URL"/><xsl:text disable-output-escaping="yes">';
             }