From mihxil at codespeak.net  Wed Dec  7 15:34:27 2011
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Wed,  7 Dec 2011 15:34:27 +0100 (CET)
Subject: [kupu-checkins] r80413 - kupu/trunk/kupu/mmbase
Message-ID: <20111207143427.14E82282B58@codespeak.net>

Author: mihxil
Date: Wed Dec  7 15:34:25 2011
New Revision: 80413

Modified:
   kupu/trunk/kupu/mmbase/Makefile
   kupu/trunk/kupu/mmbase/mmbase.kupu
Log:
support for absolute include of tools

Modified: kupu/trunk/kupu/mmbase/Makefile
==============================================================================
--- kupu/trunk/kupu/mmbase/Makefile	(original)
+++ kupu/trunk/kupu/mmbase/Makefile	Wed Dec  7 15:34:25 2011
@@ -19,7 +19,7 @@
 
 DEPLOY=scp://mmbase.org/home/tomcat/downloads/
 
-MVN=mvn
+MVN=mvn2
 
 #type in i18n: msginit -l <locale> -i messages.po
 

Modified: kupu/trunk/kupu/mmbase/mmbase.kupu
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.kupu	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.kupu	Wed Dec  7 15:34:25 2011
@@ -4,6 +4,7 @@
     xmlns:c="http://java.sun.com/jsp/jstl/core"
     xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
     xmlns:jsp="http://java.sun.com/JSP/Page"
+    xmlns:fn="http://java.sun.com/jsp/jstl/functions"
     xmlns:kupu="http://kupu.oscom.org/namespaces/dist" >
 
   <kupu:part name="tools-div">
@@ -11,7 +12,14 @@
       <mm:import externid="tools" from="this,parameters" vartype="list">empty</mm:import>
       <mm:stringlist referid="tools">
         <mm:isnotempty>
-          <mm:include page="tools/${_}.jspx" />
+          <c:choose>
+            <c:when test="${fn:startsWith(_, '/')}">
+              <mm:include page="${_}.jspx" />
+           </c:when>
+            <c:otherwise>
+              <mm:include page="tools/${_}.jspx" />
+            </c:otherwise>
+          </c:choose>
         </mm:isnotempty>
       </mm:stringlist>
     </div>

From mihxil at codespeak.net  Wed Dec 14 15:08:00 2011
From: mihxil at codespeak.net (mihxil at codespeak.net)
Date: Wed, 14 Dec 2011 15:08:00 +0100 (CET)
Subject: [kupu-checkins] r80414 - kupu/trunk/kupu/mmbase
Message-ID: <20111214140800.4E5A02A202F@codespeak.net>

Author: mihxil
Date: Wed Dec 14 15:07:57 2011
New Revision: 80414

Modified:
   kupu/trunk/kupu/mmbase/mmbase.js
Log:
added also an 'editRelation'

Modified: kupu/trunk/kupu/mmbase/mmbase.js
==============================================================================
--- kupu/trunk/kupu/mmbase/mmbase.js	(original)
+++ kupu/trunk/kupu/mmbase/mmbase.js	Wed Dec 14 15:07:57 2011
@@ -438,7 +438,13 @@
     document.getElementById("related_" + type).innerHTML = result;
 }
 
-
+function editRelation(type, nodeNumber, relationNode, value) {
+     var relatedRequest = getRequest();
+     relatedRequest.open('GET', absoluteUrl + 'tools/related-type.jspx?objectnumber=' + nodeNumber + "&edit_relation=" + relationNode + "&type=" + type + "&relationValue=" + value, false);
+     relatedRequest.send('');
+     var result = serialize(relatedRequest);
+     document.getElementById("related_" + type).innerHTML = result;
+}
 
 
 // ================================================================================