- add WYSIWYG "Django CKEditor"

 - add page post
 - divided link_post and text_post
 - made in a separate file block news_right_sidebar

Author: a.shtyrnyaev

apps/news/migrations/0005_auto_20180113_1337.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.8 on 2018-01-13 10:37
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0004_auto_20161002_2204'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='article',
+            name='is_our',
+            field=models.BooleanField(default=False, verbose_name='Наш пост?'),
+        ),
+        migrations.AddField(
+            model_name='article',
+            name='text',
+            field=models.TextField(blank=True, verbose_name='Текст'),
+        ),
+    ]

apps/news/models.py

@@ -2,6 +2,7 @@
 from django.db.models import QuerySet
 from model_utils import Choices
 from model_utils.models import TimeStampedModel
+from ckeditor_uploader.fields import RichTextUploadingField
 
 
 class ArticleQuerySet(QuerySet):
@@ -20,6 +21,8 @@ class Article(TimeStampedModel):
     url = models.URLField('URL')
     name = models.CharField('Заголовок', max_length=1024)
     description = models.TextField('Описание', blank=True)
+    text = RichTextUploadingField('Текст', blank=True, default='')
+    is_our = models.BooleanField('Наш пост?', default=False)
     published_at = models.DateTimeField('Дата публикации')
     section = models.CharField('Категория', max_length=100, blank=True)
     language = models.CharField('Язык', max_length=2, choices=Choices(('ru', '🇷🇺'), ('en', '🇬🇧')))

python_ru/settings.py

@@ -48,6 +48,8 @@
     'apps.events',
     'apps.news',
     'apps.meetups',
+    'ckeditor',
+    'ckeditor_uploader',
 )
 
 MIDDLEWARE_CLASSES = (
@@ -144,6 +146,17 @@
 
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
 MEDIA_URL = '/media/'
+CKEDITOR_UPLOAD_PATH = 'uploads/'
+
+CKEDITOR_CONFIGS = {
+    'default': {
+        'toolbar': [['Source', 'Link', 'Unlink', 'SpecialChar', 'Image', 'CodeSnippet']],
+        'height': 400,
+        'width': 900,
+        'removePlugins': 'stylesheetparser',
+        'extraPlugins': 'codesnippet',
+    },
+}
 
 LOGGING = {
     'version': 1,

python_ru/urls.py

@@ -13,4 +13,5 @@
     url(r'^post/(?P<pk>\d+)/$', news_views.PostView.as_view(), name='post_page'),
 
     url(r'^admin/', include(admin.site.urls)),
+    url(r'^ckeditor/', include('ckeditor_uploader.urls')),
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)

templates/blocks/news.html

@@ -11,29 +11,14 @@
           {% endif %}
           <div class="description">
             <time datetime="">{{ article_featured.published_at|date:"j E Y" }}</time>
-            <h1><a href="{{ article_featured.url }}" target="_blank">
+            <h1><a {% if not article_featured.is_our %}href="{{ article_featured.url }}" target="_blank"{% else %}href="{% url 'post_page' article_featured.id %}"{% endif %}>
               {{ article_featured.name }}
             </a></h1>
           </div>
         </div>
       </article>
 
-      {# News right sidebar #}
-      <section class="grid-item articles-list">
-        <div class="item-holder">
-          <strong class="title">Новости</strong>
-          <div class="articles-holder">
-            {% for article in articles_top %}
-            <article class="article">
-              <time datetime="{{ event.date|date:"Y-m-d H:m" }}">{{ article.published_at|date:"j E Y" }}</time>
-              <h1><a href="{{ article.url }}" target="_blank">
-                {{ article.name }}
-              </a></h1>
-            </article>
-            {% endfor %}
-          </div>
-        </div>
-      </section>
+    {% include 'blocks/news_right_sidebar.html' %}
 
       {% for article in articles_all %}
       <article class="grid-item">
@@ -45,14 +30,13 @@ <h1><a href="{{ article.url }}" target="_blank">
           {% endif %}
           <div class="text-holder">
             <time datetime="{{ event.date|date:"Y-m-d H:m" }}">{{ article.published_at|date:"j E Y" }}</time>
-            <h1><a href="{{ article.url }}" target="_blank">{{ article.name }}</a></h1>
+            <h1><a {% if not article.is_our %}href="{{ article.url }}" target="_blank"{% else %}href="{% url 'post_page' article.id %}" {% endif %}>{{ article.name }}</a></h1>
             {{ article.description|safe }}
           </div>
         </div>
       </article>
       {% endfor %}
     </div>
-
 {#    <div class="btn-holder">#}
 {#      <a href="#" class="btn-default btn-more">Показать ещё</a>#}
 {#    </div>#}

templates/blocks/news_post.html

@@ -0,0 +1,20 @@
+
+    {# News right sidebar #}
+      <section class="grid-item articles-list">
+        <div class="item-holder">
+          <strong class="title">Новости</strong>
+          <div class="articles-holder">
+            {% for article in articles_top %}
+            <article class="article">
+              <time datetime="{{ event.date|date:"Y-m-d H:m" }}">{{ article.published_at|date:"j E Y" }}</time>
+              <h1><a {% if not article.is_our %}href="{{ article.url }}" target="_blank"{% else %}href="{% url 'post_page' article.id %}" {% endif %}>
+                {{ article.name }}
+              </a></h1>
+            </article>
+            {% if not article.is_our %}
+                <time>{{ article.url }}</time>
+            {% endif %}
+            {% endfor %}
+          </div>
+        </div>
+      </section>

templates/blocks/news_right_sidebar.html

@@ -10,34 +10,21 @@
         <div class="item-holder">
             <div class="text-holder">
               {% if article_featured.image %}
-                <img src="{% thumbnail article_featured.image 792 529 %}" width="792" height="529" alt="">
+                <img src="{% thumbnail article_featured.image %}" width="792" height="529" alt="">
               {% endif %}
-              <div class="description">
+              <div>
                 <time datetime="">{{ article_featured.published_at|date:"j E Y" }}</time>
                 <h1>{{ post.name }}</h1>
+                  {% if post.url %}<time datetime="">{{ post.url }}</time>{% endif %}
                    <article class="article">
-                       {{ post.description }}
+                       {{ post.text|safe }}
                    </article>
               </div>
             </div>
         </div>
       </article>
 
-      {# News right sidebar #}
-      <section class="grid-item articles-list">
-        <div class="item-holder">
-          <strong class="title">Новости</strong>
-          <div class="articles-holder">
-            {% for article in articles_top %}
-              <time datetime="{{ event.date|date:"Y-m-d H:m" }}">{{ article.published_at|date:"j E Y" }}</time>
-              <h1><a href="{{ article.url }}" target="_blank">
-                {{ article.name }}
-              </a></h1>
-            </article>
-            {% endfor %}
-          </div>
-        </div>
-      </section>
+    {% include 'blocks/news_right_sidebar.html' %}
 
     </div>