Merge pull request #914 from rolandgeider/issue-626
Add CKeditor to the agenda item text field
This commit is contained in:
Oskar Hahn
commit
2f288f6cb1
@ -16,16 +16,19 @@ from django import forms
|
||||
from django.utils.translation import ugettext_lazy
|
||||
from mptt.forms import TreeNodeChoiceField
|
||||
|
||||
from openslides.utils.forms import CssClassMixin
|
||||
from openslides.utils.forms import CssClassMixin, CleanHtmlFormMixin
|
||||
from openslides.utils.person.forms import PersonFormField
|
||||
|
||||
from .models import Item, Speaker
|
||||
|
||||
|
||||
class ItemForm(CssClassMixin, forms.ModelForm):
|
||||
class ItemForm(CleanHtmlFormMixin, CssClassMixin, forms.ModelForm):
|
||||
"""
|
||||
Form to create of update an item.
|
||||
"""
|
||||
|
||||
clean_html_fields = ('text', )
|
||||
|
||||
parent = TreeNodeChoiceField(
|
||||
queryset=Item.objects.all(), label=ugettext_lazy("Parent item"), required=False)
|
||||
|
||||
|
||||
@ -2,6 +2,7 @@
|
||||
|
||||
{% load i18n %}
|
||||
{% load tags %}
|
||||
{% load staticfiles %}
|
||||
|
||||
{% block title %}
|
||||
{% if item %}
|
||||
@ -12,6 +13,23 @@
|
||||
– {{ block.super }}
|
||||
{% endblock %}
|
||||
|
||||
{% block header %}
|
||||
{{ block.super }}
|
||||
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/ckeditor.css' %}" />
|
||||
{% endblock %}
|
||||
|
||||
{% block javascript %}
|
||||
{{ block.super }}
|
||||
<script type="text/javascript" src="{% static 'javascript/ckeditor/ckeditor.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'javascript/ckeditor-config.js' %}"></script>
|
||||
<script>
|
||||
// Init CKeditor
|
||||
$(function() {
|
||||
CKEDITOR.replace('id_text', ck_options);
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>
|
||||
{% if item %}
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
</h1>
|
||||
<p>
|
||||
{% if not item.content_object %}
|
||||
{{ item.text|safe|linebreaks }}
|
||||
{{ item.text|safe }}
|
||||
{% else %}
|
||||
<a href="{{ item.content_object|absolute_url }}" class="btn btn-small">{% trans item.content_type.name %} {{ item.content_object }}</a>
|
||||
{% endif %}
|
||||
|
||||
@ -5,12 +5,14 @@
|
||||
{% load staticfiles %}
|
||||
|
||||
{% block header %}
|
||||
{{ block.super }}
|
||||
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/motion.css' %}" />
|
||||
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/ckeditor.css' %}" />
|
||||
<link href="{% static 'styles/jquery.bsmselect.css' %}" type="text/css" rel="stylesheet" />
|
||||
{% endblock %}
|
||||
|
||||
{% block javascript %}
|
||||
{{ block.super }}
|
||||
<script type="text/javascript" src="{% static 'javascript/ckeditor/ckeditor.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'javascript/ckeditor-config.js' %}"></script>
|
||||
<script type="text/javascript" src="{% static 'javascript/jquery.bsmselect.js' %}"></script>
|
||||
@ -24,6 +26,12 @@
|
||||
listItemLabelClass: 'bsmListItemLabel-custom',
|
||||
removeClass: 'bsmListItemRemove-custom'
|
||||
});
|
||||
|
||||
// Init CKeditor
|
||||
$(function() {
|
||||
CKEDITOR.replace('id_text', ck_options);
|
||||
CKEDITOR.replace('id_reason', ck_options);
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
@ -1,49 +1,44 @@
|
||||
/*
|
||||
* Configuration file for the CKeditor
|
||||
*/
|
||||
$(function() {
|
||||
var ck_options = {
|
||||
var ck_options = {
|
||||
|
||||
// Using a custom CSS file allows us to specifically style elements entered
|
||||
// using the editor. Using the CSS prefix class .ckeditor_html prevents these
|
||||
// styles from meddling with the main layout
|
||||
// Using a custom CSS file allows us to specifically style elements entered
|
||||
// using the editor. Using the CSS prefix class .ckeditor_html prevents these
|
||||
// styles from meddling with the main layout
|
||||
|
||||
contentsCss: "/static/styles/ckeditor.css",
|
||||
bodyClass: "ckeditor_html",
|
||||
contentsCss: "/static/styles/ckeditor.css",
|
||||
bodyClass: "ckeditor_html",
|
||||
|
||||
allowedContent:
|
||||
'h1 h2 h3 pre blockquote b i u strike;' +
|
||||
allowedContent:
|
||||
'h1 h2 h3 pre blockquote b i u strike;' +
|
||||
|
||||
// A workaround for the problem described in http://dev.ckeditor.com/ticket/10192
|
||||
// Hopefully, the problem will be solved in the final version of CKEditor 4.1
|
||||
// If so, then {margin-left} can be removed
|
||||
'p{margin-left};' +
|
||||
// A workaround for the problem described in http://dev.ckeditor.com/ticket/10192
|
||||
// Hopefully, the problem will be solved in the final version of CKEditor 4.1
|
||||
// If so, then {margin-left} can be removed
|
||||
'p{margin-left};' +
|
||||
|
||||
'a[!href];' +
|
||||
'table tr th td caption;' +
|
||||
'ol ul li;' +
|
||||
'span{!font-family};' +
|
||||
'span{!color};',
|
||||
removePlugins: "save, print, preview, pagebreak, templates, showblocks, magicline",
|
||||
'a[!href];' +
|
||||
'table tr th td caption;' +
|
||||
'ol ul li;' +
|
||||
'span{!font-family};' +
|
||||
'span{!color};',
|
||||
removePlugins: "save, print, preview, pagebreak, templates, showblocks, magicline",
|
||||
|
||||
// Not part of the standard package of CKEditor
|
||||
// http://ckeditor.com/addon/insertpre
|
||||
extraPlugins: "insertpre",
|
||||
// Not part of the standard package of CKEditor
|
||||
// http://ckeditor.com/addon/insertpre
|
||||
extraPlugins: "insertpre",
|
||||
|
||||
toolbar_Full: [
|
||||
{ name: 'document', items : [ 'Source','-','Save','DocProps','Preview','Print','-','Templates' ] },
|
||||
{ name: 'clipboard', items : [ 'Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo' ] },
|
||||
{ name: 'editing', items : [ 'Find','Replace','-','SpellChecker', 'Scayt' ] },
|
||||
{ name: 'forms', items : [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ] },
|
||||
{ name: 'basicstyles', items : [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ] },
|
||||
{ name: 'paragraph', items : [ 'NumberedList','BulletedList','-','Pre','InsertPre','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ] },
|
||||
{ name: 'links', items : [ 'Link','Unlink','Anchor' ] },
|
||||
{ name: 'styles', items : [ 'Format','FontSize' ] },
|
||||
{ name: 'tools', items : [ 'Maximize', 'ShowBlocks','-','About' ] }
|
||||
],
|
||||
toolbar: 'Full'
|
||||
};
|
||||
|
||||
CKEDITOR.replace('id_text', ck_options);
|
||||
CKEDITOR.replace('id_reason', ck_options);
|
||||
});
|
||||
toolbar_Full: [
|
||||
{ name: 'document', items : [ 'Source','-','Save','DocProps','Preview','Print','-','Templates' ] },
|
||||
{ name: 'clipboard', items : [ 'Cut','Copy','Paste','PasteText','PasteFromWord','-','Undo','Redo' ] },
|
||||
{ name: 'editing', items : [ 'Find','Replace','-','SpellChecker', 'Scayt' ] },
|
||||
{ name: 'forms', items : [ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField' ] },
|
||||
{ name: 'basicstyles', items : [ 'Bold','Italic','Underline','Strike','Subscript','Superscript','-','RemoveFormat' ] },
|
||||
{ name: 'paragraph', items : [ 'NumberedList','BulletedList','-','Pre','InsertPre','CreateDiv','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl' ] },
|
||||
{ name: 'links', items : [ 'Link','Unlink','Anchor' ] },
|
||||
{ name: 'styles', items : [ 'Format','FontSize' ] },
|
||||
{ name: 'tools', items : [ 'Maximize', 'ShowBlocks','-','About' ] }
|
||||
],
|
||||
toolbar: 'Full'
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user