Author: andre
Date: 2010-06-22 22:44:18 +0200 (Tue, 22 Jun 2010)
New Revision: 42656
Modified:
openimages/trunk/src/main/webapp/action/progress.jspx
Log:
restyled upload progress bar
Modified: openimages/trunk/src/main/webapp/action/progress.jspx
===================================================================
--- openimages/trunk/src/main/webapp/action/progress.jspx 2010-06-22
20:43:46 UTC (rev 42655)
+++ openimages/trunk/src/main/webapp/action/progress.jspx 2010-06-22
20:44:18 UTC (rev 42656)
@@ -1,44 +1,55 @@
-<mm:content
- type="application/xml"
- postprocessor="none"
- expires="0"
+<jsp:root
+ version="2.0"
xmlns:c="http://java.sun.com/jsp/jstl/core";
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt";
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";>
- <!--
- Used by /style/js/upload.js
- <div style="width: 2%;" class="PROGRESS">
- <span class="percentage">2%</span><span class="speed">(40 MiB/1832
MiB, 40 MiB/s)</span>
- </div>
- -->
- <jsp:output omit-xml-declaration="true" />
- <mm:import externid="length" vartype="integer">100</mm:import>
- <mm:import externid="unit" vartype="string">%</mm:import>
- <fmt:formatNumber value="${sessionScope['org.mmbase.uploadInfo'].fraction *
length}"
- maxFractionDigits="0"
- var="roundedLength" />
- <c:choose>
- <c:when test="${sessionScope['org.mmbase.uploadInfo'].elapsedTime gt 500}">
- <div class="${sessionScope['org.mmbase.uploadInfo'].status}"
style="width: ${roundedLength}${unit};">
- <span class="percentage">
- <fmt:formatNumber
- value="${sessionScope['org.mmbase.uploadInfo'].fraction}"
- type="percent" />
- </span>
- <span class="speed">
- <jsp:text> (</jsp:text>
- <mm:escape
escape="filesize">${sessionScope['org.mmbase.uploadInfo'].bytesRead}</mm:escape>
- <jsp:text> / </jsp:text>
- <mm:escape
escape="filesize">${sessionScope['org.mmbase.uploadInfo'].totalSize}</mm:escape>
- <jsp:text>, </jsp:text>
- <mm:escape escape="filesize">${1000 *
sessionScope['org.mmbase.uploadInfo'].bytesRead /
sessionScope['org.mmbase.uploadInfo'].elapsedTime}</mm:escape>
- <jsp:text>/s)</jsp:text>
- </span>
- </div>
- </c:when>
- <c:otherwise>
- <div class="PROGRESS">Uploading... </div>
- </c:otherwise>
- </c:choose>
-</mm:content>
+
+ <mm:content
+ type="application/xml"
+ postprocessor="none"
+ expires="0">
+ <jsp:output omit-xml-declaration="true" />
+
+ <!--
+ Used by /style/js/upload.js
+ <div>
+ <div style="width: 2%;" class="PROGRESS"> </div>
+ <span class="percentage">2%</span><span class="speed">(40 MiB/1832
MiB, 40 MiB/s)</span>
+ </div>
+ -->
+
+ <mm:import externid="length" vartype="integer">100</mm:import>
+ <mm:import externid="unit" vartype="string">%</mm:import>
+ <fmt:formatNumber value="${sessionScope['org.mmbase.uploadInfo'].fraction
* length}"
+ maxFractionDigits="0"
+ var="roundedLength" />
+ <c:choose>
+ <c:when test="${sessionScope['org.mmbase.uploadInfo'].elapsedTime gt
100}">
+ <div>
+ <div class="${sessionScope['org.mmbase.uploadInfo'].status}"
style="width: ${roundedLength}${unit};">
+ <jsp:text><!-- empty --></jsp:text>
+ </div>
+ <span class="percentage">
+ <fmt:formatNumber
+ value="${sessionScope['org.mmbase.uploadInfo'].fraction}"
+ type="percent" />
+ </span>
+ <span class="speed">
+ <jsp:text> (</jsp:text>
+ <mm:escape
escape="filesize">${sessionScope['org.mmbase.uploadInfo'].bytesRead}</mm:escape>
+ <jsp:text> / </jsp:text>
+ <mm:escape
escape="filesize">${sessionScope['org.mmbase.uploadInfo'].totalSize}</mm:escape>
+ <jsp:text>, </jsp:text>
+ <mm:escape escape="filesize">${1000 *
sessionScope['org.mmbase.uploadInfo'].bytesRead /
sessionScope['org.mmbase.uploadInfo'].elapsedTime}</mm:escape>
+ <jsp:text>/s)</jsp:text>
+ </span>
+ </div>
+ </c:when>
+ <c:otherwise>
+ <div>Uploading...</div>
+ </c:otherwise>
+ </c:choose>
+
+ </mm:content>
+</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
