Author: andre
Date: 2009-09-13 01:02:07 +0200 (Sun, 13 Sep 2009)
New Revision: 38573
Modified:
openimages/trunk/src/main/webapp/mediafragment.jspx
Log:
testing for unsupported original media file
Modified: openimages/trunk/src/main/webapp/mediafragment.jspx
===================================================================
--- openimages/trunk/src/main/webapp/mediafragment.jspx 2009-09-12 22:54:41 UTC
(rev 38572)
+++ openimages/trunk/src/main/webapp/mediafragment.jspx 2009-09-12 23:02:07 UTC
(rev 38573)
@@ -99,33 +99,47 @@
</p>
<ul>
<mm:listfunction name="filteredurls">
- <li class="${_.state}" title="${_.state}">
-
- <c:if test="${_.main}">
- <jsp:text> *</jsp:text>
- </c:if>
- <strong>${_.format}:</strong>
- <jsp:text> (</jsp:text>
- <c:if test="${!empty _.dimension}">${_.dimension}, </c:if>
- <c:choose>
- <c:when test="${! empty
_.info.label}">${_.info.label}</c:when>
- <c:otherwise>${_.info.bitrate}</c:otherwise>
- </c:choose>
- <jsp:text>) </jsp:text>
- <c:choose>
- <c:when test="${_.available}">
- <a href="${mm:escape('text/xml', _.URL)}">
- <jsp:text><mm:escape>${_.filename}</mm:escape></jsp:text>
- </a>
- <jsp:text> (${_.mimeType})</jsp:text>
- </c:when>
- <c:otherwise>
- <jsp:text><mm:escape>${_.filename}</mm:escape></jsp:text>
- <jsp:text> (${_.mimeType})</jsp:text>
- </c:otherwise>
- </c:choose>
- </li>
+ <c:if test="${_.state eq 'SOURCE_UNSUPPORTED'}">
+ <mm:import id="unsupported" reset="true">true</mm:import>
+ </c:if>
</mm:listfunction>
+ <c:choose>
+ <c:when test="${empty unsupported}">
+ <mm:listfunction name="filteredurls">
+ <li class="${_.state}" title="${_.state}">
+ <c:if test="${_.main}">
+ <jsp:text> *</jsp:text>
+ </c:if>
+ <strong>${_.format}:</strong>
+ <jsp:text> (</jsp:text>
+ <c:if test="${!empty _.dimension}">${_.dimension}, </c:if>
+ <c:choose>
+ <c:when test="${! empty
_.info.label}">${_.info.label}</c:when>
+ <c:otherwise>${_.info.bitrate}</c:otherwise>
+ </c:choose>
+ <jsp:text>) </jsp:text>
+ <c:choose>
+ <c:when test="${_.available}">
+ <a href="${mm:escape('text/xml', _.URL)}">
+
<jsp:text><mm:escape>${_.filename}</mm:escape></jsp:text>
+ </a>
+ <jsp:text> (${_.mimeType})</jsp:text>
+ </c:when>
+ <c:otherwise>
+
<jsp:text><mm:escape>${_.filename}</mm:escape></jsp:text>
+ <jsp:text> (${_.mimeType})</jsp:text>
+ </c:otherwise>
+ </c:choose>
+ </li>
+ </mm:listfunction>
+ </c:when>
+ <c:otherwise>
+ <li>
+ The originale uploaded media file was not supported,
therefore no media sources
+ could be generated.
+ </li>
+ </c:otherwise>
+ </c:choose>
</ul>
</div>
@@ -133,7 +147,15 @@
<h4><a class="close" href="#toolbar">close</a> Embed</h4>
<p>
<label for="inputembed">HTML tag to copy</label>
- <input name="share" id="inputembed" class="copyvalue" type="text"
value="${embedtag}" />
+ <c:choose>
+ <c:when test="${empty unsupported}">
+ <input name="share" id="inputembed" class="copyvalue"
type="text" value="${embedtag}" />
+ </c:when>
+ <c:otherwise>
+ The originale uploaded media file was not supported, therefore
no media sources
+ could be generated.
+ </c:otherwise>
+ </c:choose>
</p>
</div>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
