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

[<mol...@us...>]

Revision: 1476
          http://openutils.svn.sourceforge.net/openutils/?rev=1476&view=rev
Author:   molaschi
Date:     2009-10-08 15:19:54 +0000 (Thu, 08 Oct 2009)

Log Message:
-----------
MEDIA-23 the image tag has to use use real image dimensions for width and height

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
    trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2009-10-08 15:12:45 UTC (rev 1475)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2009-10-08 15:19:54 UTC (rev 1476)
@@ -363,9 +363,9 @@
                 Content resolutions = media.getChildByName("resolutions");
                 try
                 {
-                    if (resolutions.hasNodeData("res-" + resolution))
+                    if (resolutions.hasNodeData(ImageUtils.getResolutionPath("res-" + resolution)))
                     {
-                        res = resolutions.getNodeData("res-" + resolution);
+                        res = resolutions.getNodeData(ImageUtils.getResolutionPath("res-" + resolution));
                     }
                     else
                     {

Modified: trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag
===================================================================
--- trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag	2009-10-08 15:12:45 UTC (rev 1475)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag	2009-10-08 15:19:54 UTC (rev 1476)
@@ -31,6 +31,7 @@
           <c:choose>
             <c:when test="${width eq 0 and height eq 0}">
               <c:set var="url" value="${media:url(mediaNode)}" />
+              <c:set var="size" value="${media:size(mediaNode, 'original')}" />
             </c:when>
             <c:otherwise>
               <c:set var="controlChar" value="" />
@@ -55,7 +56,7 @@
               </c:if>
               <c:set var="resolution">${controlChar}${width}x${height}${empty parameters ? '': ';' + parameters}</c:set>
               <c:set var="url" value="${media:urlres(mediaNode, resolution)}" />
-              
+              <c:set var="size" value="${media:size(mediaNode, resolution)}" />              
             </c:otherwise>
           </c:choose>
           <c:if test="${!empty(url)}">
@@ -67,11 +68,11 @@
               <![CDATA[ id="${id}"]]>
             </c:if>
             <c:if test="${not ignoreDim}">
-              <c:if test="${ width gt 0}">
-                <![CDATA[ width="${width}"]]>
+              <c:if test="${ size[0] gt 0}">
+                <![CDATA[ width="${size[0]}"]]>
               </c:if>
-              <c:if test="${ height gt 0}">
-                <![CDATA[ height="${height}"]]>
+              <c:if test="${ size[1] gt 0}">
+                <![CDATA[ height="${size[1]}"]]>
               </c:if>
             </c:if>
             <c:if test="${not empty cssClass}">


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