Add CKeditor to the agenda item text field

This commit is contained in:
Roland Geider 2013-10-15 16:18:40 +02:00 committed by Roland Geider
parent 2b04980fc7
commit 8f274c2691
5 changed files with 66 additions and 42 deletions

View File

@ -16,16 +16,19 @@ from django import forms
from django.utils.translation import ugettext_lazy from django.utils.translation import ugettext_lazy
from mptt.forms import TreeNodeChoiceField 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 openslides.utils.person.forms import PersonFormField
from .models import Item, Speaker from .models import Item, Speaker
class ItemForm(CssClassMixin, forms.ModelForm): class ItemForm(CleanHtmlFormMixin, CssClassMixin, forms.ModelForm):
""" """
Form to create of update an item. Form to create of update an item.
""" """
clean_html_fields = ('text', )
parent = TreeNodeChoiceField( parent = TreeNodeChoiceField(
queryset=Item.objects.all(), label=ugettext_lazy("Parent item"), required=False) queryset=Item.objects.all(), label=ugettext_lazy("Parent item"), required=False)

View File

@ -2,6 +2,7 @@
{% load i18n %} {% load i18n %}
{% load tags %} {% load tags %}
{% load staticfiles %}
{% block title %} {% block title %}
{% if item %} {% if item %}
@ -12,6 +13,23 @@
{{ block.super }} {{ block.super }}
{% endblock %} {% 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 %} {% block content %}
<h1> <h1>
{% if item %} {% if item %}

View File

@ -44,7 +44,7 @@
</h1> </h1>
<p> <p>
{% if not item.content_object %} {% if not item.content_object %}
{{ item.text|safe|linebreaks }} {{ item.text|safe }}
{% else %} {% else %}
<a href="{{ item.content_object|absolute_url }}" class="btn btn-small">{% trans item.content_type.name %} {{ item.content_object }}</a> <a href="{{ item.content_object|absolute_url }}" class="btn btn-small">{% trans item.content_type.name %} {{ item.content_object }}</a>
{% endif %} {% endif %}

View File

@ -5,12 +5,14 @@
{% load staticfiles %} {% load staticfiles %}
{% block header %} {% 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/motion.css' %}" />
<link type="text/css" rel="stylesheet" media="all" href="{% static 'styles/ckeditor.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" /> <link href="{% static 'styles/jquery.bsmselect.css' %}" type="text/css" rel="stylesheet" />
{% endblock %} {% endblock %}
{% block javascript %} {% block javascript %}
{{ block.super }}
<script type="text/javascript" src="{% static 'javascript/ckeditor/ckeditor.js' %}"></script> <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/ckeditor-config.js' %}"></script>
<script type="text/javascript" src="{% static 'javascript/jquery.bsmselect.js' %}"></script> <script type="text/javascript" src="{% static 'javascript/jquery.bsmselect.js' %}"></script>
@ -24,6 +26,12 @@
listItemLabelClass: 'bsmListItemLabel-custom', listItemLabelClass: 'bsmListItemLabel-custom',
removeClass: 'bsmListItemRemove-custom' removeClass: 'bsmListItemRemove-custom'
}); });
// Init CKeditor
$(function() {
CKEDITOR.replace('id_text', ck_options);
CKEDITOR.replace('id_reason', ck_options);
});
</script> </script>
{% endblock %} {% endblock %}

View File

@ -1,7 +1,6 @@
/* /*
* Configuration file for the CKeditor * 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 a custom CSS file allows us to specifically style elements entered
@ -43,7 +42,3 @@ $(function() {
], ],
toolbar: 'Full' toolbar: 'Full'
}; };
CKEDITOR.replace('id_text', ck_options);
CKEDITOR.replace('id_reason', ck_options);
});