Changeset 31938 for main/trunk/greenstone3/web/interfaces

Timestamp:

2017-09-06T22:27:36+12:00 (7 years ago)

Author:

Georgiy Litvinov

Message:

Prevent downloading all images in collapsed image collections

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/document_scripts.js (modified) (1 diff)
• transform/pages/document.xsl (modified) (2 diffs)

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

@@ -53 +53 @@
     }
     
-    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + sectionID + "?hl=" + hl + "&p.s=TextQuery&ilt=" + template.replace(" ", "%20");
+    var url = gs.xsltParams.library_name + "/collection/" + gs.cgiParams.c + "/document/" + sectionID + "?ed=1&hl=" + hl + "&p.s=TextQuery&ilt=" + template.replace(" ", "%20");
     
     $.ajax(url)

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

@@ -536 +536 @@
         <xsl:choose>
             <xsl:when test="metadataList/metadata[@name = 'Screen'] and metadataList/metadata[@name = 'SourceFile'] and ($imageWidth div $screenImageWidth > 1.2) and (not(/page/pageResponse/format[@type='display']/gsf:option[@name='disableZoom']) or /page/pageResponse/format[@type='display']/gsf:option[@name='disableZoom']/@value='false')">
+                
                 <div id="image{@nodeID}">
+                <xsl:if test="/page/pageRequest/paramList/param[@name = 'ed']/@value='1'">
+                
                     <div id="wrap{util:replace(@nodeID, '.', '_')}" class="zoomImage" style="position:relative; width: {$screenImageWidth}px; height: {$screenImageHeight}px;">
                         <div id="small{util:replace(@nodeID, '.', '_')}" style="position:relative; width: {$screenImageWidth}px; height: {$screenImageHeight}px;">
@@ -575 +578 @@
                         </xsl:text>
                     </script>
+                </xsl:if>
                 </div>
             </xsl:when>