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

[<fg...@us...>]

Revision: 3705
          http://openutils.svn.sourceforge.net/openutils/?rev=3705&view=rev
Author:   fgiust
Date:     2011-11-20 20:39:15 +0000 (Sun, 20 Nov 2011)
Log Message:
-----------
MEDIA-274 handling of size and preview image

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

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	2011-11-20 20:21:47 UTC (rev 3704)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag	2011-11-20 20:39:15 UTC (rev 3705)
@@ -185,8 +185,28 @@
           <c:if test="${!(height gt 0)}">
             <c:set var="height" value="${media:height(mediaNode)}" />
           </c:if>
-        
-          <media:swfobject player="${pageContext.request.contextPath}${media:url(mediaNode)}" width="${width gt 0 ? width : ''}" height="${height gt 0? height : ''}" image="${thumbnail}"/>
+          
+          <c:choose>
+            <c:when test="${width gt 0 and height gt 0}">
+              <c:set var="previewres" value="${width}x${height}" />
+              <c:set var="preview" value="${media:urlres(mediaNode, previewres)}" />
+            </c:when>
+            <c:otherwise>
+              <c:set var="preview" value="${media:thumbnail(mediaNode)}" />
+            </c:otherwise>
+          </c:choose>
+          
+          <c:if test="${!empty preview}">
+             <c:set var="preview" value="${pageContext.request.contextPath}${preview}" />
+          </c:if>
+    
+          <media:swfobject 
+            player="${pageContext.request.contextPath}${media:url(mediaNode)}"
+            width="${width gt 0 ? width : ''}"
+            height="${height gt 0? height : ''}" 
+            image="${preview}"
+            title="${mediaNode.title}"
+            />
         </c:when>
          
       </c:choose>

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag	2011-11-20 20:21:47 UTC (rev 3704)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag	2011-11-20 20:39:15 UTC (rev 3705)
@@ -7,6 +7,7 @@
   <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="flash content width" />
   <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="flash content height" />
   <jsp:directive.attribute name="image" required="false" rtexprvalue="true" description="replacement image" />
+  <jsp:directive.attribute name="title" required="false" rtexprvalue="true" description="title/alt" />
   <jsp:directive.tag dynamic-attributes="attrs" />
   <!-- end attributes -->
 
@@ -14,6 +15,9 @@
   <c:set var="debug" value="${false}"/><!-- set to true to print out the generated javascript on page -->
   <c:set var="previewId" value="preview-${su:randomAlphanumeric(6)}" />
   <div id="${previewId}" class="preview"><!-- -->
+    <c:if test="${!empty image}">
+      <img src="${image}" width="${width}" height="${height}" alt="${title}" />
+    </c:if>
   </div>
   <c:if test="${empty requestScope['mgnlmedia_swfobject_link_drawn']}">
     <script type="text/javascript" src="${pageContext.request.contextPath}/.resources/media/js/swfobject.js"><!-- -->

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