ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2201 from normanjaeckel/Style

Browse Source 
Fixed coding style.
This commit is contained in:
Norman Jäckel 2016-06-17 20:02:04 +02:00 committed by GitHub
commit d4309cbeb3
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openslides/agenda/static/js/agenda/site.js
View File

@ -544,8 +544,8 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda'])
gettext('Show orange countdown in the last x seconds of speaking time'); gettext('Show orange countdown in the last x seconds of speaking time');
gettext('Enter duration in seconds. Choose 0 to disable warning color.'); gettext('Enter duration in seconds. Choose 0 to disable warning color.');
gettext('Couple countdown with the list of speakers'); gettext('Couple countdown with the list of speakers');
gettext('[Begin speech] starts the countdown, [End speech] stops the' + gettext('[Begin speech] starts the countdown, [End speech] stops the ' +
' countdown.'); 'countdown.');
} }
]); ]);

2
openslides/assignments/static/js/assignments/base.js
View File

@ -42,7 +42,7 @@ angular.module('OpenSlidesApp.assignments', [])
} else if (config == "WITH_INVALID" && poll.votescast > 0 && vote.weight >= 0) { } else if (config == "WITH_INVALID" && poll.votescast > 0 && vote.weight >= 0) {
percentNumber = Math.round(vote.weight * 100 / (poll.votescast) * 10) / 10; percentNumber = Math.round(vote.weight * 100 / (poll.votescast) * 10) / 10;
} }
if (percentNumber >=0) { if (percentNumber >=0 ) {
percentStr = "(" + percentNumber + "%)"; percentStr = "(" + percentNumber + "%)";
} }
votes.push({ votes.push({

12
openslides/core/static/js/core/site.js
View File

@ -1119,10 +1119,10 @@ angular.module('OpenSlidesApp.core.site', [
function (gettext) { function (gettext) {
gettext('Presentation and assembly system'); gettext('Presentation and assembly system');
gettext('Event name'); gettext('Event name');
gettext('<a href="http://www.openslides.org">OpenSlides</a> is a free' + gettext('<a href="http://www.openslides.org">OpenSlides</a> is a free ' +
' web based presentation and assembly system for visualizing' + 'web based presentation and assembly system for visualizing ' +
' and controlling agenda, motions and elections of an' + 'and controlling agenda, motions and elections of an ' +
' assembly.'); 'assembly.');
gettext('General'); gettext('General');
gettext('Event'); gettext('Event');
gettext('Short description of 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 this text on the login page.');
gettext('Show logo on projector'); gettext('Show logo on projector');
gettext('You can replace the logo. Just copy a file to '); gettext('You can replace the logo. Just copy a file to ');
gettext('"static/img/logo-projector.png" in your OpenSlides data' + gettext('"static/img/logo-projector.png" in your OpenSlides data ' +
' path.'); 'path.');
gettext('Projector'); gettext('Projector');
gettext('Show title and description of event on projector'); gettext('Show title and description of event on projector');
gettext('Backgroundcolor of projector header and footer'); gettext('Backgroundcolor of projector header and footer');

4
openslides/motions/static/js/motions/site.js
View File

@ -1073,8 +1073,8 @@ angular.module('OpenSlidesApp.motions.site', ['OpenSlidesApp.motions'])
gettext('Number of (minimum) required supporters for a motion'); gettext('Number of (minimum) required supporters for a motion');
gettext('Choose 0 to disable the supporting system.'); gettext('Choose 0 to disable the supporting system.');
gettext('Supporters'); gettext('Supporters');
gettext('Remove all supporters of a motion if a submitter edits his' + gettext('Remove all supporters of a motion if a submitter edits his ' +
' motion in early state'); 'motion in early state');
gettext('Title for PDF document (all motions)'); gettext('Title for PDF document (all motions)');
gettext('Preamble text for PDF document (all motioqns)'); gettext('Preamble text for PDF document (all motioqns)');
gettext('Show paragraph numbering (only in PDF)'); gettext('Show paragraph numbering (only in PDF)');

6
tests/old/settings.py
View File

@ -16,11 +16,11 @@ SECRET_KEY = 'secret'
# OpenSlides plugins # OpenSlides plugins
# Add plugins to this list. # Add plugins to this list.
INSTALLED_PLUGINS += ( INSTALLED_PLUGINS += ( # noqa
'tests.old.utils', 'tests.old.utils',
) )
INSTALLED_APPS += INSTALLED_PLUGINS INSTALLED_APPS += INSTALLED_PLUGINS # noqa
# Database # Database
@ -40,7 +40,7 @@ TIME_ZONE = 'Europe/Berlin'
MEDIA_ROOT = os.path.join(OPENSLIDES_USER_DATA_PATH, '') 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' SEARCH_INDEX = 'ram'

6
tests/settings.py
View File

@ -16,11 +16,11 @@ SECRET_KEY = 'secret'
# OpenSlides plugins # OpenSlides plugins
# Add plugins to this list. # Add plugins to this list.
INSTALLED_PLUGINS += ( INSTALLED_PLUGINS += ( # noqa
'tests.integration.test_plugin', 'tests.integration.test_plugin',
) )
INSTALLED_APPS += INSTALLED_PLUGINS INSTALLED_APPS += INSTALLED_PLUGINS # noqa
# Database # Database
@ -40,7 +40,7 @@ TIME_ZONE = 'Europe/Berlin'
MEDIA_ROOT = os.path.join(OPENSLIDES_USER_DATA_PATH, '') 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' SEARCH_INDEX = 'ram'