Changeset 25728

Timestamp:

2012-05-31T14:36:33+12:00 (12 years ago)

Author:

sjm84

Message:

Some fixes to make berry baskets work (again)

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/berrybasket/berrybasket.js (modified) (3 diffs)
• js/berrybasket/berrycheckout.js (modified) (2 diffs)
• js/berrybasket/ygDDPlayer.js (modified) (1 diff)
• transform/classifiertools.xsl (modified) (2 diffs)

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

@@ -20 +20 @@
     
     var request_type = "GET";
-    var url = "?a=pr&rt=r&ro=1&s=ItemNum&o=XML&hhf=[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]&c=";
+    var url = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=ItemNum&o=XML&hhf=[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]&c=";
 
     var responseSuccess = function(o){
@@ -244 +244 @@
     
     fullView.appendChild(document.createTextNode('Full View »'));
-    fullView.setAttribute("href","?a=g&sa=berry&c=&s=DisplayList&rt=r&p.c=" + collectionName);
+    fullView.setAttribute("href",gs.xsltParams.library_name + "?a=g&sa=berry&c=&s=DisplayList&rt=r&p.c=" + collectionName);
     fullView.setAttribute("id","berryFullViewLink");
 
@@ -292 +292 @@
 
 function addBerry(el){
-    var addurl = "?a=pr&rt=r&ro=1&s=AddItem&c=&s1.id=2&o=XML&hhf=[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]&s1.item=" + el.id;
+    var addurl = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=AddItem&c=&s1.id=2&o=XML&hhf=[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]&s1.item=" + el.id;
 
     var addSuccess = function(o){

main/trunk/greenstone3/web/interfaces/default/js/berrybasket/berrycheckout.js

@@ -149 +149 @@
         li.appendChild(img);
         
-        a.href ="?a=d&c="+doc['collection']+"&d="+doc['name'];
+        a.href =gs.xsltParams.library_name + "?a=d&c="+doc['collection']+"&d="+doc['name'];
         
         if(window.interfaceName && window.interfaceName == "dev")
@@ -397 +397 @@
 
 function sendMail(){
-    var url = "?a=pr&rt=r&ro=1&s=SendMail&c=";
+    var url = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=SendMail&c=";
     var request_type = "POST";
     var postdata = "";

main/trunk/greenstone3/web/interfaces/default/js/berrybasket/ygDDPlayer.js

@@ -124 +124 @@
 
 var request_type = "GET";
-var addurlPath ="?a=pr&rt=r&ro=1&s=AddItem&c=&s1.id=2&o=XML&hhf=[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]&s1.item=";
-var delurlPath ="?a=pr&rt=r&ro=1&s=DeleteItem&c=&o=XML&hhf=[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]&s1.item=";
+var addurlPath = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=AddItem&c=&s1.id=2&o=XML&hhf=[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]&s1.item=";
+var delurlPath = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=DeleteItem&c=&o=XML&hhf=[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]&s1.item=";
 var postdata = null;
 

main/trunk/greenstone3/web/interfaces/default/transform/classifiertools.xsl

@@ -42 +42 @@
             <xsl:with-param name="serviceName" select="$serviceName"/>
         </xsl:apply-templates>
+        <!-- The berry (optional) -->
+        <td>
+            <xsl:call-template name="documentBerryForClassifierOrSearchPage"/>
+        </td>
         <xsl:call-template name="documentNodePost"/>
     </xsl:template>
@@ -50 +54 @@
         <xsl:param name="serviceName"/>
         <a href="{$library_name}?a=d&amp;c={$collName}&amp;d={@nodeID}&amp;dt={@docType}&amp;p.a=b&amp;p.s={$serviceName}"><xsl:apply-templates select="." mode="displayNodeIcon"/></a><xsl:value-of disable-output-escaping="yes"  select="metadataList/metadata[@name='Title']"/>
-        
-        <!-- The berry (optional) -->
-        <td>
-            <xsl:call-template name="documentBerryForClassifierOrSearchPage"/>
-        </td>
     </xsl:template>