1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-18 00:00:00 +00:00

improved file uploading progress text

This commit is contained in:
llj
2012-12-07 16:46:53 +08:00
parent 98e36340dd
commit 0c554c20e6
5 changed files with 11 additions and 8 deletions

View File

@@ -11,7 +11,7 @@
cache: false,
success: function(data) {
if (data) {
$(dialog_id + ' #upload-progress-text', window.parent.document).html(filesizeformat(data.uploaded) + ' / ' + filesizeformat(data.length));
$(dialog_id + ' #upload-progress-text', window.parent.document).html(filesizeformat(data.uploaded, 2) + ' / ' + filesizeformat(data.length, 2));
$(dialog_id + ' #task-progress-bar', window.parent.document).removeClass('hide').progressbar({
value: data.uploaded / data.length * 100
});

View File

@@ -180,7 +180,7 @@
<input type="submit" value="{% trans "Upload" %}" class="submit" />
</form>
<div id="upload-progress" class="hide">
<p>{% trans "Uploading rate:" %} <span id="upload-progress-text">{% trans "Fetching ..." %}</span></p>
<p>{% trans "Uploaded:" %} <span id="upload-progress-text">{% trans "Fetching ..." %}</span></p>
<div id="task-progress-bar" class="hide"></div>
<button id="upload-cancel">{% trans "Cancel" %}</button>
</div>
@@ -203,7 +203,7 @@
</form>
<div id="upload-progress" class="hide">
<p>{% trans "Uploading rate:" %} <span id="upload-progress-text">{% trans "Fetching..." %}</span></p>
<p>{% trans "Uploaded:" %} <span id="upload-progress-text">{% trans "Fetching..." %}</span></p>
<div id="task-progress-bar" class="hide"></div>
<button id="upload-cancel">{% trans "Cancel" %}</button>
</div>

View File

@@ -27,7 +27,7 @@ function submit_and_real_time_show (dialog_id) {
cache: false,
success: function(data) {
if (data) {
$(dialog_id + ' #upload-progress-text').html(filesizeformat(data.uploaded) + ' / ' + filesizeformat(data.length));
$(dialog_id + ' #upload-progress-text').html(filesizeformat(data.uploaded, 2) + ' / ' + filesizeformat(data.length, 2));
$(dialog_id + ' #task-progress-bar').removeClass('hide').progressbar({
value: data.uploaded / data.length * 100
});