lot of stuff

requirements.txt

@@ -1,7 +1,6 @@
 djangocms-installer
 djangocms_text_ckeditor
 git+https://github.com/fefa4ka/aldryn-people
-aldryn-newsblog
 easy_thumbnails
 django-appconf
 vobject

zsite/locale/ru/LC_MESSAGES/django.po

@@ -44,8 +44,8 @@ msgid "Protection of intellectual property"
 msgstr "Защита интеллектуальной собственности"
 
 #: zsite/templates/base.html:31
-msgid "London"
+msgid "Moscow"
-msgstr "Лондон"
+msgstr "Москва"
 
 #: zsite/templates/base.html:33
 msgid "Free Consultation"

zsite/settings.py

@@ -180,25 +180,44 @@ INSTALLED_APPS = (
     'pipeline',
     'zsite',
 
-    # Newsblog
+    # People
-    'aldryn_common',
-    'aldryn_apphooks_config',
-    'aldryn_boilerplates',
-    'aldryn_categories',
-    'aldryn_newsblog',
     'aldryn_people',
-    'aldryn_reversion',
     'easy_thumbnails',
     'filer',
     'parler',
     'sortedm2m',
+
+    # 'easy_thumbnails',
+    'cmsplugin_filer_image',
+    # 'parler',
     'taggit',
+    'taggit_autosuggest',
+    'django_select2',
+    'meta',
+    'meta_mixin',
+    'admin_enhancer',
+    'djangocms_blog',
 
     'aldryn_bootstrap3',
 
-    'debug_toolbar',
+    # 'debug_toolbar',
 )
 
+SOUTH_MIGRATION_MODULES = {
+    'easy_thumbnails': 'easy_thumbnails.south_migrations',
+    'taggit': 'taggit.south_migrations',
+}
+
+META_SITE_PROTOCOL = 'http'
+META_USE_SITES = True
+
+PARLER_LANGUAGES = {
+    1: (
+        {'code': 'en',},
+        {'code': 'ru',},
+    ),
+}
+
 ALDRYN_BOILERPLATE_NAME = 'bootstrap3'
 
 THUMBNAIL_PROCESSORS = (
@@ -208,6 +227,7 @@ THUMBNAIL_PROCESSORS = (
     'filer.thumbnail_processors.scale_and_crop_with_subject_location',
     'easy_thumbnails.processors.filters',
     'easy_thumbnails.processors.background',
+
 )
 
 LANGUAGES = (
@@ -269,5 +289,7 @@ MIGRATION_MODULES = {
     'djangocms_file': 'djangocms_file.migrations_django',
     'djangocms_picture': 'djangocms_picture.migrations_django',
     'djangocms_teaser': 'djangocms_teaser.migrations_django',
-    'djangocms_video': 'djangocms_video.migrations_django'
+    'djangocms_video': 'djangocms_video.migrations_django',
+    'cmsplugin_filer_image': 'cmsplugin_filer_image.migrations_django'
+
 }

zsite/static/less/about.less

@@ -0,0 +1,25 @@
+.about-map {
+  position: absolute;
+  z-index: 0;
+  width: 65%;
+  margin-left: 35%;
+  margin-top: -10%;
+
+  img {
+    width: 100%;
+  }
+}
+
+.about-videos {
+    li {
+        width: 165px;
+        margin-right: 2%;
+        vertical-align: top;
+
+        font-size: 12px;
+
+        .plugin_video {
+            margin-bottom: 8px;
+        }
+    }
+}

zsite/static/less/footer.less

@@ -25,7 +25,9 @@ footer {
   }
 
   .about {
-    .make-xs-column(2);
+    .make-xs-column(4);
+    .make-sm-column(3);
+    .make-md-column(2);
 
     margin-top: -10px;
 
@@ -44,7 +46,7 @@ footer {
   }
 
   .menu {
-    .make-xs-column(4);
+    .make-xs-column(5);
 
     h5 {
       margin-top: 6px;
@@ -57,10 +59,19 @@ footer {
   }
 
   .contacts {
-    .make-xs-column(2);
+    .make-sm-column(3);
+    .make-md-column(2);
 
-    margin-top: 39px;
+      @media (min-width: 0px) {
+        display: none;
+      }
 
+      @media (min-width: 530px) {
+        display: block;
+      }
+
+    margin-top: 39px;
+    
     li {
       margin-bottom: 10px;
     }

zsite/static/less/header.less

@@ -26,8 +26,15 @@
 .header-contacts {
   .make-lg-column(4);
   .make-md-column(4);
-  .make-sm-column(6);
   .make-xs-column(6);
+  
+  @media (min-width: 0px) {
+    display: none;
+  }
+
+  @media (min-width: 530px) {
+    display: block;
+  }
 
   text-align: right;
 

zsite/static/less/main.less

@@ -10,6 +10,8 @@
 
 @import 'people.less';
 
+@import 'about.less';
+
 
 @import url(http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic|Roboto+Slab:700,400&subset=cyrillic-ext,latin);
 

zsite/static/less/variables.less

@@ -9,8 +9,8 @@
 
 // @font-size-h1:            floor((@font-size-base * 2.6)); // ~36px
 // @font-size-h2:            floor((@font-size-base * 2.15)); // ~30px
-@font-size-h1:            ceil((@font-size-base * 1.7));// ~24px
+@font-size-h1:            ceil((@font-size-base * 1.7)); // ~24px
-@font-size-h2:            @font-size-h1;
+@font-size-h2:            ceil((@font-size-base * 1.4)); // ~22px
 @font-size-h3:            ceil((@font-size-base * 1.55)); // ~22px
 @font-size-h4:            ceil((@font-size-base * 1.25)); // ~18px
 @font-size-h5:            @font-size-base;

zsite/templates/base.html

@@ -28,7 +28,7 @@
                         <li>{% language_chooser 'language_chooser.html' %}</li>
                         <li><a href="{% page_url "about" %}">{% page_attribute "page_title" "about" %}</a></li>
                     </ul>
-                    <p class="city">{% trans 'London' %}</p>
+                    <p class="city">{% trans 'Moscow' %}</p>
                     <div class="consultation">
                         <h5>{% trans 'Free Consultation' %} </h5>
                         <h3><nobr>+7 800 700-16-37</nobr></h3>
@@ -62,7 +62,7 @@
                     </ul>
                 </div>
                 <div class="menu">
-                    <h5>{% trans "— There is nothing impossible. Almost nothing" %}</h5>
+                    <h5><nobr>{% trans "— There is nothing impossible. Almost nothing" %}</nobr></h5>
                     <ul class="list-unstyled">
                         {% show_menu 0 1 100 100 "menu.html" %}
                     </ul>

zsite/urls.py

@@ -14,6 +14,7 @@ urlpatterns = i18n_patterns('',
         {'sitemaps': {'cmspages': CMSSitemap}}),
     url(r'^select2/', include('django_select2.urls')),
     url(r'^', include('cms.urls')),
+    url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
 )
 
 # This is only needed when using runserver.