Changeset 38964 for main/trunk/greenstone3/web/interfaces/default

Timestamp:

2024-04-30T18:49:50+12:00 (3 weeks ago)

Author:

anupama

Message:

Certain user-customised GLI Collage classifier options need to go into the pageResponse to be incorporated into the applet shim. 1. buildConfigxml.pm modified to push these options out into buildConfig.xml. 2. AbstractBrowse.java (classifier Service) has been modified to push out any classifier option subelements out into the pageResponse. 3. classifier.xsl has been modified to construct its applet HTML element's parameter elements taking into account any customised values in the pageResponse or using the old defaults for fallback. 4. The JavaScript code in webswing-collage.xsl doesn't have ready access to the pageResponse elements (this may need revisiting for if the applet element was accidentally removed from the page), but was already taking into account any applet parameters. webswing-collage.xsl has been modified to use any static/dynamic width and height attributes set on the applet parameter to reset the width and height on the div id=webswing-collage element, as webswing uses the dimensions set on the HTML element housing the webswing instance if running the instance as an applet. It does not resize the webswing applet thereafter. So the most transparent way to allow the user customised dimensions to control the dimensions of the webswing application as intended by the user, is to modify the dimensions set on the webswing-collage element's div before launching the webswing application.

Location:

main/trunk/greenstone3/web/interfaces/default/transform

Files:

• layouts/webswing-collage.xsl (modified) (1 diff)
• pages/classifier.xsl (modified) (6 diffs)

main/trunk/greenstone3/web/interfaces/default/transform/layouts/webswing-collage.xsl

@@ -164 +164 @@
        webswingParams["height"] = stripUnitOffAttribute("px", h);
 
-       
+       // Webswing only uses the width and height set on the webswing-collage element
+       // Override this with any dimensions set on any applet element, as that is user-controlled
+       // from GLI. style.setProperty failed without the important parameter to force the setting.
+       // https://stackoverflow.com/questions/5191478/changing-element-style-attribute-dynamically-using-javascript
+       document.getElementById("webswing-collage").style.setProperty("width", webswingParams["width"] + "px", "important");
+       document.getElementById("webswing-collage").style.setProperty("height", webswingParams["height"] + "px", "important");
+
        // Having collected all the webswingParams, we can finally build up the single webswing customArgs string
        var _args = "";

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

@@ -151 +151 @@
   <xsl:template name="collage-applet-shim">
     <!--<xsl:text>TODO: Here is the collage applet</xsl:text>-->
+    
     <!-- Copied from GS2.88's about.dm (document.dm has more applet params).
 
@@ -173 +174 @@
     id="collage-applet-element"
     code="org.greenstone.applet.GsdlCollageApplet.GsdlCollageApplet.class"
-    archive="GsdlCollageApplet.jar, webswing-api.jar"
-    width="800"
-    height="400">
+    archive="GsdlCollageApplet.jar, webswing-api.jar">
       <xsl:attribute name="codebase">/<xsl:value-of select="$servlet_context"/>/applet</xsl:attribute>
-
+      <xsl:choose>
+        <xsl:when test="option[@name='geometry']/@value">
+      <xsl:attribute name="width">
+        <xsl:value-of select="substring-before(option[@name='geometry']/@value, 'x')" />
+      </xsl:attribute>
+      <xsl:attribute name="height">
+        <xsl:value-of select="substring-after(option[@name='geometry']/@value, 'x')" />
+      </xsl:attribute>
+    </xsl:when>
+      </xsl:choose>
+      
       <!-- declaring some local variables -->
       <xsl:variable name="coll_name">
@@ -183 +192 @@
       </xsl:variable>
       <xsl:variable name="classifier">
-        <xsl:value-of select="/page/pageRequest/paramList/param[@name='cl']/@value"/>
+    <xsl:value-of select="/page/pageRequest/paramList/param[@name='cl']/@value"/>
       </xsl:variable>
       <xsl:variable name="fullURL">
-        <xsl:value-of select="/page/pageRequest/@fullURL"/>
+    <xsl:value-of select="/page/pageRequest/@fullURL"/>
       </xsl:variable>
       <xsl:variable name="url_protocol_prefix">
-        <xsl:value-of select="substring-before (/page/pageRequest/@fullURL,'/')"/>
-      </xsl:variable>
-
+    <xsl:value-of select="substring-before (/page/pageRequest/@fullURL,'/')"/>
+      </xsl:variable>
+      
       <!-- setting the applet parameters: first the dynamic ones -->
       
@@ -218 +227 @@
       
       <!-- applet parameters that can be manually adjusted -->
-      <param name="imageType" value=".jpg%.png" />     
+      <!--
+      <param name="imageType" value=".jpg%.png" />
       <param name="verbosity" value="3" />
       <param name="maxDepth" value="500"/>
@@ -225 +235 @@
       <param name="isJava2" value="auto"/> 
       <param name="bgcolor" value="#96c29a" />
-The Collage Applet.
-
+      -->
+      <!--<param name="imageType" value="{option[@name='imageType']/@value}" />-->
+      <xsl:call-template name="add-applet-param">
+    <xsl:with-param name="paramName">imageType</xsl:with-param>
+    <xsl:with-param name="paramDefaultValue">.jpg%.png</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="add-applet-param">
+    <xsl:with-param name="paramName">verbosity</xsl:with-param>
+    <xsl:with-param name="paramDefaultValue">3</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="add-applet-param">
+    <xsl:with-param name="paramName">maxDepth</xsl:with-param>
+    <xsl:with-param name="paramDefaultValue">500</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="add-applet-param">
+    <xsl:with-param name="paramName">maxDisplay</xsl:with-param>
+    <xsl:with-param name="paramDefaultValue">25</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="add-applet-param">
+    <xsl:with-param name="paramName">refreshDelay</xsl:with-param>
+    <xsl:with-param name="paramDefaultValue">1500</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="add-applet-param">
+    <xsl:with-param name="paramName">isJava2</xsl:with-param>
+    <xsl:with-param name="paramDefaultValue">auto</xsl:with-param>
+      </xsl:call-template>
+      <xsl:call-template name="add-applet-param">
+    <xsl:with-param name="paramName">bgcolor</xsl:with-param>
+    <xsl:with-param name="paramDefaultValue">#96c29a</xsl:with-param>
+      </xsl:call-template>      
+      The Collage Applet.      
    </applet>
   </xsl:template>
 
+  <!-- https://our.umbraco.com/forum/developers/xslt/9274-Return-Value-from-a-Template -->
+ <xsl:template name="add-applet-param">
+   <xsl:param name = "paramName" />
+   <xsl:param name = "paramDefaultValue" />
+   <param name="{$paramName}">
+     <xsl:attribute name="value">
+       <xsl:choose>
+         <xsl:when test="option[@name=$paramName]/@value">
+       <xsl:value-of select="option[@name=$paramName]/@value"/>
+     </xsl:when>
+         <xsl:otherwise>
+       <xsl:value-of select="$paramDefaultValue"/>
+     </xsl:otherwise>
+      </xsl:choose>
+     </xsl:attribute>
+   </param>
+ </xsl:template>
+ 
+  
   <xsl:template name="Collage_javascript_deprecated">
     <script type="text/javascript" src="interfaces/{$interface_name}/js/collage_scripts.js"><xsl:text> </xsl:text></script>
@@ -348 +406 @@
       <xsl:when test="@childType = 'Collage'">
     <xsl:choose>
-      <xsl:when test="not(*)">
+      <!--test of not(*) means has no children, not(classNode) has no subelements classNode-->
+      <xsl:when test="not(classifierNode)">
         <!-- the order of calling these templates now matters since the collage applet now
          serves as a shim in the javascript that gets loaded in the 2nd template call: