Changeset 25728

Show
Ignore:
Timestamp:
31.05.2012 14:36:33 (7 years ago)
Author:
sjm84
Message:

Some fixes to make berry baskets work (again)

Location:
main/trunk/greenstone3/web/interfaces/default
Files:
4 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/default/js/berrybasket/berrybasket.js

    r25704 r25728  
    2020     
    2121    var request_type = "GET"; 
    22     var url = "?a=pr&rt=r&ro=1&s=ItemNum&o=XML&hhf=[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]&c="; 
     22    var url = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=ItemNum&o=XML&hhf=[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]&c="; 
    2323 
    2424    var responseSuccess = function(o){ 
     
    244244     
    245245    fullView.appendChild(document.createTextNode('Full View »')); 
    246     fullView.setAttribute("href","?a=g&sa=berry&c=&s=DisplayList&rt=r&p.c=" + collectionName); 
     246    fullView.setAttribute("href",gs.xsltParams.library_name + "?a=g&sa=berry&c=&s=DisplayList&rt=r&p.c=" + collectionName); 
    247247    fullView.setAttribute("id","berryFullViewLink"); 
    248248 
     
    292292 
    293293function addBerry(el){ 
    294     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; 
     294    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; 
    295295 
    296296    var addSuccess = function(o){ 
  • main/trunk/greenstone3/web/interfaces/default/js/berrybasket/berrycheckout.js

    r25704 r25728  
    149149        li.appendChild(img); 
    150150         
    151         a.href ="?a=d&c="+doc['collection']+"&d="+doc['name']; 
     151        a.href =gs.xsltParams.library_name + "?a=d&c="+doc['collection']+"&d="+doc['name']; 
    152152         
    153153        if(window.interfaceName && window.interfaceName == "dev") 
     
    397397 
    398398function sendMail(){ 
    399     var url = "?a=pr&rt=r&ro=1&s=SendMail&c="; 
     399    var url = gs.xsltParams.library_name + "?a=pr&rt=r&ro=1&s=SendMail&c="; 
    400400    var request_type = "POST"; 
    401401    var postdata = ""; 
  • main/trunk/greenstone3/web/interfaces/default/js/berrybasket/ygDDPlayer.js

    r25704 r25728  
    124124 
    125125var request_type = "GET"; 
    126 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="; 
    127 var delurlPath ="?a=pr&rt=r&ro=1&s=DeleteItem&c=&o=XML&hhf=[{\"name\":\"Cache-Control\", \"value\":\"no-cache\"}]&s1.item="; 
     126var 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="; 
     127var 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="; 
    128128var postdata = null; 
    129129 
  • main/trunk/greenstone3/web/interfaces/default/transform/classifiertools.xsl

    r25687 r25728  
    4242            <xsl:with-param name="serviceName" select="$serviceName"/> 
    4343        </xsl:apply-templates> 
     44        <!-- The berry (optional) --> 
     45        <td> 
     46            <xsl:call-template name="documentBerryForClassifierOrSearchPage"/> 
     47        </td> 
    4448        <xsl:call-template name="documentNodePost"/> 
    4549    </xsl:template> 
     
    5054        <xsl:param name="serviceName"/> 
    5155        <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']"/> 
    52          
    53         <!-- The berry (optional) --> 
    54         <td> 
    55             <xsl:call-template name="documentBerryForClassifierOrSearchPage"/> 
    56         </td> 
    5756    </xsl:template> 
    5857