Changeset 25441

Timestamp:

2012-04-19T16:12:29+12:00 (12 years ago)

Author:

sjm84

Message:

Some changes to fix paged images

File:

• main/trunk/greenstone3/web/interfaces/oran/js/document_scripts.js (modified) (17 diffs)

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

@@ -17 +17 @@
     template += '<xsl:template match="/">';
     template +=   '<text>';
-    template +=     '<xsl:apply-templates select="/page/pageResponse/document//documentNode[@nodeID = \'' + sectionID + '\']" mode="document"/>';
+    template +=     '<xsl:for-each select="/page/pageResponse/document//documentNode[@nodeID = \'' + sectionID + '\']">';
+    template +=       '<xsl:call-template name="sectionImage"/>';
+    template +=       '<div id="text' + sectionID + '">';
+    template +=         '<xsl:apply-templates select="." mode="document"/>';
+    template +=       '</div>';
+    template +=     '</xsl:for-each>';
     template +=   '</text>';
     template += '</xsl:template>';
@@ -65 +70 @@
     template += '<xsl:template match="/">';
     template +=   '<sections>';
-    template +=     '<xsl:for-each select="/page/pageResponse/document//documentNode[@nodeID = \'' + sectionID + '\']">';
+    template +=     '<xsl:for-each select="/page/pageResponse/document//documentNode[@nodeID = \'' + sectionID + '\']/documentNode">';
     template +=       '<xsl:call-template name="wrapDocumentNodes"/>';
     template +=     '</xsl:for-each>';
@@ -81 +86 @@
             if(response)
             {
-                var sectionsStart = response.indexOf(">") + 1;
+                var sectionsStart = response.indexOf(">", response.indexOf(">") + 1) + 1;
                 var sectionsEnd = response.lastIndexOf("<");
                 
@@ -107 +112 @@
 }
 
-function toggleSection(sectionID, callback)
+function toggleSection(sectionID, callback, tocDisabled)
 {
     var docElem = document.getElementById("doc" + sectionID);
@@ -117 +122 @@
     if(docElem.style.display == "none")
     {
-        if(tocToggleElem)
+        if(tocToggleElem && !tocDisabled)
         {
             tocToggleElem.setAttribute("src", gs.imageURLs.collapse);
         }
         
-        if(tocElem)
+        if(tocElem && !tocDisabled)
         {
             tocElem.style.display = "block";
@@ -148 +153 @@
                                 callback(true);
                             }
+                            
+                            if(document.getElementById("viewSelection"))
+                            {
+                                changeView();
+                            }
                         }
                         else
@@ -211 +221 @@
 }
 
-function focusSection(sectionID, level)
+function focusSection(sectionID, level, tocDisabled)
 {
     if(!level)
@@ -243 +253 @@
             if(success)
             {
-                focusSection(sectionID, level + 1);
-            }
-        });
+                focusSection(sectionID, level + 1, tocDisabled);
+            }
+        }, tocDisabled);
     }
     else
     {
-        focusSection(sectionID, level + 1);
+        focusSection(sectionID, level + 1, tocDisabled);
     }
 }
@@ -305 +315 @@
             }
         }
-        setTimeout(checkFunction, 500);
+        checkFunction();
     }
 }
@@ -313 +323 @@
     var ajax = gs.functions.ajaxRequest();
     
-    ajax.open("GET", gs.xsltParams.library_name + "?a=d&dt=hierarchy&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d.replace(/([\.]*)\..*/, "$1") + "&excerptid=gs-document", true);
+    ajax.open("GET", gs.xsltParams.library_name + "?a=d&dt=hierarchy&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d.replace(/([^.]*)\..*/, "$1") + "&excerptid=gs-document", true);
     ajax.onreadystatechange = function()
     {
@@ -368 +378 @@
             var tocElem = document.getElementById("tableOfContents");
             tocElem.innerHTML = newTOC;
+            
+            gs.variables.tocLoaded = true;
         }
         else if(ajax.readyState == 4)
@@ -528 +540 @@
 function retrieveTableOfContentsAndTitles()
 {
+    var ilt = "";
+    ilt += '<xsl:template match="/">';
+    ilt +=   '<xsl:apply-templates select="/page/pageResponse/document/documentNode" mode="TOC"/>';
+    ilt += '</xsl:template>';
+
     var ajax = gs.functions.ajaxRequest();
-    
-    ajax.open("GET", gs.xsltParams.library_name + "?a=d&ed=1&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&excerptid=tableOfContents");
+    ajax.open("GET", gs.xsltParams.library_name + "?a=d&ed=1&c=" + gs.cgiParams.c + "&d=" + gs.cgiParams.d + "&ilt=" + ilt.replace(/ /g, "%20"), true);
     ajax.onreadystatechange = function()
     {
         if(ajax.readyState == 4 && ajax.status == 200)
         {
-            document.getElementById("contentsArea").innerHTML = document.getElementById("contentsArea").innerHTML + ajax.responseText;
+            document.getElementById("tableOfContents").innerHTML = ajax.responseText;
             replaceLinksWithSlider();
             var loading = document.getElementById("tocLoadingImage");
@@ -590 +606 @@
         leafSections[i].parentNode.insertBefore(widget.getElem(), leafSections[i]);
     }
-}
-
-function changePage(href)
-{
-    var ajax = new gs.functions.ajaxRequest();
-    ajax.open("GET", href + "&excerptid=gs-document");
-    ajax.onreadystatechange = function()
-    {
-        if(ajax.readyState == 4 && ajax.status == 200)
-        {
-            var contentElem = document.getElementById("gs-document");
-            contentElem.innerHTML = ajax.responseText;
-            
-            for(var i = 0; i < _onCells.length; i++)
-            {
-                cells[i].cell.style.border = "";
-            }
-            _onCells = new Array;
-            
-            if(_linkCellMap[href])
-            {
-                cells = _linkCellMap[href];
-                for(var i = 0; i < cells.length; i++)
-                {
-                    cells[i].cell.style.border = "3px red solid";
-                    _onCells.push(cells[i]);
-                }
-            }
-        }
-    }
-    ajax.send();
+    
+    //Disable all TOC toggles
+    var imgs = document.getElementsByTagName("IMG");
+    for(var j = 0; j < imgs.length; j++)
+    {
+        var currentImage = imgs[j];
+        if(currentImage.getAttribute("id") && currentImage.getAttribute("id").search(/^ttoggle/) != -1)
+        {
+            currentImage.setAttribute("onclick", "");
+        }
+        else if(currentImage.getAttribute("id") && currentImage.getAttribute("id").search(/^dtoggle/) != -1)
+        {
+            currentImage.setAttribute("onclick", currentImage.getAttribute("onclick").replace(/\)/, ", null, true)"));
+        }
+    }
 }
 
@@ -730 +730 @@
 
         var href = page.getAttribute("href");
+        var startHREF = href.indexOf("'") + 1;
+        var endHREF = href.indexOf("'", startHREF);
+        var nodeID = href.substring(startHREF, endHREF);
+        href = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + nodeID;
+        
         var template = '';
         template += '<xsl:template match="/">';
+        template +=   '<gsf:metadata name=\"Thumb\"/>';
         template +=   '<html>';
         template +=     '<img>';
@@ -739 +745 @@
         template +=         "<xsl:value-of disable-output-escaping=\"yes\" select=\"/page/pageResponse/document/metadataList/metadata[@name = 'assocfilepath']\"/>";
         template +=         '<xsl:text>/</xsl:text>';
-        template +=         "<xsl:value-of disable-output-escaping=\"yes\" select=\"/page/pageResponse/document/documentNode/metadataList/metadata[@name = 'Thumb']\"/>";
+        template +=         "<xsl:value-of disable-output-escaping=\"yes\" select=\"/page/pageResponse/document//documentNode[@nodeID = '" + nodeID + "']/metadataList/metadata[@name = 'Thumb']\"/>";
         template +=       '</xsl:attribute>';
         template +=     '</img>';
@@ -747 +753 @@
         template +=   '</html>';
         template += '</xsl:template>';
-        ajax.open("GET", href + "&ilt=" + template.replace(" ", "%20"));
+
+        ajax.open("GET", href + "?ilt=" + template.replace(" ", "%20"));
         ajax.onreadystatechange = function()
         {
@@ -842 +849 @@
         _links[i].link = link;
         var href = _links[i].getAttribute("href");
-        link.setAttribute("href", "javascript:changePage(\"" + href + "\");");
+        link.setAttribute("href", href.replace(/\)/, ", 0, true)"));
         
         if(!_linkCellMap[href])