From e75b1891e28843cf48adbe91718552ea56ca748e Mon Sep 17 00:00:00 2001 From: lian Date: Tue, 12 Jan 2016 10:19:34 +0800 Subject: [PATCH] batch load repo/dir trash --- media/css/seahub.css | 7 + seahub/templates/dir_recycle_view.html | 99 --------- seahub/templates/repo_dir_recycle_view.html | 202 ++++++++++++++++++ seahub/templates/repo_recycle_view.html | 125 ----------- .../templates/snippets/repo_dir_trash_tr.html | 35 +++ seahub/templates/view_trash_file.html | 2 +- seahub/urls.py | 2 + seahub/views/__init__.py | 121 +++++------ seahub/views/ajax.py | 68 +++++- seahub/views/file.py | 2 - 10 files changed, 368 insertions(+), 295 deletions(-) delete mode 100644 seahub/templates/dir_recycle_view.html create mode 100644 seahub/templates/repo_dir_recycle_view.html delete mode 100644 seahub/templates/repo_recycle_view.html create mode 100644 seahub/templates/snippets/repo_dir_trash_tr.html diff --git a/media/css/seahub.css b/media/css/seahub.css index 4cf8123fcd..2ce782e749 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -1694,14 +1694,17 @@ textarea:-moz-placeholder {/* for FF */ } #events-loading, #notices-loading, +#trash-more-loading, #activities-more, #events-more, +#trash-more-btn, #notices-more-btn { text-align:center; width:100%; } #activities-more, #events-more, +#trash-more-btn, #notices-more-btn { color:#777; padding:.5em 0; @@ -1710,10 +1713,14 @@ textarea:-moz-placeholder {/* for FF */ } #activities-more:hover, #events-more:hover, +#trash-more-btn:hover, #notices-more-btn:hover { color:#000; background:#dfdfdf; } +#trash-more { + margin-top: 20px; +} #notices-more { margin-top: -20px; } diff --git a/seahub/templates/dir_recycle_view.html b/seahub/templates/dir_recycle_view.html deleted file mode 100644 index 02ac46de69..0000000000 --- a/seahub/templates/dir_recycle_view.html +++ /dev/null @@ -1,99 +0,0 @@ -{% extends base_template %} - -{% load seahub_tags avatar_tags i18n %} -{% load url from future %} - -{% block main_panel %} -

{% blocktrans %}{{dir_name}} Trash{% endblocktrans %}

-
-

- {% trans "Current path: " %} - {% if not show_recycle_root %} - {{dir_name}} - {% for name, link in zipped %} - {% if not forloop.last %} - / {{ name }} - {% else %} - / {{ name }} - {% endif %} - {% endfor %} - - {% else %} - {{dir_name}} - {% endif %} -

- - {% if show_recycle_root %} -
- - {% if days != 7 %} - {% trans "a week" %} / - {% else %} - {% trans "a week" %} / - {% endif %} - {% if days != 30 %} - {% trans "a month" %} / - {% else %} - {% trans "a month" %} / - {% endif %} - {% if days != 0 %} - {% trans "all" %} - {% else %} - {% trans "all" %} - {% endif %} - -
- {% endif %} -
- - - - - - - - - - - {% for dirent in dir_list %} - - - {% if show_recycle_root %} - - - - - {% else %} - - - - - {% endif %} - - {% endfor %} - - {% for dirent in file_list %} - - - {% if show_recycle_root %} - - - - - {% else %} - - - - - {% endif %} - - {% endfor %} -
{% trans "Name" %}{% trans "Delete Time" %}{% trans "Size" %}{% trans "Operations" %}
{% trans {{ dirent.obj_name }}{{ dirent.delete_time|translate_seahub_time }}{% trans "Restore" %}{{ dirent.obj_name }}
{% trans {{ dirent.obj_name }}{{ dirent.delete_time|translate_seahub_time }}{{ dirent.file_size|filesizeformat }}{% trans "Restore" %}{{ dirent.props.obj_name }}{{ dirent.file_size|filesizeformat }}
-{% endblock %} - -{% block extra_script %} - -{% endblock %} diff --git a/seahub/templates/repo_dir_recycle_view.html b/seahub/templates/repo_dir_recycle_view.html new file mode 100644 index 0000000000..f072b583af --- /dev/null +++ b/seahub/templates/repo_dir_recycle_view.html @@ -0,0 +1,202 @@ +{% extends base_template %} + +{% load seahub_tags avatar_tags i18n %} +{% load url from future %} + +{% block main_panel %} +

{% blocktrans %}{{repo_dir_name}} Trash{% endblocktrans %}

+
+

+ {% trans "Current path: " %} + {% if not show_recycle_root %} + {{repo_dir_name}} + {% for name, link in zipped %} + {% if not forloop.last %} + / {{ name }} + {% else %} + / {{ name }} + {% endif %} + {% endfor %} + {% else %} + {{repo_dir_name}} + {% endif %} +

+ + {% if enable_clean %} +
+ +
+ {% endif %} +
+ + + + + + + + + + + {% for dirent in dir_entries %} + {% if dirent.is_dir %} + + + {% if show_recycle_root %} + + + + + {% if dir_path %} + + {% else %} + + {% endif %} + + {% else %} + + + + + {% endif %} + + {% else %} + + + {% if show_recycle_root %} + + + + + {% if dir_path %} + + {% else %} + + {% endif %} + + {% else %} + + + + + {% endif %} + + {% endif %} + {% endfor %} +
{% trans "Name" %}{% trans "Delete Time" %}{% trans "Size" %}{% trans "Operations" %}
{% trans {{ dirent.obj_name }}{{ dirent.delete_time|translate_seahub_time }}{% trans "Restore" %}{% trans "Restore" %}{{ dirent.obj_name }}
{% trans {{ dirent.obj_name }}{{ dirent.delete_time|translate_seahub_time }}{{ dirent.file_size|filesizeformat }}{% trans "Restore" %}{% trans "Restore" %}{{ dirent.props.obj_name }}{{ dirent.file_size|filesizeformat }}
+ +{% if trash_more %} +
+
+ +
+{% endif %} + +{% if enable_clean %} +
{% csrf_token %} +

{% trans "Clean" %}

+

{% trans "Clear files in trash and history：" %}

+ + + +
+{% endif %} +{% endblock %} + +{% block extra_script %} + +{% endblock %} diff --git a/seahub/templates/repo_recycle_view.html b/seahub/templates/repo_recycle_view.html deleted file mode 100644 index 004f059615..0000000000 --- a/seahub/templates/repo_recycle_view.html +++ /dev/null @@ -1,125 +0,0 @@ -{% extends base_template %} - -{% load seahub_tags avatar_tags i18n %} -{% load url from future %} - -{% block main_panel %} -

{% blocktrans with repo_name=repo.props.name %}{{repo_name}} Trash{% endblocktrans %}

-
-

- {% trans "Current path: " %} - {% if not show_recycle_root %} - {{repo.name}} - {% for name, link in zipped %} - {% if not forloop.last %} - / {{ name }} - {% else %} - / {{ name }} - {% endif %} - {% endfor %} - - {% else %} - {{repo.name}} - {% endif %} -

- - {% if show_recycle_root %} -
- - {% if days != 7 %} - {% trans "a week" %} / - {% else %} - {% trans "a week" %} / - {% endif %} - {% if days != 30 %} - {% trans "a month" %} / - {% else %} - {% trans "a month" %} / - {% endif %} - {% if days != 0 %} - {% trans "all" %} - {% else %} - {% trans "all" %} - {% endif %} - - {% if enable_clean %} - - {% endif %} -
- {% endif %} -
- - - - - - - - - - - {% for dirent in dir_list %} - - - {% if show_recycle_root %} - - - - - {% else %} - - - - - {% endif %} - - {% endfor %} - - {% for dirent in file_list %} - - - {% if show_recycle_root %} - - - - - {% else %} - - - - - {% endif %} - - {% endfor %} -
{% trans "Name" %}{% trans "Delete Time" %}{% trans "Size" %}{% trans "Operations" %}
{% trans {{ dirent.obj_name }}{{ dirent.delete_time|translate_seahub_time }}{% trans "Restore" %}{{ dirent.obj_name }}
{% trans {{ dirent.obj_name }}{{ dirent.delete_time|translate_seahub_time }}{{ dirent.file_size|filesizeformat }}{% trans "Restore" %}{{ dirent.props.obj_name }}{{ dirent.file_size|filesizeformat }}
- -{% if enable_clean and show_recycle_root %} -
{% csrf_token %} -

{% trans "Clean" %}

-

{% trans "Clear files in trash and history：" %}

- - - -
-{% endif %} -{% endblock %} - -{% block extra_script %} - -{% endblock %} diff --git a/seahub/templates/snippets/repo_dir_trash_tr.html b/seahub/templates/snippets/repo_dir_trash_tr.html new file mode 100644 index 0000000000..efac13b48e --- /dev/null +++ b/seahub/templates/snippets/repo_dir_trash_tr.html @@ -0,0 +1,35 @@ +{% load seahub_tags i18n %} + +{% for dirent in dir_entries %} +{% if dirent.is_dir %} + + {% trans + {% if show_recycle_root %} + {{ dirent.obj_name }} + {{ dirent.delete_time|translate_seahub_time }} + + {% trans "Restore" %} + {% else %} + {{ dirent.obj_name }} + + + + {% endif %} + +{% else %} + + {% trans + {% if show_recycle_root %} + {{ dirent.obj_name }} + {{ dirent.delete_time|translate_seahub_time }} + {{ dirent.file_size|filesizeformat }} + {% trans "Restore" %} + {% else %} + {{ dirent.props.obj_name }} + + {{ dirent.file_size|filesizeformat }} + + {% endif %} + +{% endif %} +{% endfor %} diff --git a/seahub/templates/view_trash_file.html b/seahub/templates/view_trash_file.html index 8b21602e76..4bec1c7a80 100644 --- a/seahub/templates/view_trash_file.html +++ b/seahub/templates/view_trash_file.html @@ -9,6 +9,6 @@ {% block file_path %} {% trans "Current Path: "%} {% for name, link in zipped %} - {% if not forloop.last %} {{ name }} / {% else %} {{ name }} {% endif %} + {% if not forloop.last %} {{ name }} / {% else %} {{ name }} {% endif %} {% endfor %} {% endblock %} diff --git a/seahub/urls.py b/seahub/urls.py index 93606f1c37..3d3fa680b9 100644 --- a/seahub/urls.py +++ b/seahub/urls.py @@ -177,6 +177,8 @@ urlpatterns = patterns( url(r'^ajax/repo/(?P[-0-9a-f]{36})/set-user-folder-perm/$', set_user_folder_perm, name='set_user_folder_perm'), url(r'^ajax/repo/(?P[-0-9a-f]{36})/set-group-folder-perm/$', set_group_folder_perm, name='set_group_folder_perm'), + url(r'^ajax/(?P[-0-9a-f]{36})/repo-dir/recycle/more/$', ajax_repo_dir_recycle_more, name='ajax_repo_dir_recycle_more'), + url(r'^_templates/(?P