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

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

Revision: 1484
          http://openutils.svn.sourceforge.net/openutils/?rev=1484&view=rev
Author:   molaschi
Date:     2009-10-14 14:17:32 +0000 (Wed, 14 Oct 2009)

Log Message:
-----------
MEDIA-29 make images use the style attribute for size, and add attributes to write dimensions in em insteadof px

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

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-14 14:13:48 UTC (rev 1483)
+++ trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media.tag	2009-10-14 14:17:32 UTC (rev 1484)
@@ -1,10 +1,13 @@
 <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
-  xmlns:cms="cms-taglib" xmlns:cmsu="cms-util-taglib" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
-  xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:su="http://openutils.sf.net/openutils-stringutils">
+  xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib"
+  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+  xmlns:su="http://openutils.sf.net/openutils-stringutils">
   <jsp:directive.attribute name="id" required="false" rtexprvalue="true" />
   <jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object" />
   <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" />
   <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" />
+  <jsp:directive.attribute name="useEm" required="false" rtexprvalue="true" type="java.lang.Boolean" />
+  <jsp:directive.attribute name="emRatio" required="false" rtexprvalue="true" type="java.lang.Float" />
   <jsp:directive.attribute name="alt" required="false" rtexprvalue="true" />
   <jsp:directive.attribute name="cssClass" required="false" rtexprvalue="true" />
   <jsp:directive.attribute name="style" required="false" rtexprvalue="true" />
@@ -15,7 +18,6 @@
   <jsp:directive.attribute name="loop" required="false" rtexprvalue="true" type="java.lang.Boolean" />
   <jsp:directive.attribute name="noPlayIcon" required="false" rtexprvalue="true" type="java.lang.Boolean" />
   <jsp:directive.attribute name="skin" required="false" rtexprvalue="true" />
-  <c:set value="${media:node(item)}" var="mediaNode" />
   <c:set value="${10000}" var="bigValue" />
   <c:if test="${empty width }">
     <c:set var="width" value="${0 }" />
@@ -23,6 +25,10 @@
   <c:if test="${empty height }">
     <c:set var="height" value="${0 }" />
   </c:if>
+  <c:if test="${empty emRatio }">
+    <c:set var="emRatio" value="${1.0 }" />
+  </c:if>
+  <c:set value="${media:node(item)}" var="mediaNode" />
   <c:choose>
     <c:when test="${!empty mediaNode}">
       <cms:setNode var="media" content="${mediaNode}" />
@@ -54,9 +60,9 @@
                 <c:set var="controlChar" value="l" />
                 <c:set var="height" value="${bigValue}" />
               </c:if>
-              <c:set var="resolution">${controlChar}${width}x${height}${empty parameters ? '': ';' + parameters}</c:set>
+              <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:set var="size" value="${media:size(mediaNode, resolution)}" />
             </c:otherwise>
           </c:choose>
           <c:if test="${!empty(url)}">
@@ -69,10 +75,12 @@
             </c:if>
             <c:if test="${not ignoreDim}">
               <c:if test="${ size[0] gt 0}">
-                <![CDATA[ width="${size[0]}"]]>
+                <c:set var="style">${style}${(!empty style)?';':''}width:${size[0]*emRatio}${(not useEm ? 'px':'em')}
+                </c:set>
               </c:if>
-              <c:if test="${ size[1] gt 0}">
-                <![CDATA[ height="${size[1]}"]]>
+              <c:if test="${ size[1] gt 1}">
+                <c:set var="style">${style}${(!empty style)?';':''}height:${size[1]*emRatio}${(not useEm ? 'px':'em')}
+                </c:set>
               </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.