Merge pull request #3482 from FinnStutzenstein/Improvements

Some improvements
This commit is contained in:
Emanuel Schütze 2017-11-17 14:55:38 +01:00 committed by GitHub
commit 7a3d3d99d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 3 deletions

View File

@ -18,7 +18,7 @@
"angular-sanitize": "~1.5.8",
"angular-scroll-glue": "~2.0.7",
"angular-ui-router": "~0.3.1",
"angular-ui-tree": "2.22.5",
"angular-ui-tree": "https://github.com/FinnStutzenstein/angular-ui-tree.git#94dbaaff6b36f9d7a514843b73c28d2a3684c0c0",
"angular-xeditable": "~0.5.0",
"angularjs-slider": "~6.2.2",
"bootstrap-css-only": "~3.3.6",

3
debug/start_daphne.py Normal file
View File

@ -0,0 +1,3 @@
from daphne.cli import CommandLineInterface
CommandLineInterface.entrypoint()

View File

@ -39,7 +39,7 @@ angular.module('OpenSlidesApp.agenda.site', [
.config([
'$stateProvider',
'gettext',
function($stateProvider, gettext) {
function ($stateProvider, gettext) {
$stateProvider
.state('agenda', {
url: '/agenda',
@ -76,6 +76,14 @@ angular.module('OpenSlidesApp.agenda.site', [
}
])
// Set the sensitivity of moving nodes horizontal for the ui-tree.
.config([
'treeConfig',
function (treeConfig) {
treeConfig.dragMoveSensitivity = 20;
}
])
.controller('ItemListCtrl', [
'$scope',
'$filter',

View File

@ -296,7 +296,8 @@ img {
#nav .searchbar {
float: right;
margin-top: 35px;
margin-top: 33px;
margin-bottom: 32px;
display: inline-table;
}

View File

@ -709,6 +709,8 @@ angular.module('OpenSlidesApp.core', [
message += gettextCatalog.getString("The server didn't respond.");
} else if (error.data.detail) {
message += error.data.detail;
} else if (error.status === 500) {
message += gettextCatalog.getString("A server error occurred. Please check the system logs.");
} else {
for (var e in error.data) {
message += e + ': ' + error.data[e] + ' ';