diff --git a/THANKS b/THANKS
index 804a8fb18..847d02a42 100644
--- a/THANKS
+++ b/THANKS
@@ -31,6 +31,9 @@ OpenSlides uses parts of the following projects:
- jQuery Templating Plugin
License: MIT/GPLv2
+ - jQuery bsmSelect
+
+ License: MIT/GPLv2
* jQuery UI
diff --git a/openslides/agenda/static/javascript/agenda-config-datepicker.js b/openslides/agenda/static/javascript/agenda-config-datepicker.js
index d226e1c5f..e2116ff86 100644
--- a/openslides/agenda/static/javascript/agenda-config-datepicker.js
+++ b/openslides/agenda/static/javascript/agenda-config-datepicker.js
@@ -22,7 +22,7 @@ $(function() {
gettext('Oct'), gettext('Nov'), gettext('Dec')
],
dayNames: [
- gettext('Sunday'), gettext('Monday'), gettext('Tuesdey'), gettext('Wednesday'),
+ gettext('Sunday'), gettext('Monday'), gettext('Tuesday'), gettext('Wednesday'),
gettext('Thursday'), gettext('Friday'), gettext('Saturday')
],
dayNamesMin: [
diff --git a/openslides/locale/en/LC_MESSAGES/djangojs.po b/openslides/locale/en/LC_MESSAGES/djangojs.po
index a3c2adbdc..1908a5bcf 100644
--- a/openslides/locale/en/LC_MESSAGES/djangojs.po
+++ b/openslides/locale/en/LC_MESSAGES/djangojs.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-07 23:49+0200\n"
+"POT-Creation-Date: 2013-09-02 13:52+0200\n"
"Language: en\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -126,7 +126,7 @@ msgid "Monday"
msgstr ""
#: agenda/static/javascript/agenda-config-datepicker.js:25
-msgid "Tuesdey"
+msgid "Tuesday"
msgstr ""
#: agenda/static/javascript/agenda-config-datepicker.js:25
diff --git a/openslides/motion/pdf.py b/openslides/motion/pdf.py
index 3b86c1aff..eb5deb725 100644
--- a/openslides/motion/pdf.py
+++ b/openslides/motion/pdf.py
@@ -84,11 +84,7 @@ def motion_to_pdf(pdf, motion):
supporters = motion.supporter.all()
for supporter in supporters:
cell3b.append(Paragraph(" . %s" % unicode(supporter),
- stylesheet['Signaturefield']))
- if motion.state.allow_support:
- for count in range(config['motion_min_supporters'] - supporters.count()):
- cell3b.append(Paragraph(" . " + 42 * "_",
- stylesheet['Signaturefield']))
+ stylesheet['Normal']))
cell3b.append(Spacer(0, 0.2 * cm))
motion_data.append([cell3a, cell3b])
@@ -212,8 +208,11 @@ def convert_html_to_reportlab(pdf, text):
if paragraph == '\n' or paragraph == '\n\n' or paragraph == '\n\t':
continue
if "" in paragraph:
- pdf.append(Paragraph(paragraph.replace('\n', ' '), stylesheet['InnerMonotypeParagraph'], str(paragraph_number)))
- paragraph_number += 1
+ if config["motion_pdf_paragraph_numbering"]:
+ pdf.append(Paragraph(paragraph.replace('\n', ' '), stylesheet['InnerMonotypeParagraph'], str(paragraph_number)))
+ paragraph_number += 1
+ else:
+ pdf.append(Paragraph(paragraph.replace('\n', ' '), stylesheet['InnerMonotypeParagraph']))
elif "" in paragraph:
pdf.append(Paragraph(paragraph, stylesheet['InnerListParagraph']))
elif "" in paragraph:
pdf.append(Paragraph(paragraph, stylesheet['InnerH3Paragraph']))
else:
- pdf.append(Paragraph(paragraph, stylesheet['InnerParagraph'], str(paragraph_number)))
- paragraph_number += 1
+ if config["motion_pdf_paragraph_numbering"]:
+ pdf.append(Paragraph(paragraph, stylesheet['InnerParagraph'], str(paragraph_number)))
+ paragraph_number += 1
+ else:
+ pdf.append(Paragraph(paragraph, stylesheet['InnerParagraph']))
def all_motion_cover(pdf, motions):
diff --git a/openslides/motion/signals.py b/openslides/motion/signals.py
index 4a43663ef..fc218e363 100644
--- a/openslides/motion/signals.py
+++ b/openslides/motion/signals.py
@@ -38,9 +38,7 @@ def setup_motion_config_page(sender, **kwargs):
form_field=forms.IntegerField(
widget=forms.TextInput(attrs={'class': 'small-input'}),
label=ugettext_lazy('Number of (minimum) required supporters for a motion'),
- initial=4,
min_value=0,
- max_value=8,
help_text=ugettext_lazy('Choose 0 to disable the supporting system.')))
motion_remove_supporters = ConfigVariable(
name='motion_remove_supporters',
@@ -88,6 +86,12 @@ def setup_motion_config_page(sender, **kwargs):
widget=forms.Textarea(),
required=False,
label=ugettext_lazy('Preamble text for PDF document (all motions)')))
+ motion_pdf_paragraph_numbering = ConfigVariable(
+ name='motion_pdf_paragraph_numbering',
+ default_value=False,
+ form_field=forms.BooleanField(
+ label=ugettext_lazy('Show paragraph numbering'),
+ required=False))
motion_allow_disable_versioning = ConfigVariable(
name='motion_allow_disable_versioning',
default_value=False,
@@ -126,6 +130,7 @@ def setup_motion_config_page(sender, **kwargs):
motion_pdf_ballot_papers_number,
motion_pdf_title,
motion_pdf_preamble,
+ motion_pdf_paragraph_numbering,
motion_allow_disable_versioning,
motion_workflow,
motion_identifier))
diff --git a/openslides/motion/static/styles/motion.css b/openslides/motion/static/styles/motion.css
index 92f28f76a..5bba51dbb 100644
--- a/openslides/motion/static/styles/motion.css
+++ b/openslides/motion/static/styles/motion.css
@@ -5,11 +5,6 @@
* :license: GNU GPL, see LICENSE for more details.
*/
-/* motion create/update form fields */
-#id_submitter, #id_supporter {
- height: 110px;
- width: auto;
-}
/* motion version diff table */
table.diff, .diff_row {
font-size: 12px;
diff --git a/openslides/motion/templates/motion/motion_form.html b/openslides/motion/templates/motion/motion_form.html
index 45919ec1e..aa8beff40 100644
--- a/openslides/motion/templates/motion/motion_form.html
+++ b/openslides/motion/templates/motion/motion_form.html
@@ -2,17 +2,29 @@
{% load tags %}
{% load i18n %}
-
{% load staticfiles %}
{% block header %}
+
{% endblock %}
{% block javascript %}
+
+
{% endblock %}
{% block title %}
diff --git a/openslides/participant/forms.py b/openslides/participant/forms.py
index 6f494b989..96862079a 100644
--- a/openslides/participant/forms.py
+++ b/openslides/participant/forms.py
@@ -26,8 +26,7 @@ class UserCreateForm(CssClassMixin, forms.ModelForm):
groups = LocalizedModelMultipleChoiceField(
# Hide the built-in groups 'Anonymous' (pk=1) and 'Registered' (pk=2)
queryset=Group.objects.exclude(pk=1).exclude(pk=2),
- label=ugettext_lazy('Groups'), required=False,
- help_text=ugettext_lazy('Hold down "Control", or "Command" on a Mac, to select more than one.'))
+ label=ugettext_lazy('Groups'), required=False)
class Meta:
model = User
diff --git a/openslides/participant/templates/participant/edit.html b/openslides/participant/templates/participant/edit.html
index 79162fe2a..a50a8d0f2 100644
--- a/openslides/participant/templates/participant/edit.html
+++ b/openslides/participant/templates/participant/edit.html
@@ -1,6 +1,26 @@
{% extends "base.html" %}
{% load i18n %}
+{% load staticfiles %}
+
+{% block header %}
+
+{% endblock %}
+
+{% block javascript %}
+
+
+{% endblock %}
{% block title %}
{% if edit_user %}
diff --git a/openslides/static/javascript/ckeditor/CHANGES.md b/openslides/static/javascript/ckeditor/CHANGES.md
index 2562bb185..f4cdd21e4 100644
--- a/openslides/static/javascript/ckeditor/CHANGES.md
+++ b/openslides/static/javascript/ckeditor/CHANGES.md
@@ -1,6 +1,53 @@
CKEditor 4 Changelog
====================
+## CKEditor 4.2
+
+**Important Notes:**
+
+* Dropped compatibility support for Internet Explorer 7 and Firefox 3.6.
+
+* Both the Basic and the Standard distribution packages will not contain the new [indentblock](http://ckeditor.com/addon/indentblock) plugin. Because of this the [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) might remove block indentations from existing contents. If you want to prevent this, either [add an appropriate ACF rule to your filter](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules) or create a custom build based on the Basic/Standard package and add the indentblock plugin in [CKBuilder](http://ckeditor.com/builder).
+
+Fixed issues:
+
+* [#10027](http://dev.ckeditor.com/ticket/10027): Separated list and block indentation into two plugins: [indentlist](http://ckeditor.com/addon/indentlist) and [indentblock](http://ckeditor.com/addon/indentblock).
+* [#8244](http://dev.ckeditor.com/ticket/8244): Use *(Shift+)Tab* to indent and outdent lists.
+* [#10599](http://dev.ckeditor.com/ticket/10599): [Indent](http://ckeditor.com/addon/indent) plugin is no longer required by the [list](http://ckeditor.com/addon/list) plugin.
+* [#10281](http://dev.ckeditor.com/ticket/10281): The [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) is now available. Several jQuery-related issues fixed: [#8261](http://dev.ckeditor.com/ticket/8261), [#9077](http://dev.ckeditor.com/ticket/9077), [#8710](http://dev.ckeditor.com/ticket/8710), [#8530](http://dev.ckeditor.com/ticket/8530), [#9019](http://dev.ckeditor.com/ticket/9019), [#6181](http://dev.ckeditor.com/ticket/6181), [#7876](http://dev.ckeditor.com/ticket/7876), [#6906](http://dev.ckeditor.com/ticket/6906).
+* [#10042](http://dev.ckeditor.com/ticket/10042): Introduced [config.title](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title) setting to change the human-readable title of the editor.
+* [#10370](http://dev.ckeditor.com/ticket/10370): Inconsistency in data events between framed and inline editors.
+* [#9794](http://dev.ckeditor.com/ticket/9794): Added [onChange](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
+* [#9923](http://dev.ckeditor.com/ticket/9923): HiDPI support in the editor UI. HiDPI icons for [Moono skin](http://ckeditor.com/addon/moono) added.
+* [#8031](http://dev.ckeditor.com/ticket/8031): Handle `required` attributes on `
+
+
+
+ This sample shows how tab key navigation among editor instances is
+ affected by the tabIndex
attribute from
+ the original page element. Use TAB key to move between the editors.
+
+
+
+
+
+
+
+
+
+
+
+
+
+ */ include "assets/posteddata.php"; ?>
diff --git a/openslides/static/javascript/ckeditor/samples/tabindex.html b/openslides/static/javascript/ckeditor/samples/tabindex.html
new file mode 100644
index 000000000..11c145221
--- /dev/null
+++ b/openslides/static/javascript/ckeditor/samples/tabindex.html
@@ -0,0 +1,75 @@
+
+
+
+