haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-13 06:55:59 +00:00
Code Issues Releases Wiki Activity

improved file uploading progress text

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
locale/zh_CN/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-12-06 18:08+0800\n" "POT-Creation-Date: 2012-12-07 16:31+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -932,8 +932,8 @@ msgid "smaller than"
msgstr "文件总大小小于" msgstr "文件总大小小于"
#: templates/repo.html:183 templates/repo.html.py:206 #: templates/repo.html:183 templates/repo.html.py:206
msgid "Uploading rate:" msgid "Uploaded:"
msgstr "上传速度：" msgstr "上传进度："
#: templates/repo.html:183 #: templates/repo.html:183
msgid "Fetching ..." msgid "Fetching ..."
@ -1886,6 +1886,9 @@ msgstr "名字(可选)"
msgid "Note(optional)" msgid "Note(optional)"
msgstr "备注(可选)" msgstr "备注(可选)"
#~ msgid "Uploading rate:"
#~ msgstr "上传速度："
#~ msgid "Selected files will be populated here..." #~ msgid "Selected files will be populated here..."
#~ msgstr "所选的文件会显示在这里..." #~ msgstr "所选的文件会显示在这里..."

2
media/js/utils.js
View File

@ -228,7 +228,7 @@ function filesizeformat(bytes, precision) {
var gigabyte = megabyte * 1024; var gigabyte = megabyte * 1024;
var terabyte = gigabyte * 1024; var terabyte = gigabyte * 1024;
precision = precision || 0; var precision = precision || 0;
if ((bytes >= 0) && (bytes < kilobyte)) { if ((bytes >= 0) && (bytes < kilobyte)) {
return bytes + ' B'; return bytes + ' B';

2
templates/file_upload_progress_page.html
View File

@ -11,7 +11,7 @@
cache: false, cache: false,
success: function(data) { success: function(data) {
if (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({ $(dialog_id + ' #task-progress-bar', window.parent.document).removeClass('hide').progressbar({
value: data.uploaded / data.length * 100 value: data.uploaded / data.length * 100
}); });

4
templates/repo.html
View File

@ -180,7 +180,7 @@
<input type="submit" value="{% trans "Upload" %}" class="submit" /> <input type="submit" value="{% trans "Upload" %}" class="submit" />
</form> </form>
<div id="upload-progress" class="hide"> <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> <div id="task-progress-bar" class="hide"></div>
<button id="upload-cancel">{% trans "Cancel" %}</button> <button id="upload-cancel">{% trans "Cancel" %}</button>
</div> </div>
@ -203,7 +203,7 @@
</form> </form>
<div id="upload-progress" class="hide"> <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> <div id="task-progress-bar" class="hide"></div>
<button id="upload-cancel">{% trans "Cancel" %}</button> <button id="upload-cancel">{% trans "Cancel" %}</button>
</div> </div>

2
templates/snippets/file_upload_progress_js.html
View File

@ -27,7 +27,7 @@ function submit_and_real_time_show (dialog_id) {
cache: false, cache: false,
success: function(data) { success: function(data) {
if (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({ $(dialog_id + ' #task-progress-bar').removeClass('hide').progressbar({
value: data.uploaded / data.length * 100 value: data.uploaded / data.length * 100
}); });