Merge master -> artur

archilance/settings/base.py

@@ -60,7 +60,26 @@ LOCAL_APPS = [
     'ratings',
 ]
 
-INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
+WAGTAIL = [
+    'wagtail.wagtailforms',
+    'wagtail.wagtailredirects',
+    'wagtail.wagtailembeds',
+    'wagtail.wagtailsites',
+    'wagtail.wagtailusers',
+    'wagtail.wagtailsnippets',
+    'wagtail.wagtaildocs',
+    'wagtail.wagtailimages',
+    'wagtail.wagtailsearch',
+    'wagtail.wagtailadmin',
+    'wagtail.wagtailcore',
+
+    'modelcluster',
+    'taggit',
+
+    'cms_pages',
+]
+
+INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS + WAGTAIL
 
 MIDDLEWARE_CLASSES = [
     'django.middleware.security.SecurityMiddleware',
@@ -72,6 +91,9 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'common.middleware.SetLastVisitMiddleware',
+
+    'wagtail.wagtailcore.middleware.SiteMiddleware',
+    'wagtail.wagtailredirects.middleware.RedirectMiddleware',
 ]
 
 ROOT_URLCONF = 'archilance.urls'
@@ -289,6 +311,8 @@ else:
         'scid': 0,
     })
 
+WAGTAIL_SITE_NAME = 'PROEKTON'
+
 
 # class ASCIIFileSystemStorage(FileSystemStorage):
 #     def get_valid_name(self, name):

archilance/urls.py

@@ -8,6 +8,9 @@ from django.views.generic import TemplateView
 from .views import HomeTemplateView, TestChatTemplateView
 from wallets.views import TmpCheckOrderView, TmpPaymentAvisoView
 
+from wagtail.wagtailadmin import urls as wagtailadmin_urls
+from wagtail.wagtailcore import urls as wagtail_urls
+
 
 urlpatterns = [
     url(r'^$', HomeTemplateView.as_view()),
@@ -26,8 +29,9 @@ urlpatterns = [
     url(r'^users/', include('registration.backends.default.urls')),
     url(r'^admin/', admin.site.urls),
     url(r'^api/', include('api.urls')),
-    
-    
+    url(r'^cms/', include(wagtailadmin_urls)),
+    url(r'^pages/', include(wagtail_urls)),
+
     # TODO: Move URLs into the "wallets" app (Yandex Money settings modification needed):
     
     url(r'^yandex/check$', TmpCheckOrderView.as_view(), name='tmp-check-order'),

cms_pages/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

cms_pages/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class CmsPagesConfig(AppConfig):
+    name = 'cms_pages'

cms_pages/migrations/0001_initial.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-26 12:44
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import wagtail.wagtailcore.blocks
+import wagtail.wagtailcore.fields
+import wagtail.wagtailimages.blocks
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('wagtailcore', '0029_unicode_slugfield_dj19'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CmsPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.Page')),
+                ('body', wagtail.wagtailcore.fields.StreamField((('heading', wagtail.wagtailcore.blocks.CharBlock(classname='full title')), ('paragraph', wagtail.wagtailcore.blocks.RichTextBlock()), ('image', wagtail.wagtailimages.blocks.ImageChooserBlock())))),
+                ('date', models.DateField(verbose_name='Дата размещения')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+    ]

cms_pages/models.py

@@ -0,0 +1,26 @@
+from django.db import models
+from wagtail.wagtailadmin.edit_handlers import StreamFieldPanel, FieldPanel
+from wagtail.wagtailcore import blocks
+from wagtail.wagtailcore.fields import StreamField
+from wagtail.wagtailcore.models import Page
+from wagtail.wagtailimages.blocks import ImageChooserBlock
+
+__author__ = 'PekopT'
+
+
+class CmsPage(Page):
+    body = StreamField([
+        ('heading', blocks.CharBlock(classname="full title")),
+        ('paragraph', blocks.RichTextBlock()),
+        ('image', ImageChooserBlock()),
+    ])
+    date = models.DateField("Дата размещения")
+
+    content_panels = Page.content_panels + [
+        FieldPanel('date'),
+        StreamFieldPanel('body'),
+    ]
+
+    # promote_panels = [
+    #     MultiFieldPanel(Page.promote_panels, "Common page configuration"),
+    # ]

cms_pages/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

cms_pages/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

requirements/base.txt

@@ -42,3 +42,4 @@ gunicorn==19.6.0
 rest-framework-generic-relations
 django-hitcount
 django-activeurl==0.1.9
+wagtail==1.6

templates/cms_pages/cms_page.html

@@ -0,0 +1,22 @@
+{% extends 'partials/base.html' %}
+
+{% block content %}
+  <section class="mainContainer">
+    {% include 'partials/header.html' %}
+    <div class="container-fluid">
+      <div class="row">
+        <h1>{{ page.title }}</h1>
+      </div>
+    </div>
+  </section>
+
+  {% for block in page.body %}
+    {% if block.block_type == 'heading' %}
+      <h2>{{ block.value }}</h2>
+    {% else %}
+      <section class="block-{{ block.block_type }}">
+        {{ block }}
+      </section>
+    {% endif %}
+  {% endfor %}
+{% endblock %}

templates/partials/header.html

@@ -111,9 +111,9 @@
                                     <a href="{% url 'users:user-profile-edit' pk=request.user.pk %}">Настройки<span></span></a>
                                 </li>
 
-{#                                <li class="icon_mm6">#}
-{#                                    <a href="#">FAQ<span></span></a>#}
-{#                                </li>#}
+                                <li class="icon_mm6">
+                                    <a href="/pages/faq">FAQ<span></span></a>
+                                </li>
 
                                 <li class="icon_mm6">
                                     <a href="{% url 'auth_logout' %}">Выйти<span></span></a>