diff --git a/src/content/admin.py b/src/content/admin.py index 4b90a76..30cbc4a 100644 --- a/src/content/admin.py +++ b/src/content/admin.py @@ -54,13 +54,6 @@ class PageAdmin(admin.ModelAdmin): }), ) - class Media(object): - js = [ - '/static/grappelli/tinymce/jscripts/tiny_mce/tiny_mce.js', - '/static/js/tinymce_setup.js', - ] - - admin.site.register(models.Article, ArticleAdmin) admin.site.register(models.Page, PageAdmin) admin.site.register(models.Category, CategoryAdmin) diff --git a/src/content/feeds.py b/src/content/feeds.py index 87110e6..ec29400 100644 --- a/src/content/feeds.py +++ b/src/content/feeds.py @@ -6,7 +6,7 @@ import django_comments as comments from django.contrib.syndication.views import Feed from django.utils.feedgenerator import Rss201rev2Feed -from models import Article +from content.models import Article class LatestNews(Feed): diff --git a/src/content/management/__init__.py b/src/content/management/__init__.py deleted file mode 100755 index 792d600..0000000 --- a/src/content/management/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# diff --git a/src/content/management/commands/__init__.py b/src/content/management/commands/__init__.py deleted file mode 100644 index 013e4b7..0000000 --- a/src/content/management/commands/__init__.py +++ /dev/null @@ -1 +0,0 @@ -#!/usr/bin/python diff --git a/src/content/management/commands/importarticles.py b/src/content/management/commands/importarticles.py deleted file mode 100644 index d185734..0000000 --- a/src/content/management/commands/importarticles.py +++ /dev/null @@ -1,83 +0,0 @@ -# -*- coding: utf-8 -*- - -import re - -from django.contrib.auth import get_user_model -from django.core.management.base import BaseCommand -from django.template.defaultfilters import slugify -from django.utils.datetime_safe import datetime - -from content.models import Article, Category -import xlrd - - -# noinspection PyPep8 -class Command(BaseCommand): - help = "Importiert die alten Daten aus einer CSV Datei" # @ReservedAssignment - date_header_regex = r"""
- Copyright © 2003-2015, CKSource - Frederico + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- Copyright © 2003-2015, CKSource - Frederico + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
div instead of iframe for rich editing.- Copyright © 2003-2015, CKSource - Frederico Knabben. All rights reserved. + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- Copyright © 2003-2015, CKSource + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/old/inlinebycode.html b/src/content/static/js/ckeditor/samples/old/inlinebycode.html index 70e1555..eea2723 100644 --- a/src/content/static/js/ckeditor/samples/old/inlinebycode.html +++ b/src/content/static/js/ckeditor/samples/old/inlinebycode.html @@ -1,6 +1,6 @@ @@ -116,7 +116,7 @@ var editor = CKEDITOR.inline( document.getElementById( 'editable' ) ); http://ckeditor.com- Copyright © 2003-2015, CKSource + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/old/inlinetextarea.html b/src/content/static/js/ckeditor/samples/old/inlinetextarea.html index e927404..57e664e 100644 --- a/src/content/static/js/ckeditor/samples/old/inlinetextarea.html +++ b/src/content/static/js/ckeditor/samples/old/inlinetextarea.html @@ -1,6 +1,6 @@ @@ -105,7 +105,7 @@ var editor = CKEDITOR.inline( 'article-body' ); http://ckeditor.com- Copyright © 2003-2015, CKSource + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/old/jquery.html b/src/content/static/js/ckeditor/samples/old/jquery.html index 3d4b4dc..2f6d958 100644 --- a/src/content/static/js/ckeditor/samples/old/jquery.html +++ b/src/content/static/js/ckeditor/samples/old/jquery.html @@ -1,6 +1,6 @@ @@ -95,7 +95,7 @@ $( document ).ready( function() { CKEditor - The text editor for the Internet - http://ckeditor.com- Copyright © 2003-2015, CKSource - Frederico + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/old/magicline/magicline.html b/src/content/static/js/ckeditor/samples/old/magicline/magicline.html index f1bb993..a347d9c 100644 --- a/src/content/static/js/ckeditor/samples/old/magicline/magicline.html +++ b/src/content/static/js/ckeditor/samples/old/magicline/magicline.html @@ -1,6 +1,6 @@ @@ -201,7 +201,7 @@ CKEDITOR.replace( 'editor2', { CKEditor - The text editor for the Internet - http://ckeditor.com- Copyright © 2003-2015, CKSource - Frederico + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/old/readonly.html b/src/content/static/js/ckeditor/samples/old/readonly.html index 7b9e717..084d6af 100644 --- a/src/content/static/js/ckeditor/samples/old/readonly.html +++ b/src/content/static/js/ckeditor/samples/old/readonly.html @@ -1,6 +1,6 @@ @@ -68,7 +68,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license CKEditor - The text editor for the Internet - http://ckeditor.com- Copyright © 2003-2015, CKSource - Frederico + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/old/replacebyclass.html b/src/content/static/js/ckeditor/samples/old/replacebyclass.html index 7fb6dec..23652d6 100644 --- a/src/content/static/js/ckeditor/samples/old/replacebyclass.html +++ b/src/content/static/js/ckeditor/samples/old/replacebyclass.html @@ -1,6 +1,6 @@ @@ -52,7 +52,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license CKEditor - The text editor for the Internet - http://ckeditor.com- Copyright © 2003-2015, CKSource - Frederico + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/old/replacebycode.html b/src/content/static/js/ckeditor/samples/old/replacebycode.html index bf21419..a4f4395 100644 --- a/src/content/static/js/ckeditor/samples/old/replacebycode.html +++ b/src/content/static/js/ckeditor/samples/old/replacebycode.html @@ -1,6 +1,6 @@ @@ -51,7 +51,7 @@ CKEDITOR.replace( 'textarea_id' ) CKEditor - The text editor for the Internet - http://ckeditor.com- Copyright © 2003-2015, CKSource - Frederico + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/old/sample.css b/src/content/static/js/ckeditor/samples/old/sample.css index 92f76bb..3304111 100644 --- a/src/content/static/js/ckeditor/samples/old/sample.css +++ b/src/content/static/js/ckeditor/samples/old/sample.css @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.md or http://ckeditor.com/license */ diff --git a/src/content/static/js/ckeditor/samples/old/sample.js b/src/content/static/js/ckeditor/samples/old/sample.js index 2bdcd98..53e1db2 100644 --- a/src/content/static/js/ckeditor/samples/old/sample.js +++ b/src/content/static/js/ckeditor/samples/old/sample.js @@ -1,5 +1,5 @@ /** - * Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. + * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved. * For licensing, see LICENSE.md or http://ckeditor.com/license */ diff --git a/src/content/static/js/ckeditor/samples/old/sample_posteddata.php b/src/content/static/js/ckeditor/samples/old/sample_posteddata.php index 7775f07..54e9b7c 100644 --- a/src/content/static/js/ckeditor/samples/old/sample_posteddata.php +++ b/src/content/static/js/ckeditor/samples/old/sample_posteddata.php @@ -9,8 +9,8 @@ To save the content created with CKEditor you need to read the POST data on the server side and write it to a file or the database. - Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. - For licensing, see LICENSE.md or http://ckeditor.com/license + Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved. + For licensing, see LICENSE.md or http://ckeditor.com/license ------------------------------------------------------------------------------------------- diff --git a/src/content/static/js/ckeditor/samples/old/toolbar/toolbar.html b/src/content/static/js/ckeditor/samples/old/toolbar/toolbar.html index 615d929..2c2622b 100644 --- a/src/content/static/js/ckeditor/samples/old/toolbar/toolbar.html +++ b/src/content/static/js/ckeditor/samples/old/toolbar/toolbar.html @@ -1,6 +1,6 @@ @@ -227,7 +227,7 @@ CKEDITOR.replace( 'textarea_id', { CKEditor - The text editor for the Internet - http://ckeditor.com- Copyright © 2003-2015, CKSource - Frederico + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/old/uicolor.html b/src/content/static/js/ckeditor/samples/old/uicolor.html index c1b48aa..fb61b1f 100644 --- a/src/content/static/js/ckeditor/samples/old/uicolor.html +++ b/src/content/static/js/ckeditor/samples/old/uicolor.html @@ -1,6 +1,6 @@ @@ -64,7 +64,7 @@ CKEDITOR.replace( 'textarea_id', { CKEditor - The text editor for the Internet - http://ckeditor.com- Copyright © 2003-2015, CKSource - Frederico + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/old/uilanguages.html b/src/content/static/js/ckeditor/samples/old/uilanguages.html index a7bf111..76749cb 100644 --- a/src/content/static/js/ckeditor/samples/old/uilanguages.html +++ b/src/content/static/js/ckeditor/samples/old/uilanguages.html @@ -1,6 +1,6 @@ @@ -114,7 +114,7 @@ CKEDITOR.replace( 'textarea_id', { CKEditor - The text editor for the Internet - http://ckeditor.com- Copyright © 2003-2015, CKSource - Frederico + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/old/xhtmlstyle.html b/src/content/static/js/ckeditor/samples/old/xhtmlstyle.html index bbf2b33..c918766 100644 --- a/src/content/static/js/ckeditor/samples/old/xhtmlstyle.html +++ b/src/content/static/js/ckeditor/samples/old/xhtmlstyle.html @@ -1,6 +1,6 @@ @@ -226,7 +226,7 @@ CKEDITOR.replace( 'textarea_id', { CKEditor - The text editor for the Internet - http://ckeditor.com- Copyright © 2003-2015, CKSource - Frederico + Copyright © 2003-2017, CKSource - Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/toolbarconfigurator/index.html b/src/content/static/js/ckeditor/samples/toolbarconfigurator/index.html index 3c1cf52..4d31289 100644 --- a/src/content/static/js/ckeditor/samples/toolbarconfigurator/index.html +++ b/src/content/static/js/ckeditor/samples/toolbarconfigurator/index.html @@ -1,6 +1,6 @@ @@ -136,7 +136,7 @@ For licensing, see LICENSE.md or http://ckeditor.com/license CKEditor – The text editor for the Internet – http://ckeditor.com- Copyright © 2003-2015, CKSource – Frederico Knabben. All rights reserved. + Copyright © 2003-2017, CKSource – Frederico Knabben. All rights reserved.
diff --git a/src/content/static/js/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js b/src/content/static/js/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js index e8d325e..65f0b87 100644 --- a/src/content/static/js/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js +++ b/src/content/static/js/ckeditor/samples/toolbarconfigurator/js/abstracttoolbarmodifier.js @@ -1,14 +1,13 @@ "function"!=typeof Object.create&&function(){var a=function(){};Object.create=function(b){if(1Toolbars
Toolbar groups
Toolbar group items
', -"row separator"==a?'':"",a,"
"].join("")};d.evaluateToolbarGroupsConfig=function(a){return a=function(a){var c={},d;try{d=eval("("+a+")")}catch(f){try{d=eval(a)}catch(g){return null}}return c.toolbarGroups&&"number"===typeof c.toolbarGroups.length?JSON.stringify(c):d&&"number"===typeof d.length?JSON.stringify({toolbarGroups:d}):d&&d.toolbarGroups?JSON.stringify(d):null}(a)};return d})(); \ No newline at end of file +this.setConfig(a):alert("Your pasted config is wrong.")}this.state="edit";this._showConfigurationTool();this.showToolbarBtnsByGroupName(this.state)}},{text:'Get toolbar \x3cspan class\x3d"highlight"\x3econfig\x3c/span\x3e',group:"edit",position:"right",cssClass:"button-a-background icon-pos-left icon-download",clickCallback:function(){this.state="config";this._showConfig();this.showToolbarBtnsByGroupName(this.state)}}];this.cachedActiveElement=null}var l=ToolbarConfigurator.AbstractToolbarModifier; +ToolbarConfigurator.ToolbarModifier=d;d.prototype=Object.create(ToolbarConfigurator.AbstractToolbarModifier.prototype);d.prototype.getActualConfig=function(){var a=l.prototype.getActualConfig.call(this);if(a.toolbarGroups)for(var b=a.toolbarGroups.length,c=0;c"+ -a+" "}).join("");return["",a.name,"All items are in use.
");this.codeContainer.refresh();this.hintContainer.setHtml("