[Openutils-svn] SF.net SVN: openutils:[3946] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/resources/META-INF/tags/media

[<die...@us...>]

Revision: 3946
          http://openutils.svn.sourceforge.net/openutils/?rev=3946&view=rev
Author:   diego_schivo
Date:     2012-04-10 09:10:22 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
cms:out, cms:setNode

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag	2012-04-10 08:58:47 UTC (rev 3945)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag	2012-04-10 09:10:22 UTC (rev 3946)
@@ -1,6 +1,7 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
   xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
-  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:fn="http://java.sun.com/jsp/jstl/functions">
+  xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+  xmlns:mu="mgnlutils">
   <jsp:directive.attribute name="property" required="true" rtexprvalue="true" type="java.lang.String" />
   <jsp:directive.attribute name="width" required="true" rtexprvalue="true" type="java.lang.Integer" />
   <jsp:directive.attribute name="height" required="true" rtexprvalue="true" type="java.lang.Integer" />
@@ -17,7 +18,7 @@
   <c:if test="${empty node}">
     <c:set var="node" value="${content.handle}" />
   </c:if>
-  <cms:setNode path="${node}" var="pzcNode" />
+  <c:set value="${mu:node(node, 'website')}" var="pzcNode" />
   <c:if test="${empty item}">
     <c:set var="item" value="${pzcNode[property]}" />
   </c:if>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag	2012-04-10 08:58:47 UTC (rev 3945)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag	2012-04-10 09:10:22 UTC (rev 3946)
@@ -46,12 +46,14 @@
     <c:if test="${empty property}">
       <c:set var="property" value="media" />
     </c:if>
-    <cms:out var="item" contentNode="${node}" nodeDataName="${property}" />
+    <c:set var="item" value="${node[property]}" />
     <c:if test="${empty width}">
-      <cms:out var="width" contentNode="${node}" nodeDataName="${property}_width" />
+      <c:set var="widthProperty" value="${property}_width" />
+      <c:set var="width" value="${node[widthProperty]}" />
     </c:if>
     <c:if test="${empty height}">
-      <cms:out var="height" contentNode="${node}" nodeDataName="${property}_height" />
+      <c:set var="heightProperty" value="${property}_height" />
+      <c:set var="height" value="${node[heightProperty]}" />
     </c:if>
   </c:if>
   <c:set value="${10000}" var="bigValue" />
@@ -72,7 +74,7 @@
   <c:set value="${media:node(item)}" var="mediaNode" />
   <c:choose>
     <c:when test="${!empty mediaNode}">
-      <cms:setNode var="media" content="${mediaNode}" />
+      <c:set var="media" value="${media:node(mediaNode)}" />
       <c:choose>
         <c:when test="${crop and (media.type eq 'image' or media.type eq 'wallpaper' or videoImagePreview)}">
           <media:crop item="${media}" width="${width}" height="${height}" property="${cropProperty}" jquery="${cropJquery}" jqueryui="${cropJqueryUI}" loadjs="${cropJs}" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.