haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00
Code Issues Releases Wiki Activity

[misc] fix

Browse Source
This commit is contained in:
llj
2016-07-20 14:20:19 +08:00
parent 603f88c6ab
commit 2f5cf202d9
8 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/templates/registration/login.html
View File

@@ -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">

2
seahub/templates/registration/logout.html
View File

@@ -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">

2
seahub/templates/registration/registration_form.html
View File

@@ -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" />

15
static/scripts/app/views/groups.js
View File

@@ -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);
},
complete: function() {
Common.closeModal();
$error.html(err_msg).show();
Common.enableButton($submitBtn);
}
});

5
static/scripts/app/views/notifications.js
View File

@@ -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();

2
static/scripts/sysadmin-app/views/dir.js
View File

@@ -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) {

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

@@ -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) {

2
static/scripts/sysadmin-app/views/trash-repos.js
View File

@@ -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) {