diff --git a/seahub/templates/base_for_backbone.html b/seahub/templates/base_for_backbone.html index db05a5980f..b920934ae3 100644 --- a/seahub/templates/base_for_backbone.html +++ b/seahub/templates/base_for_backbone.html @@ -50,7 +50,7 @@ {% block nav %}
{% trans "Email" %} | {% trans "Status" %} | {% trans "Role" %} | + {% else %} +{% trans "Email" %} | +{% trans "Status" %} | + {% endif %}{% trans "Space Used" %} | {% trans "Create At / Last Login" %} | {% trans "Operations" %} | @@ -67,7 +72,8 @@ {% endif %} - + + {% if is_pro %}
{% if user.source != 'LDAP' %}
@@ -88,6 +94,7 @@
{% endif %}
{% endif %}
|
+ {% endif %}
{{ user.space_usage|filesizeformat }} {% if user.space_quota > 0 %} / {{ user.space_quota|filesizeformat }} {% endif %} diff --git a/static/scripts/app/router.js b/static/scripts/app/router.js index 3a8d524602..f516d19c8b 100644 --- a/static/scripts/app/router.js +++ b/static/scripts/app/router.js @@ -28,7 +28,7 @@ define([ 'common/lib/:repo_id(/*path)': 'showCommonDir', 'starred/': 'showStarredFile', // Default - '*actions': 'defaultAction' + '*actions': 'showRepos' }, initialize: function() { @@ -158,14 +158,8 @@ define([ } this.switchCurrentView(this.orgView); this.orgView.showDir(repo_id, path); - }, - - defaultAction: function(actions) { - // We have no matching route, lets just log what the URL was - - this.switchCurrentView(this.myHomeView); - this.myHomeView.showMyRepos(); } + }); return Router; |
---|