[misc] fix

seahub/templates/registration/login.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Log In" %}{% endblock %}
+{% block sub_title %}{% trans "Log In" %} - {% endblock %}
 
 {% block main_content %}
 <div class="new-narrow-panel">

seahub/templates/registration/logout.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 
-{% block title %}{% trans "Log Out" %}{% endblock %}
+{% block sub_title %}{% trans "Log Out" %} - {% endblock %}
 
 {% block main_content %}
 <div class="text-panel">

seahub/templates/registration/registration_form.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% block title %}{% trans "Register" %}{% endblock %}
+{% block sub_title %}{% trans "Register" %} - {% endblock %}
 
 {% block extra_style %}
 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}css/bootstrap.popover.min.css" />

static/scripts/app/views/groups.js

@@ -105,10 +105,16 @@ define([
             var _this = this;
             $form.submit(function() {
                 var group_name = $.trim($('[name="group_name"]', $form).val());
+                var $error = $('.error', $form);
+                var $submitBtn = $('[type="submit"]', $form);
+
                 if (!group_name) {
+                    $error.html(gettext("It is required.")).show();
                     return false;
                 }
-                Common.disableButton($('[type="submit"]', $form));
+
+                $error.hide();
+                Common.disableButton($submitBtn);
                 groups.create({'name': group_name, 'repos':[]}, {
                     wait: true,
                     validate: true,
@@ -118,6 +124,7 @@ define([
                             _this.reset();
                         }
                         app.ui.sideNavView.updateGroups();
+                        Common.closeModal();
                     },
                     error: function(collection, response, options) {
                         var err_msg;
@@ -126,10 +133,8 @@ define([
                         } else {
                             err_msg = gettext('Please check the network.');
                         }
-                        Common.feedback(err_msg, 'error', Common.ERROR_TIMEOUT);
+                        $error.html(err_msg).show();
-                    },
+                        Common.enableButton($submitBtn);
-                    complete: function() {
-                        Common.closeModal();
                     }
                 });
 

static/scripts/app/views/notifications.js

@@ -44,12 +44,15 @@ define([
                             $num.addClass('hide');
                             document.title =  _this.orig_doc_title;
                         }
+                    },
+                    error: function() { // e.g. 401 UNAUTHORIZED
+                        clearInterval(reqInterval); // stop sending requests
                     }
                 });
             };
             reqUnreadNum();
             // request every 30s
-            setInterval(reqUnreadNum, 30*1000);
+            var reqInterval = setInterval(reqUnreadNum, 30*1000);
 
             $('#notice-icon').click(function() {
                 _this.toggle();

static/scripts/sysadmin-app/views/dir.js

@@ -181,7 +181,7 @@ define([
                 data: {'parent_dir': dir.path},
                 cache: false,
                 reset: true,
-                error: function (collection, response, opts) {
+                error: function(collection, response, opts) {
                     var err_msg;
                     if (response.responseText) {
                         if (response['status'] == 401 || response['status'] == 403) {

static/scripts/sysadmin-app/views/search-trash-repos.js

@@ -101,7 +101,7 @@ define([
                 data: {'owner': this.option.owner},
                 cache: false,
                 reset: true,
-                error: function (collection, response, opts) {
+                error: function(collection, response, opts) {
                     var err_msg;
                     if (response.responseText) {
                         if (response['status'] == 401 || response['status'] == 403) {

static/scripts/sysadmin-app/views/trash-repos.js

@@ -130,7 +130,7 @@ define([
                 data: {'page': this.option.page},
                 cache: false,
                 reset: true,
-                error: function (collection, response, opts) {
+                error: function(collection, response, opts) {
                     var err_msg;
                     if (response.responseText) {
                         if (response['status'] == 401 || response['status'] == 403) {