From b45e0ea09fd4733625a0c625767c37f75cc27f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 16 Jun 2016 10:28:14 +0200 Subject: [PATCH 1/2] Fixed coding style. --- openslides/agenda/static/js/agenda/site.js | 4 ++-- openslides/assignments/static/js/assignments/base.js | 2 +- openslides/core/static/js/core/site.js | 12 ++++++------ openslides/motions/static/js/motions/site.js | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js index c10c998d1..facc1341e 100644 --- a/openslides/agenda/static/js/agenda/site.js +++ b/openslides/agenda/static/js/agenda/site.js @@ -544,8 +544,8 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda']) gettext('Show orange countdown in the last x seconds of speaking time'); gettext('Enter duration in seconds. Choose 0 to disable warning color.'); gettext('Couple countdown with the list of speakers'); - gettext('[Begin speech] starts the countdown, [End speech] stops the' + - ' countdown.'); + gettext('[Begin speech] starts the countdown, [End speech] stops the ' + + 'countdown.'); } ]); diff --git a/openslides/assignments/static/js/assignments/base.js b/openslides/assignments/static/js/assignments/base.js index 2a7cbe41b..5c8b95b6a 100644 --- a/openslides/assignments/static/js/assignments/base.js +++ b/openslides/assignments/static/js/assignments/base.js @@ -42,7 +42,7 @@ angular.module('OpenSlidesApp.assignments', []) } else if (config == "WITH_INVALID" && poll.votescast > 0 && vote.weight >= 0) { percentNumber = Math.round(vote.weight * 100 / (poll.votescast) * 10) / 10; } - if (percentNumber >=0) { + if (percentNumber >=0 ) { percentStr = "(" + percentNumber + "%)"; } votes.push({ diff --git a/openslides/core/static/js/core/site.js b/openslides/core/static/js/core/site.js index da205b5db..27a9ff521 100644 --- a/openslides/core/static/js/core/site.js +++ b/openslides/core/static/js/core/site.js @@ -1119,10 +1119,10 @@ angular.module('OpenSlidesApp.core.site', [ function (gettext) { gettext('Presentation and assembly system'); gettext('Event name'); - gettext('OpenSlides is a free' + - ' web based presentation and assembly system for visualizing' + - ' and controlling agenda, motions and elections of an' + - ' assembly.'); + gettext('OpenSlides is a free ' + + 'web based presentation and assembly system for visualizing ' + + 'and controlling agenda, motions and elections of an ' + + 'assembly.'); gettext('General'); gettext('Event'); gettext('Short description of Event'); @@ -1136,8 +1136,8 @@ angular.module('OpenSlidesApp.core.site', [ gettext('Show this text on the login page.'); gettext('Show logo on projector'); gettext('You can replace the logo. Just copy a file to '); - gettext('"static/img/logo-projector.png" in your OpenSlides data' + - ' path.'); + gettext('"static/img/logo-projector.png" in your OpenSlides data ' + + 'path.'); gettext('Projector'); gettext('Show title and description of event on projector'); gettext('Backgroundcolor of projector header and footer'); diff --git a/openslides/motions/static/js/motions/site.js b/openslides/motions/static/js/motions/site.js index 135ed75ee..93896fd5d 100644 --- a/openslides/motions/static/js/motions/site.js +++ b/openslides/motions/static/js/motions/site.js @@ -1073,8 +1073,8 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions']) gettext('Number of (minimum) required supporters for a motion'); gettext('Choose 0 to disable the supporting system.'); gettext('Supporters'); - gettext('Remove all supporters of a motion if a submitter edits his' + - ' motion in early state'); + gettext('Remove all supporters of a motion if a submitter edits his ' + + 'motion in early state'); gettext('Title for PDF document (all motions)'); gettext('Preamble text for PDF document (all motioqns)'); gettext('Show paragraph numbering (only in PDF)'); From 8e297e4a9a53842314ab0064db8ee640d68f4c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Thu, 16 Jun 2016 10:59:35 +0200 Subject: [PATCH 2/2] Silenced flake 8 errors. Fixed #2202. --- tests/old/settings.py | 6 +++--- tests/settings.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/old/settings.py b/tests/old/settings.py index be58c6922..e50cb34cc 100644 --- a/tests/old/settings.py +++ b/tests/old/settings.py @@ -16,11 +16,11 @@ SECRET_KEY = 'secret' # OpenSlides plugins # Add plugins to this list. -INSTALLED_PLUGINS += ( +INSTALLED_PLUGINS += ( # noqa 'tests.old.utils', ) -INSTALLED_APPS += INSTALLED_PLUGINS +INSTALLED_APPS += INSTALLED_PLUGINS # noqa # Database @@ -40,7 +40,7 @@ TIME_ZONE = 'Europe/Berlin' MEDIA_ROOT = os.path.join(OPENSLIDES_USER_DATA_PATH, '') -STATICFILES_DIRS.insert(0, os.path.join(OPENSLIDES_USER_DATA_PATH, 'static')) +STATICFILES_DIRS.insert(0, os.path.join(OPENSLIDES_USER_DATA_PATH, 'static')) # noqa SEARCH_INDEX = 'ram' diff --git a/tests/settings.py b/tests/settings.py index 5f1d60e81..aad6b237b 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -16,11 +16,11 @@ SECRET_KEY = 'secret' # OpenSlides plugins # Add plugins to this list. -INSTALLED_PLUGINS += ( +INSTALLED_PLUGINS += ( # noqa 'tests.integration.test_plugin', ) -INSTALLED_APPS += INSTALLED_PLUGINS +INSTALLED_APPS += INSTALLED_PLUGINS # noqa # Database @@ -40,7 +40,7 @@ TIME_ZONE = 'Europe/Berlin' MEDIA_ROOT = os.path.join(OPENSLIDES_USER_DATA_PATH, '') -STATICFILES_DIRS.insert(0, os.path.join(OPENSLIDES_USER_DATA_PATH, 'static')) +STATICFILES_DIRS.insert(0, os.path.join(OPENSLIDES_USER_DATA_PATH, 'static')) # noqa SEARCH_INDEX = 'ram'