Author: andre
Date: 2009-12-02 16:53:55 +0100 (Wed, 02 Dec 2009)
New Revision: 40093
Modified:
openimages/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml
openimages/trunk/src/main/webapp/progress.jspx
openimages/trunk/src/main/webapp/style/css/specific-styles.css
openimages/trunk/src/main/webapp/style/js/upload.js
Log:
using jquery.blockUI plugin to block user interface actions
Modified: openimages/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml
===================================================================
--- openimages/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml
2009-12-02 15:00:50 UTC (rev 40092)
+++ openimages/trunk/src/main/webapp/WEB-INF/config/log/log4j.xml
2009-12-02 15:53:55 UTC (rev 40093)
@@ -85,6 +85,14 @@
<level class="&mmlevel;" value="debug" />
</logger>
-->
+
+<!--
+ <logger name="org.mmbase.module.lucene" >
+ <level class="&mmlevel;" value="debug" />
+ </logger>
+ -->
+
+
<!--
<logger name="org.mmbase.datatypes.processors.Related" >
Modified: openimages/trunk/src/main/webapp/progress.jspx
===================================================================
--- openimages/trunk/src/main/webapp/progress.jspx 2009-12-02 15:00:50 UTC
(rev 40092)
+++ openimages/trunk/src/main/webapp/progress.jspx 2009-12-02 15:53:55 UTC
(rev 40093)
@@ -9,7 +9,7 @@
<!--
Used by /style/js/upload.js
<div style="width: 2%;" class="PROGRESS">
- <p><span class="percentage">2%</span><span class="speed">(40 MiB/1832
MiB, 40 MiB/s)</span></p>
+ <span class="percentage">2%</span><span class="speed">(40 MiB/1832
MiB, 40 MiB/s)</span>
</div>
-->
<jsp:output omit-xml-declaration="true" />
@@ -20,30 +20,25 @@
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};">
- <p>
- <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>
- </p>
+ <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">
- <p>Uploading...</p>
- </div>
+ <div class="PROGRESS">Uploading... </div>
</c:otherwise>
</c:choose>
</mm:content>
Modified: openimages/trunk/src/main/webapp/style/css/specific-styles.css
===================================================================
--- openimages/trunk/src/main/webapp/style/css/specific-styles.css
2009-12-02 15:00:50 UTC (rev 40092)
+++ openimages/trunk/src/main/webapp/style/css/specific-styles.css
2009-12-02 15:53:55 UTC (rev 40093)
@@ -644,7 +644,7 @@
div.progressInfo p
{
- white-space: nowrap;
+ white-space: nowrap;
margin: 0;
padding-left: 4px;
color: #555;
Modified: openimages/trunk/src/main/webapp/style/js/upload.js
===================================================================
--- openimages/trunk/src/main/webapp/style/js/upload.js 2009-12-02 15:00:50 UTC
(rev 40092)
+++ openimages/trunk/src/main/webapp/style/js/upload.js 2009-12-02 15:53:55 UTC
(rev 40093)
@@ -14,19 +14,29 @@
complete: function(data) {
result = data.responseText;
if (result.indexOf('100%') > -1 && i == 0) {
- result = '<div
class="PROGRESS"><p>Uploading...</p></div>';
+ result = '<div
class="PROGRESS">Uploading...</div>';
}
i++;
}
});
});
- $(form).find(".progressInfo").html(result);
- $(form).block( { fadeIn: 0, fadeOut: 400, message:
$('div.PROGRESS') } );
- setTimeout(progress, 1000);
+ $(form).find(".progressInfo").html('<div
class="PROGRESS"><p>Uploading...</p></div>');
+ $(form).block( { message: $(result),
+ css: {
+ width: '96%',
+ textAlign: 'left',
+ 'white-space': 'nowrap',
+ color: '#555',
+ 'font-weight': 'bold',
+ padding: '2px 2px 2px 4px',
+ border: '2px solid #ccc'
+ },
+ fadeIn: 0,
+ fadeOut: 0
+ });
+ setTimeout(progress, 500);
};
progress();
- //$.blockUI({ message: $('.progressInfo') });
- //$().ajaxStart( $.blockUI({ message: $('.progressInfo') })
).ajaxStop($.unblockUI({ message: $('.progressInfo') }) );
});
});
});
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
