From ff90c7cfb4c3c17a303ce4af8fd8be7725c9d6e6 Mon Sep 17 00:00:00 2001 From: llj Date: Tue, 7 Aug 2018 17:05:41 +0800 Subject: [PATCH] [org admin] added 'address-book' --- .../templates/js/admin-common-templates.html | 223 ++++++++++++++++++ seahub/templates/js/orgadmin-templates.html | 30 +++ seahub/templates/js/sysadmin-templates.html | 217 ----------------- .../templates/sysadmin/sysadmin_backbone.html | 4 +- static/scripts/common.js | 17 +- static/scripts/orgadmin-app/main.js | 6 + static/scripts/orgadmin-app/router.js | 76 ++++++ static/scripts/orgadmin-app/views/side-nav.js | 74 ++++++ static/scripts/orgadmin-main.js | 4 + .../collection/address-book-group.js | 19 +- .../collection/address-book-groups.js | 13 +- .../sysadmin-app/collection/group-repos.js | 15 +- .../views/address-book-group-item.js | 38 ++- .../views/address-book-group-library.js | 21 +- .../sysadmin-app/views/address-book-group.js | 67 ++++-- .../sysadmin-app/views/group-member.js | 30 ++- 16 files changed, 588 insertions(+), 266 deletions(-) create mode 100644 seahub/templates/js/admin-common-templates.html create mode 100644 seahub/templates/js/orgadmin-templates.html create mode 100644 static/scripts/orgadmin-app/main.js create mode 100644 static/scripts/orgadmin-app/router.js create mode 100644 static/scripts/orgadmin-app/views/side-nav.js create mode 100644 static/scripts/orgadmin-main.js diff --git a/seahub/templates/js/admin-common-templates.html b/seahub/templates/js/admin-common-templates.html new file mode 100644 index 0000000000..1de5fce527 --- /dev/null +++ b/seahub/templates/js/admin-common-templates.html @@ -0,0 +1,223 @@ +{% load avatar_tags i18n %} + + + + + + + +{# address book #} + + + + + + + + diff --git a/seahub/templates/js/orgadmin-templates.html b/seahub/templates/js/orgadmin-templates.html new file mode 100644 index 0000000000..f00b5050e1 --- /dev/null +++ b/seahub/templates/js/orgadmin-templates.html @@ -0,0 +1,30 @@ +{% load avatar_tags i18n %} + + diff --git a/seahub/templates/js/sysadmin-templates.html b/seahub/templates/js/sysadmin-templates.html index 29f84019cb..da8574e486 100644 --- a/seahub/templates/js/sysadmin-templates.html +++ b/seahub/templates/js/sysadmin-templates.html @@ -314,25 +314,6 @@ {% include "trusted_ip/sysadmin-templates_trusted_ip.html" %} - - - - - - - -{# address book #} - - - - - - - - diff --git a/seahub/templates/sysadmin/sysadmin_backbone.html b/seahub/templates/sysadmin/sysadmin_backbone.html index 1912e336be..faf48381c3 100644 --- a/seahub/templates/sysadmin/sysadmin_backbone.html +++ b/seahub/templates/sysadmin/sysadmin_backbone.html @@ -71,7 +71,9 @@ {% include 'js/common-templates.html' %} {% include 'js/sysadmin-templates.html' %} -{% include "js/lib-op-popups.html" %} +{% include 'js/admin-common-templates.html' %} {# for sys admin & org admin #} +{% include 'js/lib-op-popups.html' %} +