Changeset 38003 for main/trunk/greenstone3/web

Timestamp:

2023-09-04T14:59:06+12:00 (9 months ago)

Author:

kjdon

Message:

updates to handle having horizontal a-z lists inside a vertical bookshelf. now we open the sections in a more similar way to the bookshelves. opening in place, and keeping the rest of the bookshelves visible

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/classifier_scripts.js (modified) (7 diffs)
• transform/pages/classifier.xsl (modified) (6 diffs)
• transform/shared-templates.xsl (modified) (2 diffs)

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

@@ -18 +18 @@
     var sectionToggle = gs.jqGet("toggle" + sectionID);
     
-    if(sectionToggle == undefined)
+    if(sectionToggle.length === 0)
     {
         return;
@@ -36 +36 @@
             sectionToggle.attr("src", gs.imageURLs.expand);
 
-            if(openClassifiers[sectionID].length !== 0) //if(openClassifiers[sectionID] != undefined)
+            if(openClassifiers[sectionID] != undefined && openClassifiers[sectionID].length !== 0)
             {
                 delete openClassifiers[sectionID];
@@ -57 +57 @@
     else
     {
-        httpBrowseRequest(sectionID);
-    }
+        httpBrowseRequest(sectionID, "vlist");
+    }
+}
+
+function toggleHListSection(sectionID)
+{
+
+    var parentID = getParentID(sectionID);
+    var section = document.getElementById('div' + sectionID);
+    var parent = document.getElementById('classifiernodelist'+parentID);
+    if (parent === null) {
+    console.log("couldn't find parent for "+sectionID);
+    return;
+    }
+    if(section != null) {
+    
+    
+    var expanding = false;
+    var sectionTitle = document.getElementById("title"+sectionID);
+    if(isExpanded(sectionID))
+    {
+        expanding = false;
+        section.style.display = "none";
+
+        sectionTitle.classList.remove("selectedHorizontalClassifierNode");
+        if(openClassifiers[sectionID] != undefined && openClassifiers[sectionID].length !== 0)
+        {
+        delete openClassifiers[sectionID];
+        }
+    }
+    else
+    {
+        expanding = true;
+        section.style.display="block";
+        sectionTitle.classList.add("selectedHorizontalClassifierNode");
+        openClassifiers[sectionID] = true;  
+    }
+    updateOpenClassifiers();
+    if(typeof mapEnabled !== 'undefined' /*&& mapEnabled*/){
+        //console.log("Classifier scripts -> updateMap()");
+        toggleMapSection({"expand": expanding, "nodeID": sectionID});
+        updateMap();
+    }
+    }
+    else
+    {
+    // get teh content of the section
+    httpBrowseRequest(sectionID, "hlist");
+    }
+    // now hide the one that was already displayed (if any)
+    var children = parent.querySelectorAll('.childrenlist');
+    for (var i = 0; i < children.length; i++) {
+    var child = children[i];
+    var cid = child.id.substring(3); // remove 'div' from the id so we can get the section id
+    if (cid != sectionID) {
+        child.style.display="none";
+        var childTitle = document.getElementById('title'+cid);
+        childTitle.classList.remove("selectedHorizontalClassifierNode");
+        delete openClassifiers[cid];
+    }
+    }
+    updateOpenClassifiers();
+
 }
 
@@ -118 +179 @@
 }
 
-function httpBrowseRequest(sectionID)
+function getParentID(sectionID) {
+    if (sectionID.lastIndexOf(".") != -1) {
+    return sectionID.substring(0, sectionID.lastIndexOf("."));
+    }
+    return sectionID;
+}
+
+function httpBrowseRequest(sectionID, listType)
 {
     if(!inProgress[sectionID])
     {
-        inProgress[sectionID] = true;
-        
+        inProgress[sectionID] = true;
+
+        if (listType != "hlist") {
         var sectionToggle = gs.jqGet("toggle" + sectionID);
         sectionToggle.attr("src", gs.imageURLs.loading);
-        
+        }
         var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/browse/" + sectionID.replace(/\./g, "/") + "?excerptid=div" + sectionID;
 
-        if(gs.cgiParams.berrybasket == "on")
-        {
-            url = url + "&berrybasket=on";
-        } 
         if(gs.cgiParams.favouritebasket == "on")
         {
@@ -146 +211 @@
         .done(function(data)
         {
-            var newDiv = $("<div>");                                        
+            var newDiv = $("<div>");
+            if (listType == "hlist") {
+            var parent = gs.jqGet("classifiernodelist"+getParentID(sectionID));
+            var title = gs.jqGet("title"+sectionID);
+            title.addClass("selectedHorizontalClassifierNode");
+            parent.append(newDiv);
+
+            } else {
             var sibling = gs.jqGet("title" + sectionID);
-            sibling.after(newDiv);
+                sibling.after(newDiv);
+            sectionToggle.attr("src", gs.imageURLs.collapse);
+
+            }
+            newDiv.html(data);
             
-            newDiv.html(data);
-            sectionToggle.attr("src", gs.imageURLs.collapse);
             openClassifiers[sectionID] = true;  
             
-            if(gs.cgiParams.berrybasket == "on")
-            {
-                    berryCheckout();
-            }
             if(gs.cgiParams.favouritebasket == "on")
             {
@@ -172 +242 @@
         })
         .fail(function()
-        {
-            sectionToggle.attr("src", gs.imageURLs.expand);
+              {
+              if (listType != "hlist") {
+                  sectionToggle.attr("src", gs.imageURLs.expand);
+              }
         })
         .always(function()
@@ -180 +252 @@
             busy = false;
         });
-    }
-}
+        }
+             
+}

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

@@ -85 +85 @@
         </xsl:when>
         <xsl:otherwise>
-          <table id="classifiernodelist">
+      <table class="childrenlist" id="div{@nodeID}">
+        
+          <!--<table id="classifiernodelist">-->
             <xsl:text> </xsl:text>
             <xsl:call-template name="processNodeChildren">
@@ -103 +105 @@
       <xsl:value-of select="/page/pageRequest/paramList/param[@name = 'cl']/@value" />
     </xsl:variable>
+
     <ul class="horizontalContainer">
       <xsl:for-each select='classifierNode'>
-        <li>
+        <li id="title{@nodeID}">
           <xsl:attribute name="class">
-            <xsl:if test="$selectedNode = @nodeID or starts-with($selectedNode, concat(@nodeID, '.')) or (not(contains($selectedNode, '.')) and @nodeID = concat($selectedNode, '.1'))">selectedHorizontalClassifierNode </xsl:if>
+<!--            <xsl:if test="$selectedNode = @nodeID or starts-with($selectedNode, concat(@nodeID, '.')) or (not(contains($selectedNode, '.')) and @nodeID = concat($selectedNode, '.1'))">selectedHorizontalClassifierNode </xsl:if>-->
+             <xsl:if test="$selectedNode = @nodeID or starts-with($selectedNode, concat(@nodeID, '.')) or (@nodeID = concat($selectedNode, '.1'))">selectedHorizontalClassifierNode </xsl:if>
             <xsl:text>horizontalClassifierNode</xsl:text>
           </xsl:attribute>
@@ -129 +133 @@
       </xsl:when>
       <xsl:otherwise>
-        <table id="classifiernodelist">
-          <xsl:for-each select='classifierNode'>
+
+        <div id="classifiernodelist{@nodeID}">
+        <xsl:for-each select='classifierNode'>
+      <xsl:if test="classifierNode|documentNode">
+        <table class="childrenlist" id="div{@nodeID}">
             <xsl:call-template name="processNodeChildren">
               <xsl:with-param name='collName' select='$collName' />
               <xsl:with-param name='serviceName' select='$serviceName' />
             </xsl:call-template>
+        </table>
+      </xsl:if>
           </xsl:for-each>
-        </table>
+        </div>
       </xsl:otherwise>
     </xsl:choose>
@@ -225 +234 @@
                     <td>
                       <table class="childrenlist" id="div{@nodeID}">
-                        <xsl:apply-templates select='.' mode='process-all-children'>
+            
+            <xsl:apply-templates select='.' mode='process-all-children'>
                           <xsl:with-param name='collName' select='$collName' />
                           <xsl:with-param name='serviceName' select='$serviceName' />
@@ -280 +290 @@
     <xsl:choose>
       <xsl:when test="@childType = 'HList'">
+    <tr><td>
         <xsl:call-template name="HList">
           <xsl:with-param name='collName' select='$collName' />
           <xsl:with-param name='serviceName' select='$serviceName' />
         </xsl:call-template>
+      </td></tr>
       </xsl:when>
       <xsl:otherwise>
@@ -370 +382 @@
   -->
   <xsl:template match="classifierNode[@classifierStyle = 'HList']">
-    <gsf:link type="classifier" style="static">
+    <gsf:link type="classifier">
       <gsf:metadata name="Title" />
     </gsf:link>

main/trunk/greenstone3/web/interfaces/default/transform/shared-templates.xsl

@@ -178 +178 @@
     <xsl:when test="$link-type='static'">static</xsl:when>
     <xsl:when test="$link-type='javascript'">javascript</xsl:when>
-    <xsl:when test="@classifierStyle = 'HList'">static</xsl:when>
-    <xsl:when test="not(/page/pageResponse/format[@type='browse']/gsf:option[@name='turnstyleClassifiers']) or /page/pageResponse/format[@type='browse']/gsf:option[@name='turnstyleClassifiers']/@value='true'">javascript</xsl:when>
+    <xsl:when test="not(/page/pageResponse/format[@type='browse']/gsf:option[@name='turnstyleClassifiers']) or /page/pageResponse/format[@type='browse']/gsf:option[@name='turnstyleClassifiers']/@value='true'"><xsl:choose><xsl:when test="@classifierStyle = 'HList' and util:oidIsTopChild(@nodeID)">static</xsl:when><xsl:when test="@classifierStyle = 'HList'">hlistjavascript</xsl:when><xsl:otherwise>javascript</xsl:otherwise></xsl:choose></xsl:when>
     <xsl:otherwise>static</xsl:otherwise>
       </xsl:choose>
@@ -187 +186 @@
     <xsl:value-of select='$library_name'/>/collection/<xsl:value-of select='/page/pageResponse/collection/@name'/>/browse/<xsl:choose><xsl:when test="$node-id"><xsl:value-of select="$node-id"/></xsl:when><xsl:otherwise><xsl:value-of select='util:replace(@nodeID, ".", "/")'/></xsl:otherwise></xsl:choose>
       </xsl:when>
+      <xsl:when test="$final-link-type='hlistjavascript'">javascript:toggleHListSection('<xsl:value-of select="@nodeID"/>');</xsl:when>
       <xsl:otherwise>javascript:toggleSection('<xsl:value-of select="@nodeID"/>');</xsl:otherwise>
     </xsl:choose>