xeniac/kasu
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Removed manual references on the CKEditor, they will be injected by

Browse Source 
django-ckeditor
This commit is contained in:
Christian Berg
2017-06-26 17:12:57 +02:00
parent 7a54e55931
commit 8f4bdec701
3 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/content/templates/content/article_archive.html
View File

@@ -36,11 +36,14 @@
<ul class="fa-ul"> <ul class="fa-ul">
{% if active_category %} {% if active_category %}
{% for date in date_list %} {% for date in date_list %}
<li><span class="fa fa-calendar-o fa-fw"></span> <a href="{% url 'article-archive' category=active_category.slug year=date|date:'Y' %}">{{active_category.name}}: {{ date|date:'Y' }}</a></li> <li><span class="fa fa-calendar-o fa-fw"></span> <a
href="{% url 'article-archive' category=active_category.slug year=date|date:'Y' %}">{{active_category.name}}:
{{ date|date:'Y' }}</a></li>
{% endfor %} {% endfor %}
{% else %} {% else %}
{% for date in date_list %} {% for date in date_list %}
<li><span class="fa fa-calendar-o fa-fw"></span> <a href="{% url 'article-archive' year=date|date:'Y' %}">{{ date|date:'Y' }}</a></li> <li><span class="fa fa-calendar-o fa-fw"></span> <a href="{% url 'article-archive' year=date|date:'Y' %}">
{{ date|date:'Y' }}</a></li>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</ul> </ul>
@@ -49,7 +52,8 @@
{% block navigation %} {% block navigation %}
<ul id="navigation"> <ul id="navigation">
<li><a href="{{current_top_page.get_absolute_url}}" {% if not active_category %} class="active"{% endif %}>{% trans 'All Categories' %}</a></li> <li><a href="{{current_top_page.get_absolute_url}}"
{% if not active_category %} class="active" {% endif %}>{% trans 'All Categories' %}</a></li>
{% for category in categories %} {% for category in categories %}
<li><a href="{% url 'article-archive' category=category.slug %}" <li><a href="{% url 'article-archive' category=category.slug %}"
{% ifequal category.slug active_category.slug %} class="active"{% endifequal %}>{{ category.name }}</a></li> {% ifequal category.slug active_category.slug %} class="active"{% endifequal %}>{{ category.name }}</a></li>
@@ -64,13 +68,19 @@
<article class="article"> <article class="article">
<h3><a href="{{article.get_absolute_url}}">{{article.headline}}</a></h3> <h3><a href="{{article.get_absolute_url}}">{{article.headline}}</a></h3>
<ul class="info"> <ul class="info">
<li><span class="fa fa-calendar-o" title="{% trans 'created on' %}"></span> <time datetime="{{article.date_created|date:'c'}}">{{ article.date_created|date }}</time></li> <li><span class="fa fa-calendar-o" title="{% trans 'created on' %}"></span> <time
datetime="{{article.date_created|date:'c'}}">{{ article.date_created|date }}</time></li>
<li><span class="fa fa-user" title="{% trans 'by' %}"></span> {{ article.author }}</li> <li><span class="fa fa-user" title="{% trans 'by' %}"></span> {{ article.author }}</li>
<li><span class="fa fa-comments" title="{% trans 'comments' %}"></span> <a href="{{article.get_absolute_url}}#comments" >{{comment_count}} {% trans "comments" %}</a></li> <li><span class="fa fa-comments" title="{% trans 'comments' %}"></span> <a
href="{{article.get_absolute_url}}#comments" >{{comment_count}} {% trans "comments" %}</a></li>
</ul> </ul>
<a href="{{article.get_absolute_url}}"><img src="{{article.get_image|thumbnail_url:'article'}}" alt="{{article.category}}:" class="posting_image" width="200" height="120"/></a> <a href="{{article.get_absolute_url}}"><img src="{{article.get_image|thumbnail_url:'article'}}"
alt="{{article.category}}:" class="posting_image" width="200"
height="120"/></a>
{{article.content|truncatewords_html:50}} {{article.content|truncatewords_html:50}}
<p class="more_link"><a href="{{article.get_absolute_url}}" class="button">{% trans "Read More"%} <span class="fa fa-arrow-right"></span></a></p> <p class="more_link"><a href="{{article.get_absolute_url}}" class="button">{% trans "Read More"%}
<span class="fa fa-arrow-right"></span></a>
</p>
</article> </article>
{% empty %} {% empty %}
<p>{% trans "We're sorry. Your search yielded no results." %}</p> <p>{% trans "We're sorry. Your search yielded no results." %}</p>

81
src/content/templates/content/article_form.html
View File

@@ -1,51 +1,64 @@
{% extends "base.html" %} {% extends "base.html" %}
{% load i18n %} {% load i18n fieldset_extras %}
{% get_fieldset "category,image" from form as fieldset_common %}
{% block extra_head %} {% block extra_head %}
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script> <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js"></script> <script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/ckeditor/ckeditor.js"></script>
<script type="text/javascript">
window.onload = function () {
/*CKEDITOR.dtd.$removeEmpty['span'] = false;*/
CKEDITOR.replace('id_content_de', {language: 'de'});
CKEDITOR.replace('id_content_en', {language: 'en'});
}
</script>
{% endblock %} {% endblock %}
{% block maincontent %} {% block maincontent %}
<form action="" method="post" enctype="multipart/form-data"> <form action="" method="post" enctype="multipart/form-data">
<fieldset class="grid_12"> {{ form.media }} {% csrf_token %}
<legend>{% if object.pk %}{% trans "Edit Article" %}{% else %}{% trans "Create Article" %}{% endif %}</legend>
{% csrf_token %} <fieldset>
{% with fieldset_common as form %}{% include "form.html" %}{% endwith %} <div>
<label for="id_category" class="field_name {{ form.category.css_classes }}">{{ form.category.label}}</label>
{{ form.category }}
{% if form.category.help_text %}<p class="help_text">{{form.category.help_text}}</p>{% endif %}
{% if form.category.errors %}{{ form.category.errors }}{% endif %}
</div>
<div>
<label for="id_image" class="field_name {{ form.image.css_classes }}">{{ form.image.label}}</label>
{{ form.image }}
{% if form.image.help_text %}<p class="help_text">{{form.image.help_text}}</p>{% endif %}
{% if form.image.errors %}{{ form.image.errors }}{% endif %}
</div>
</fieldset> </fieldset>
<ul class="tabs grid_12"> <ul class="tabs grid_12">
<li><a href="#de">{% trans "German" %}</a></li> <li><a href="#de">{% trans "German" %}</a></li>
<li><a href="#en">{% trans "English" %}</a></li> <li><a href="#en">{% trans "English" %}</a></li>
</ul> </ul>
<label for="id_{{ form.headline_de.html_name }}" class="fieldname {{ form.headline_de.css_classes }}">
{{ form.headline_de.label }}</label>
<p class="grid_10">{{ form.headline_de }}</p>
<div class="tab_container"> <div class="tab_container">
<div id="de" class="tab_content"> <div id="de" class="tab_content">
<h3 class="grid_12">Deutsch</h3> <fieldset>
<label for="id_{{ form.headline_de.html_name }}" class="grid_2 {{ form.headline_de.css_classes }}">{{ form.headline_de.label }}</label> <legend>Deutsch</legend>
<p class="grid_10">{{ form.headline_de }}</p> <label for="id_{{ form.headline_de.html_name }}" class="fieldname {{ form.headline_de.css_classes }}">
<p>&nbsp;</p> {{ form.headline_de.label }}</label>
{{ form.content_de }} <p class="grid_10">{{ form.headline_de }}</p>
</div> </fieldset>
<div id="en" class="tab_content"> {{ form.content_de }}
<h3 class="grid_12">English</h3> </div>
<label for="id_{{ form.headline_en.html_name }}" class="grid_2 {{ form.headline_en.css_classes }}">{{ form.headline_en.label }}</label> <div id="en" class="tab_content">
<p class="grid_10">{{ form.headline_en }}</p> <h3 class="grid_12">English</h3>
<p>&nbsp;</p> <label for="id_{{ form.headline_en.html_name }}" class="grid_2 {{ form.headline_en.css_classes }}">
{{ form.content_en }} {{ form.headline_en.label }}</label>
</div> <p class="grid_10">{{ form.headline_en }}</p>
<p>&nbsp;</p>
{{ form.content_en }}
</div>
</div> </div>
<p class="buttonbar"> <p class="buttonbar">
<button type="reset"><span class="fa fa-undo"></span> {% trans 'reset' %}</button> <button type="reset"><span class="fa fa-undo"></span> {% trans 'reset' %}</button>
<button type="submit"><span class="fa fa-hdd-o"></span> {% trans 'save' %}</button> <button type="submit"><span class="fa fa-hdd-o"></span> {% trans 'save' %}</button>
</p> </p>
</form> </form>{% endblock %}
{% endblock %}
{% block buttonbar %}{% endblock %} {% block buttonbar %}{% endblock %}

13
src/content/templates/content/page_form.html
View File

@@ -10,15 +10,6 @@
defer></script> defer></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js" <script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js"
defer></script> defer></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/ckeditor/ckeditor.js"
defer></script>
<script type="text/javascript">
window.onload = function () {
CKEDITOR.dtd.$removeEmpty['span'] = false;
CKEDITOR.replace('id_content_de');
CKEDITOR.replace('id_content_en');
}
</script>
{% endblock %} {% endblock %}
{% block jumbotron_background %}{{STATIC_URL}}img/teaser/edit_page.jpg{% endblock %} {% block jumbotron_background %}{{STATIC_URL}}img/teaser/edit_page.jpg{% endblock %}
@@ -37,8 +28,10 @@ window.onload = function () {
{% get_fieldset "template, enable_comments" from form as fieldset_html %} {% get_fieldset "template, enable_comments" from form as fieldset_html %}
<form method="post" enctype="multipart/form-data"> <form method="post" enctype="multipart/form-data">
{{ form.media }}
<fieldset> <fieldset>
{% csrf_token %} {% csrf_token %}
<legend>{% if object.pk %}{% trans "Edit Page" %}{% else %}{% trans "Add Page" %}{% endif %}</legend> <legend>{% if object.pk %}{% trans "Edit Page" %}{% else %}{% trans "Add Page" %}{% endif %}</legend>
{% with fieldset_common as form %}{% include "form.html" %}{% endwith %} {% with fieldset_common as form %}{% include "form.html" %}{% endwith %}
<legend>{% trans "HTML Specific" %}</legend> <legend>{% trans "HTML Specific" %}</legend>