* Aktelle Vorlagen in den src Ordner verschoben, damit sie in der Versionierung enthalten sind.

* INSTALLED_APPS auf PROJECT_APPS + PREREQ_APPS damit Vorlagen aus den kasu/templates Ordner bevorzugt werden. So lassen sich Vorlagen von 3rd Party Apps überschreiben, wie z.b. django-contrib-comments.

* Javascript Code für Google Maps entfernt, dies funktioniert mit Content Security Policy nicht mehr so gut und wird eh nicht gebraucht.

* Javascript für das Hanchan Formular vom header an des Ende des body gesetzt, der Code darf erst ausgeführt werden, wenn das Formular aufgebaut wurde.

src/content/templates/content/article_form.html

@@ -2,9 +2,19 @@
 {% load i18n fieldset_extras %}
 
 {% block extra_head %}
- <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/ckeditor/ckeditor.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"
+        defer></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js"
+        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 %}
 
 {% block maincontent %}
@@ -45,11 +55,4 @@
  </form>
 {% endblock %}
 
-{% block javascript %}
-    CKEDITOR.dtd.$removeEmpty['span'] = false;
-    CKEDITOR.replace( 'id_content_de' );
-    CKEDITOR.replace( 'id_content_en' );
-{% endblock %}
-
-
 {% block buttonbar %}{% endblock %}

src/content/templates/content/page_form.html

@@ -6,10 +6,20 @@
 {% endblock %}
 
 {% block extra_head %}
- <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/ckeditor/ckeditor.js"></script>
- {% endblock %}
+<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"
+        defer></script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js"
+        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 %}
 
 {% block jumbotron_background %}{{STATIC_URL}}img/teaser/edit_page.jpg{% endblock %}
 
@@ -66,8 +76,3 @@
 </form>
 {% endblock %}
 
-{% block javascript %}
-    CKEDITOR.dtd.$removeEmpty['span'] = false;
-    CKEDITOR.replace( 'id_content_de' );
-    CKEDITOR.replace( 'id_content_en' );
-{% endblock %}