From a9427bb6e166bb9eeb4dcd69a8a7b404760290a4 Mon Sep 17 00:00:00 2001 From: zxj96 <519213124@qq.com> Date: Tue, 18 Jun 2019 22:17:50 +0800 Subject: [PATCH 1/8] add delete-repo-dialog --- .../shared-repo-list-item.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js index 2c4cc50a95..63b169947d 100644 --- a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js +++ b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js @@ -8,6 +8,7 @@ import { gettext, siteRoot, isPro, username, folderPermEnabled, isSystemStaff } import ModalPortal from '../../components/modal-portal'; import ShareDialog from '../../components/dialog/share-dialog'; import LibSubFolderPermissionDialog from '../../components/dialog/lib-sub-folder-permission-dialog'; +import DeleteRepoDialog from '../../components/dialog/delete-repo-dialog'; import Rename from '../rename'; import { seafileAPI } from '../../utils/seafile-api'; @@ -35,7 +36,8 @@ class SharedRepoListItem extends React.Component { isShowSharedDialog: false, isRenaming: false, isStarred: this.props.repo.starred, - isFolderPermissionDialogOpen: false + isFolderPermissionDialogOpen: false, + isDeleteDialogShow: false }; this.isDeparementOnwerGroupMember = false; } @@ -161,8 +163,8 @@ class SharedRepoListItem extends React.Component { this.props.onItemUnshare(this.props.repo); } - onItemDelete = () => { - this.props.onItemDelete(this.props.repo); + onItemDeleteToggle = () => { + this.setState({isDeleteDialogShow: !this.state.isDeleteDialogShow}) } toggleShareDialog = () => { @@ -284,7 +286,7 @@ class SharedRepoListItem extends React.Component { } const shareOperation = ; const unshareOperation = ; - const deleteOperation = ; + const deleteOperation = ; if (this.isDeparementOnwerGroupMember) { return ( @@ -306,6 +308,13 @@ class SharedRepoListItem extends React.Component { })} + {this.state.isDeleteDialogShow && + + } ); } else { From f35f327838c6dc235a52cfd356ca5a16f792f7df Mon Sep 17 00:00:00 2001 From: zxj96 <519213124@qq.com> Date: Wed, 19 Jun 2019 09:56:14 +0800 Subject: [PATCH 2/8] Add modalportal --- .../shared-repo-list-item.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js index 63b169947d..b62b6019ca 100644 --- a/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js +++ b/frontend/src/components/shared-repo-list-view/shared-repo-list-item.js @@ -308,13 +308,6 @@ class SharedRepoListItem extends React.Component { })} - {this.state.isDeleteDialogShow && - - } ); } else { @@ -400,6 +393,15 @@ class SharedRepoListItem extends React.Component { /> )} + {this.state.isDeleteDialogShow && + + + + } ); } From 3fca9745913531d6478bb4bfaf568a185c65acd8 Mon Sep 17 00:00:00 2001 From: zxj96 <519213124@qq.com> Date: Wed, 19 Jun 2019 10:11:58 +0800 Subject: [PATCH 3/8] Reverse button position --- frontend/src/components/dialog/delete-repo-dialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/dialog/delete-repo-dialog.js b/frontend/src/components/dialog/delete-repo-dialog.js index 942b0b2bb6..ea77d80214 100644 --- a/frontend/src/components/dialog/delete-repo-dialog.js +++ b/frontend/src/components/dialog/delete-repo-dialog.js @@ -34,8 +34,8 @@ class DeleteRepoDialog extends Component {

- + ); From c382e0609913c6874e82c04a95e47f64961761d1 Mon Sep 17 00:00:00 2001 From: llj Date: Wed, 19 Jun 2019 10:36:22 +0800 Subject: [PATCH 4/8] [help, system admin] redesigned 'side nav' for mobile --- media/css/seahub.css | 21 ++++++-- seahub/help/templates/help/base.html | 50 +++++++++++++------ seahub/templates/base.html | 18 ++++++- seahub/templates/js/sysadmin-templates.html | 12 ++++- seahub/templates/sysadmin/base.html | 14 +++++- static/scripts/sysadmin-app/views/side-nav.js | 21 +++++++- 6 files changed, 109 insertions(+), 27 deletions(-) diff --git a/media/css/seahub.css b/media/css/seahub.css index af31839515..299809380d 100644 --- a/media/css/seahub.css +++ b/media/css/seahub.css @@ -907,6 +907,11 @@ textarea:-moz-placeholder {/* for FF */ padding:0; } /**** side-tabnav ****/ +.logo-container { + padding: .5rem 1rem; + background: #f4f4f7; + border-bottom: 1px solid #e8e8e8; +} .side-textnav .hd, .side-info .hd { padding-bottom:4px; @@ -915,13 +920,16 @@ textarea:-moz-placeholder {/* for FF */ } @media (max-width: 767px) { .side-nav { - background: #f8f8f8; + background: #fff; + display:flex; + flex-direction:column; width:300px; + max-width: calc(100% - 40px); position:fixed; left:-300px; top:0; bottom:0; - z-index:1; + z-index:1002; box-shadow:0 0 4px #ccc; -webkit-transition: all 0.3s ease; -moz-transition: all 0.3s ease; @@ -932,7 +940,7 @@ textarea:-moz-placeholder {/* for FF */ } } .side-nav { - padding:20px; + padding:0; overflow:hidden; border-right:1px solid #eee; } @@ -948,8 +956,13 @@ textarea:-moz-placeholder {/* for FF */ border-right:1px solid #eee; } .side-nav-con { - overflow:hidden; padding:20px; + overflow:hidden; +} +@media (max-width: 767px) { + .side-nav-con { + overflow-y:auto; + } } .side-nav-con:hover { overflow-y:auto; diff --git a/seahub/help/templates/help/base.html b/seahub/help/templates/help/base.html index 1a1959c440..4987ebe05e 100644 --- a/seahub/help/templates/help/base.html +++ b/seahub/help/templates/help/base.html @@ -1,27 +1,45 @@ {% extends "base.html" %} {% load i18n %} +{% block extra_style %} + +{% endblock %} + {% block main_class %}d-flex ovhd{% endblock %} {% block main_content %}
- -

{% trans "Desktop Client and Syncing" %}

- -

{% trans "Security and Encryption" %}

- +
+ + {% if seacloud_mode %} + logo + {% else %} + logo + {% endif %} + +
+
+

{% trans "Desktop Client and Syncing" %}

+ +

{% trans "Security and Encryption" %}

+ +
{% block help_con %}{% endblock %}
diff --git a/seahub/templates/base.html b/seahub/templates/base.html index 3b597da243..7ae42b480c 100644 --- a/seahub/templates/base.html +++ b/seahub/templates/base.html @@ -239,17 +239,31 @@ $('#info-bar .close').on('click', function() { {% endif %} if ($('.side-nav').length) { - $('#logo').addClass('hidden-sm-down'); - $('#js-toggle-side-nav').removeClass('hide'); + $('#logo').addClass('hidden-sm-down'); + $('#js-toggle-side-nav').removeClass('hide'); } $('#js-toggle-side-nav').on('click', function() { $('.side-nav').addClass('side-nav-shown'); + $('').modal({ + overlayClose: true, + onClose: function() { + $('.side-nav').removeClass('side-nav-shown'); + $.modal.close(); + }}); + $('#simplemodal-container').css({'display':'none'}); return false; }); $('.js-close-side-nav').on('click', function() { $('.side-nav').removeClass('side-nav-shown'); return false; }); +$(window).on('resize', function() { + if ($(window).width() >= 768) { + $.modal.close(); + } else { + $('.side-nav').removeClass('side-nav-shown'); + } +}); {% block extra_script %}{% endblock %} diff --git a/seahub/templates/js/sysadmin-templates.html b/seahub/templates/js/sysadmin-templates.html index 420470946f..26eaaaaa54 100644 --- a/seahub/templates/js/sysadmin-templates.html +++ b/seahub/templates/js/sysadmin-templates.html @@ -1,7 +1,16 @@ {% load avatar_tags i18n %}