svn commit: r647557 - /lenya/trunk/src/modules/editors/usecases/insertAsset.jx
[email protected] Sun, 13 Apr 2008 10:54:12 -0000
Newsgroups
gmane.comp.cms.lenya.cvs
Message-ID
<[email protected] >
Author: andreas
Date: Sun Apr 13 03:54:11 2008
New Revision: 647557
URL: http://svn.apache.org/viewvc?rev=647557&view=rev
Log:
Don't wrap lines containing image dimensions and size.
Modified:
lenya/trunk/src/modules/editors/usecases/insertAsset.jx
Modified: lenya/trunk/src/modules/editors/usecases/insertAsset.jx
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/editors/usecases/insertAsset.jx?rev=647557&r1=647556&r2=647557&view=diff
==============================================================================
--- lenya/trunk/src/modules/editors/usecases/insertAsset.jx (original)
+++ lenya/trunk/src/modules/editors/usecases/insertAsset.jx Sun Apr 13 03:54:11 2008
@@ -101,14 +101,12 @@
<td>
<jx:out value="${asset.getPath()}"/>
</td>
- <td>
+ <td style="width: 50px; overflow: hidden;">
<jx:choose>
<jx:when test="${mimeType.startsWith('image/')}">
<!-- Add one to avoid dividing by 0 -->
<jx:set var="scaledWidth" value="${Packages.java.lang.Math.round(width / ( height + 1 ) * 32.0)}"/>
- <div style="width: 50px; overflow: hidden;">
- <img src="${url}?lenya.module=svg&height=32&width=${scaledWidth}" style="height: 32px; vertical-align: middle; margin: 3px 0px;"/> 
- </div>
+ <img src="${url}?lenya.module=svg&height=32&width=${scaledWidth}" style="height: 32px; vertical-align: middle; margin: 3px 0px;"/> 
</jx:when>
<jx:otherwise>
<jx:out value="${mimeType}"/>
@@ -118,14 +116,14 @@
<td>
<jx:out value="${asset.getMetaData('http://purl.org/dc/elements/1.1/').getFirstValue('title')}"/>
</td>
- <td align="right">
+ <td align="right" style="white-space: nowrap;">
<jx:out value="${asset.getContentLength() / 1000}"/> kB
</td>
- <td align="right">
+ <td align="right" style="white-space: nowrap;">
<jx:if test="${mimeType.startsWith('image/')}">
<jx:out value="${width}"/> x <jx:out value="${height}"/></jx:if>
</td>
- <td align="right">
+ <td align="right" style="white-space: nowrap;">
<jx:out value="${java.text.DateFormat.getDateInstance().format(asset.getLastModified())}"/>
</td>
</tr>