Author: michiel
Date: 2010-03-22 11:30:21 +0100 (Mon, 22 Mar 2010)
New Revision: 41553

Modified:
   
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
   
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
Log:
better work with relative URL's

Modified: 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
===================================================================
--- 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
     2010-03-22 09:22:03 UTC (rev 41552)
+++ 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
     2010-03-22 10:30:21 UTC (rev 41553)
@@ -2,6 +2,7 @@
     xmlns:jsp="http://java.sun.com/JSP/Page";
     xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
     xmlns:c="http://java.sun.com/jsp/jstl/core";
+    xmlns:fn="http://java.sun.com/jsp/jstl/functions";
     xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
     version="2.0"
     >
@@ -9,13 +10,30 @@
       @author Michiel Meeuwissen
       @version $Id$
   -->
+
   <jsp:directive.tag
-      example="See /mmexamples/searchrelate"
-      description="" />
+      description="This tag is meant to be used as a child of mm-sr:toggle. 
Using the 'page'
+                   attribute you specify what must be shown when the toggled 
block is expanded.
+                   The point is that it is only loaded at the first time that 
happens. This may be useful
+                   if the items itself contain mm-sr-relatednodes tags and 
loading everyting at once may
+                   become somewhat costly. That can be avoided by 
lazy-loading."
+      />
+
+
   <jsp:directive.attribute name="page" required="true" />
+  <jsp:directive.include file="/mmbase/searchrelate/list/parameters.jspf" />
 
+  <c:choose>
+    <c:when test="${fn:indexOf(page, '/') eq 0}">
+      <mm:import id="absolutehref">${page}</mm:import>
+    </c:when>
+    <c:otherwise>
+      <mm:import 
id="absolutehref">${mm:directory(parameters.referrer)}/${page}</mm:import>
+    </c:otherwise>
+  </c:choose>
+
   <div class="unloaded">
-    <mm:link  page="${page}" absolute="context">
+    <mm:link  page="${absolutehref}" absolute="context">
       <a href="${_}" class="lazyloading node_${_node}">
         <img class='loader icon' 
src="${mm:link('/mmbase/style/ajax-loader.gif')}" />
       </a>

Modified: 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
===================================================================
--- 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
     2010-03-22 09:22:03 UTC (rev 41552)
+++ 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/relatednodes.tagx
     2010-03-22 10:30:21 UTC (rev 41553)
@@ -268,10 +268,16 @@
     <mm:import from="session" id="order" externid="${rid}_order" />
 
     <mm:import 
id="language">${requestScope['javax.servlet.jsp.jstl.fmt.locale.request']}</mm:import>
-    <mm:import id="referrer"><mm:url absolute="context" /></mm:import>
+    <mm:import id="referrer">
+      <c:choose>
+        <c:when test="${! empty 
parent}"><jsp:text>${parentparameters.referrer}</jsp:text></c:when>
+        <c:otherwise><mm:url absolute="context" /></c:otherwise>
+      </c:choose>
+    </mm:import>
     <mm:import id="fieldlistidprefix">${rid}_N${mm:escape('identifier', 
_node)}</mm:import>
     <mm:import id="source_was_new">${_node.number lt 0}</mm:import>
     <mm:import id="_number">${_node._number}</mm:import>
+
   </mm:context>
 
   <mm:import from="session" id="parameters" externid="${rid}_context" />

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to