From c870a61d0ceee9e2d4ab38a6365012f841c93867 Mon Sep 17 00:00:00 2001 From: zhengxie Date: Fri, 17 Apr 2015 10:42:44 +0800 Subject: [PATCH] show guide when there is no owned repos --- seahub/templates/libraries.html | 7 ++----- seahub/views/__init__.py | 5 ++++- static/scripts/app/views/myhome-repos.js | 5 +++++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/seahub/templates/libraries.html b/seahub/templates/libraries.html index 657dc7187d..3b6a1c21e8 100644 --- a/seahub/templates/libraries.html +++ b/seahub/templates/libraries.html @@ -6,7 +6,6 @@ {% block extra_style %} {% endblock %} @@ -121,7 +119,6 @@ {% trans 'Loading...' %} -{% if need_guide %}
@@ -134,7 +131,7 @@
-{% endif %} + {% if sub_lib_enabled %}
@@ -251,10 +248,10 @@ app["pageOptions"] = { can_add_repo: {% if user.permissions.can_add_repo %} true {% else %} false {% endif %}, is_staff: {% if request.user.is_staff %} true {% else %} false {% endif %}, repo_password_min_length: {{ repo_password_min_length }}, + guide_enabled: {% if guide_enabled %} true {% else %} false {% endif %}, enable_upload_folder: {% if enable_upload_folder %} true {% else %} false {% endif %}, max_upload_file_size: {% if max_upload_file_size %} {{ max_upload_file_size }} {% else %} '' {% endif %} }; - {% if debug %} diff --git a/seahub/views/__init__.py b/seahub/views/__init__.py index c4b92e9438..3bcc11ea62 100644 --- a/seahub/views/__init__.py +++ b/seahub/views/__init__.py @@ -1133,8 +1133,11 @@ def libraries(request): else: allow_public_share = True sub_lib_enabled = UserOptions.objects.is_sub_lib_enabled(username) - guide_enabled = UserOptions.objects.is_user_guide_enabled(username) max_upload_file_size = get_max_upload_file_size() + guide_enabled = UserOptions.objects.is_user_guide_enabled(username) + if guide_enabled: + # only show guide once + UserOptions.objects.disable_user_guide(username) return render_to_response('libraries.html', { "allow_public_share": allow_public_share, diff --git a/static/scripts/app/views/myhome-repos.js b/static/scripts/app/views/myhome-repos.js index 08edd061d1..f412c02640 100644 --- a/static/scripts/app/views/myhome-repos.js +++ b/static/scripts/app/views/myhome-repos.js @@ -49,6 +49,11 @@ define([ } else { this.$emptyTip.show(); this.$table.hide(); + // Show guide popup when there is no owned repos and guide flag is true. + if (app.pageOptions.guide_enabled) { + $('#guide-for-new').modal({appendTo: '#main', focus:false}); + app.pageOptions.guide_enabled = false; + } } this.$loadingTip.hide(); },