[Openutils-svn] SF.net SVN: openutils:[2002] trunk/openutils-mgnlmedia/src/main/resources

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

Revision: 2002
          http://openutils.svn.sourceforge.net/openutils/?rev=2002&view=rev
Author:   diego_schivo
Date:     2010-02-18 16:25:22 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
MEDIA-100 media tag attributes: "node" (default: ${content}) and "property" (default: 'media')

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
    trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag	2010-02-18 16:08:42 UTC (rev 2001)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag	2010-02-18 16:25:22 UTC (rev 2002)
@@ -4,9 +4,9 @@
   xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:directive.tag description="Displays a media" pageEncoding="UTF-8"/>
   <jsp:directive.attribute name="id" required="false" rtexprvalue="true" description="html element id"/>
-  <jsp:directive.attribute name="contentNode" required="false" rtexprvalue="true" type="info.magnolia.cms.core.Content" description="The content object to use"/>
-  <jsp:directive.attribute name="nodeDataName" required="false" rtexprvalue="true" type="java.lang.String" description="The name of the nodeData storing the media uuid"/>
-  <jsp:directive.attribute name="item" required="false" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node"/>
+  <jsp:directive.attribute name="item" required="false" rtexprvalue="true" type="java.lang.Object" description="media uuid or media content node; if not specified, 'node' and 'property' attributes will be used"/>
+  <jsp:directive.attribute name="node" required="false" rtexprvalue="true" type="info.magnolia.cms.core.Content" description="the content object to use; if not specified, object 'content' will be used"/>
+  <jsp:directive.attribute name="property" required="false" rtexprvalue="true" type="java.lang.String" description="the name of the nodeData storing the media uuid; if not specified, 'media' will be used"/>
   <jsp:directive.attribute name="player" required="false" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)"/>
   <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width"/>
   <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player height"/>
@@ -31,12 +31,18 @@
   <jsp:directive.attribute name="controlbar" required="false" rtexprvalue="true" type="java.lang.String" description="defines controlbar position. Possible values are: 'none' (for hiding), 'over', 'bottom', 'top'. If not set, this value will be 'bottom' by default." />
   <jsp:directive.attribute name="share" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if set to true the pluging share-1 is show"/>
   <c:if test="${empty item}">
-    <cms:out var="item" contentNode="${contentNode}" nodeDataName="${nodeDataName}" />
+    <c:if test="${empty node}">
+      <c:set var="node" value="${content}" />
+    </c:if>
+    <c:if test="${empty property}">
+      <c:set var="property" value="media" />
+    </c:if>
+    <cms:out var="item" contentNode="${node}" nodeDataName="${property}" />
     <c:if test="${empty width}">
-      <cms:out var="width" contentNode="${contentNode}" nodeDataName="${nodeDataName}_width" />
+      <cms:out var="width" contentNode="${node}" nodeDataName="${property}_width" />
     </c:if>
     <c:if test="${empty height}">
-      <cms:out var="height" contentNode="${contentNode}" nodeDataName="${nodeDataName}_height" />
+      <cms:out var="height" contentNode="${node}" nodeDataName="${property}_height" />
     </c:if>
   </c:if>
   <c:set value="${10000}" var="bigValue" />

Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp	2010-02-18 16:08:42 UTC (rev 2001)
+++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-files/templates/samples-media/paragraph-mediatag.jsp	2010-02-18 16:25:22 UTC (rev 2002)
@@ -9,8 +9,9 @@
       <div>
         <pre>&amp;lt;media:media item="${content.media}" width="50" height="30" videoImagePreview="true" /></pre>
         <media:media item="${content.media}" width="50" height="30" videoImagePreview="true" />
+        <pre>&amp;lt;media:media thumbnail="true" /></pre>
         <pre>&amp;lt;media:media contentNode="${'$'}{content}" nodeDataName="media" thumbnail="true" /></pre>
-        <media:media contentNode="${content}" nodeDataName="media" thumbnail="true" />
+        <media:media thumbnail="true" />
       </div>
     </div>
   </div>


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