You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2004/12/14 05:32:25 UTC
svn commit: r111781 - in lenya/trunk/src/webapp/lenya: resources/javascript xslt/authoring xslt/bxe xslt/info
Author: gregor
Date: Mon Dec 13 20:32:24 2004
New Revision: 111781
URL: http://svn.apache.org/viewcvs?view=rev&rev=111781
Log:
Added preview for images to asset upload screens and asset lists.
Added:
lenya/trunk/src/webapp/lenya/resources/javascript/asset.js (contents, props changed)
Modified:
lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl
lenya/trunk/src/webapp/lenya/xslt/authoring/asset.xsl
lenya/trunk/src/webapp/lenya/xslt/bxe/asset.xsl
lenya/trunk/src/webapp/lenya/xslt/bxe/image.xsl
lenya/trunk/src/webapp/lenya/xslt/info/info.xsl
Added: lenya/trunk/src/webapp/lenya/resources/javascript/asset.js
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/resources/javascript/asset.js?view=auto&rev=111781
==============================================================================
--- (empty file)
+++ lenya/trunk/src/webapp/lenya/resources/javascript/asset.js Mon Dec 13 20:32:24 2004
@@ -0,0 +1,21 @@
+/* Show a preview of an image to be uploaded */
+function imagepreview(obj) {
+ prev = document.getElementById('preview');
+ prev.style.visibility = 'hidden';
+ var i = 0;
+ var delimiter = ' ';
+ var imageext = 'gif jpg jpeg png';
+ var isimage = false;
+ var _tempArray = new Array();
+ _tempArray = imageext.split(delimiter);
+ for(i in _tempArray) {
+ if(obj.value.indexOf('.' + _tempArray[i]) != -1) { // file is an image.
+ isimage = true;
+ }
+ }
+ if (isimage) {
+ prev.setAttribute('src',obj.value);
+ prev.style.visibility = 'visible';
+ }
+}
+
Modified: lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl?view=diff&rev=111781&p1=lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl&r1=111780&p2=lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl&r2=111781
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/authoring/asset-upload.xsl Mon Dec 13 20:32:24 2004
@@ -35,6 +35,8 @@
<xsl:param name="error"/>
<xsl:param name="extensions" select="'doc dot rtf txt asc ascii xls xlw xlt ppt pot gif jpg png tif eps pct m3u kar mid smf mp3 swa mpg mpv mp4 mov bin sea hqx sit zip jmx jcl qz jbc jmt cfg pdf'"/>
+ <xsl:param name="contextprefix"/>
+
<xsl:template match="/lenya-info:info">
<page:page>
<page:title><i18n:text key="lenya.assetupload.subtitle"/></page:title>
@@ -79,7 +81,8 @@
</tr>
</xsl:if>
<tr>
- <td class="lenya-form-caption"><i18n:text>Select File</i18n:text>:</td><td><input class="lenya-form-element" type="file" name="properties.asset.data"/><br/>(<i18n:text>No whitespace, no special characters</i18n:text>)</td>
+ <td class="lenya-form-caption"><i18n:text>Select File</i18n:text>:</td><td><input class="lenya-form-element" type="file" name="properties.asset.data"
+ onchange="imagepreview(this)"/><br/>(<i18n:text>No whitespace, no special characters</i18n:text>)</td>
</tr>
<tr><td> </td></tr>
<tr>
@@ -91,6 +94,9 @@
<tr>
<td class="lenya-form-caption"><i18n:text>Rights</i18n:text>:</td><td><input class="lenya-form-element" type="text" name="properties.asset.rights" value="All rights reserved."/></td>
</tr>
+ <tr>
+ <td class="lenya-form-caption"><i18n:text>Preview</i18n:text>:</td><td><img src="" id="preview" style="visibility: hidden; height: 100px;"/></td>
+ </tr>
<tr><td> </td></tr>
<tr>
<td/>
@@ -146,7 +152,12 @@
document.getElementById('assetSource').value = '{dc:source}';
document.getElementById('assetExtent').value = '{dc:extent}';"/>
</td>
- <td><xsl:value-of select="dc:title"/></td>
+ <td>
+ <xsl:if test="dc:format = 'image/jpeg' or dc:format = 'image/gif' or dc:format = 'image/png'">
+ <img src="{../lenya-info:documentnodeid}/{dc:source}" style="height: 32px; vertical-align: middle;"/> 
+ </xsl:if>
+ <xsl:value-of select="dc:title"/>
+ </td>
<td><xsl:value-of select="dc:extent"/> KB</td>
<td><xsl:value-of select="dc:date"/></td>
</tr>
Modified: lenya/trunk/src/webapp/lenya/xslt/authoring/asset.xsl
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/authoring/asset.xsl?view=diff&rev=111781&p1=lenya/trunk/src/webapp/lenya/xslt/authoring/asset.xsl&r1=111780&p2=lenya/trunk/src/webapp/lenya/xslt/authoring/asset.xsl&r2=111781
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/authoring/asset.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/authoring/asset.xsl Mon Dec 13 20:32:24 2004
@@ -87,6 +87,7 @@
</xsl:choose>
<div class="lenya-box-body">
<script type="text/javascript" src="{$contextprefix}/lenya/javascript/validation.js"> </script>
+ <script type="text/javascript" src="{$contextprefix}/lenya/javascript/asset.js"> </script>
<script>
var ext = '<xsl:value-of select="$extensions"/>';
</script>
@@ -163,6 +164,9 @@
<td class="lenya-form-caption"><i18n:text>Link</i18n:text>:</td><td><input class="lenya-form-element" type="text" name="properties.insert.asset.link"/><br/>External links have to start with 'http://', internal links have to start with '/'</td>
</tr>
</xsl:if>
+ <tr>
+ <td class="lenya-form-caption"><i18n:text>Preview</i18n:text>:</td><td><img src="" id="preview" style="visibility: hidden; height: 100px;"/></td>
+ </tr>
<tr><td> </td></tr>
<tr>
<td/>
Modified: lenya/trunk/src/webapp/lenya/xslt/bxe/asset.xsl
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/bxe/asset.xsl?view=diff&rev=111781&p1=lenya/trunk/src/webapp/lenya/xslt/bxe/asset.xsl&r1=111780&p2=lenya/trunk/src/webapp/lenya/xslt/bxe/asset.xsl&r2=111781
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/bxe/asset.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/bxe/asset.xsl Mon Dec 13 20:32:24 2004
@@ -36,6 +36,7 @@
<xsl:template name="pre-body">
<script type="text/javascript" src="{$contextprefix}/lenya/javascript/validation.js"> </script>
+ <script type="text/javascript" src="{$contextprefix}/lenya/javascript/asset.js"> </script>
<script>
var ext = '<xsl:value-of select="$extensions"/>';
Modified: lenya/trunk/src/webapp/lenya/xslt/bxe/image.xsl
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/bxe/image.xsl?view=diff&rev=111781&p1=lenya/trunk/src/webapp/lenya/xslt/bxe/image.xsl&r1=111780&p2=lenya/trunk/src/webapp/lenya/xslt/bxe/image.xsl&r2=111781
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/bxe/image.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/bxe/image.xsl Mon Dec 13 20:32:24 2004
@@ -42,6 +42,7 @@
</page:title>
<page:body >
<script type="text/javascript" src="{$contextprefix}/lenya/javascript/validation.js"> </script>
+ <script type="text/javascript" src="{$contextprefix}/lenya/javascript/asset.js"> </script>
<script>
window.onload = insertCaption
@@ -49,9 +50,9 @@
function insertImage(src, type) {
var nodeid = '<xsl:value-of select="lenya-info:documentnodeid"/>/';
- var link = document.forms["image"].link.value;
- var caption = document.forms["image"].caption.value;
- var title = document.forms["image"].title.value;
+ var link = document.forms['image'].link.value;
+ var caption = document.forms['image'].caption.value;
+ var title = document.forms['image'].title.value;
<![CDATA[
var content = '<object xmlns="'+window.opener.XHTMLNS+'" href="'+link+'" title="'+title+'" type="'+type+'" data="'+nodeid + src+'">'+caption+'</object>';
]]>
@@ -62,7 +63,7 @@
function insertCaption() {
var selectionContent = window.opener.getSelection().getEditableRange().toString();
if (selectionContent.length != 0) {
- document.forms["image"].caption.value = selectionContent;
+ document.forms['image'].caption.value = selectionContent;
}
focus();
}
@@ -92,7 +93,7 @@
<tr>
<td class="lenya-form-caption"><i18n:text key="lenya.imageupload.selectimage.label"/>:</td>
<td><input class="lenya-form-element"
- type="file" name="properties.asset.data"
+ type="file" name="properties.asset.data" onchange="imagepreview(this)"
id="data"/><br/>(<i18n:text>No whitespace, no special characters</i18n:text>)</td>
</tr>
<tr>
@@ -122,6 +123,9 @@
value="All rights reserved"/>
</td>
</tr>
+ <tr>
+ <td class="lenya-form-caption"><i18n:text>Preview</i18n:text>:</td><td><img src="" id="preview" style="visibility: hidden; height: 100px;"/></td>
+ </tr>
<tr>
<td> </td>
</tr>
@@ -155,6 +159,11 @@
<xsl:when
test="dc:format = 'image/jpeg' or dc:format = 'image/gif' or dc:format = 'image/png' or dc:format = 'application/x-shockwave-flash'">
<tr>
+ <td>
+ <img src="{../lenya-info:documentnodeid}/{dc:source}"
+ onclick="javascript:insertImage('{dc:source}', '{dc:format}');"
+ style="cursor: pointer; height: 32px; vertical-align: middle;"/>
+ </td>
<td
colspan="2">
<xsl:value-of
@@ -165,13 +174,7 @@
select="dc:extent"/>
kB</td>
<td>
- <xsl:value-of
- select="dc:date"/>
- </td>
- <td>
- <a
- href="javascript:insertImage('{dc:source}', '{dc:format}');">
- <i18n:text>Insert</i18n:text></a>
+ <xsl:value-of select="dc:date"/>
</td>
</tr>
<xsl:variable name="noimages">
Modified: lenya/trunk/src/webapp/lenya/xslt/info/info.xsl
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/webapp/lenya/xslt/info/info.xsl?view=diff&rev=111781&p1=lenya/trunk/src/webapp/lenya/xslt/info/info.xsl&r1=111780&p2=lenya/trunk/src/webapp/lenya/xslt/info/info.xsl&r2=111781
==============================================================================
--- lenya/trunk/src/webapp/lenya/xslt/info/info.xsl (original)
+++ lenya/trunk/src/webapp/lenya/xslt/info/info.xsl Mon Dec 13 20:32:24 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: info.xsl,v 1.67 2004/08/22 22:50:41 roku Exp $ -->
+<!-- $Id$ -->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -184,6 +184,7 @@
<table class="lenya-table">
<tr>
<th><i18n:text>Assets</i18n:text></th>
+ <th><i18n:text>Preview</i18n:text></th>
<th><i18n:text>Title</i18n:text></th>
<th><i18n:text>File Size</i18n:text></th>
<th><i18n:text>Creation Date</i18n:text></th>
@@ -193,6 +194,11 @@
<xsl:sort select="dc:title"/>
<tr>
<td><xsl:value-of select="dc:source"/></td>
+ <td>
+ <xsl:if test="dc:format = 'image/jpeg' or dc:format = 'image/gif' or dc:format = 'image/png'">
+ <img src="../authoring/{../lenya-info:documentnodeid}/{dc:source}" style="height: 32px; vertical-align: middle;"/> 
+ </xsl:if>
+ </td>
<td><xsl:value-of select="dc:title"/></td>
<td align="right"><xsl:value-of select="dc:extent"/> kB</td>
<td align="right"><xsl:value-of select="dc:date"/></td>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org