|
From: <fg...@us...> - 2013-12-08 11:58:45
|
Revision: 4462
http://openutils.svn.sourceforge.net/openutils/?rev=4462&view=rev
Author: fgiust
Date: 2013-12-08 11:58:41 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
add image with/height without using style when not using em
Modified Paths:
--------------
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/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-12-08 11:46:29 UTC (rev 4461)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2013-12-08 11:58:41 UTC (rev 4462)
@@ -124,12 +124,16 @@
</c:if>
<c:if test="${not ignoreDim}">
<c:if test="${ size[0] gt 0}">
- <c:set var="style">${style}${(!empty style)?';':''}width:${size[0]*emRatio}${(not useEm ? 'px':'em')}
- </c:set>
+ <c:choose>
+ <c:when test="${!useEM}"><![CDATA[ width="${su:toFloorLong(size[0])}"]]> </c:when>
+ <c:otherwise><c:set var="style" value="${style}${(!empty style)?';':''}width:${size[0]*emRatio}em" /></c:otherwise>
+ </c:choose>
</c:if>
<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:choose>
+ <c:when test="${!useEM}"><![CDATA[ heigth="${su:toFloorLong(size[1])}"]]></c:when>
+ <c:otherwise><c:set var="style" value="${style}${(!empty style)?';':''}height:${size[1]*emRatio}em" /></c:otherwise>
+ </c:choose>
</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.
|