diff --git a/blog/locale/ru/LC_MESSAGES/django.po b/blog/locale/ru/LC_MESSAGES/django.po index 3916659..e0d72f8 100644 --- a/blog/locale/ru/LC_MESSAGES/django.po +++ b/blog/locale/ru/LC_MESSAGES/django.po @@ -1,267 +1,303 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Iacopo Spalletti, 2014 msgid "" msgstr "" "Project-Id-Version: djangocms-blog\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-11-30 12:49+0100\n" +"POT-Creation-Date: 2015-07-14 22:30+0300\n" "PO-Revision-Date: 2014-11-30 11:49+0000\n" "Last-Translator: yakky \n" -"Language-Team: Russian (http://www.transifex.com/projects/p/djangocms-blog/language/ru/)\n" +"Language-Team: Russian (http://www.transifex.com/projects/p/djangocms-blog/" +"language/ru/)\n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: cms_app.py:8 cms_plugins.py:32 cms_plugins.py:45 cms_plugins.py:56 -#: cms_plugins.py:67 cms_toolbar.py:18 +#: blog/cms_app.py:11 blog/cms_plugins.py:60 blog/cms_plugins.py:74 +#: blog/cms_plugins.py:86 blog/cms_plugins.py:98 blog/cms_toolbar.py:18 msgid "Blog" msgstr "Блог" -#: cms_plugins.py:20 +#: blog/cms_appconfig.py:22 +msgid "application title" +msgstr "" + +#: blog/cms_appconfig.py:26 +#, fuzzy +#| msgid "Category" +msgid "Category slug" +msgstr "Категория" + +#: blog/cms_appconfig.py:29 +msgid "Only category to display" +msgstr "" + +#: blog/cms_appconfig.py:33 +msgid "Paginate size" +msgstr "" + +#: blog/cms_appconfig.py:36 +msgid "When paginating list views, how many articles per page?" +msgstr "" + +#: blog/cms_appconfig.py:75 +#, fuzzy +#| msgid "Title" +msgid "untitled" +msgstr "Заголовок" + +#: blog/cms_appconfig.py:80 +msgid "Post published by default" +msgstr "" + +#: blog/cms_plugins.py:23 blog/cms_plugins.py:47 msgid "Latest Blog Articles" msgstr "Последние статьи блога" -#: cms_plugins.py:33 +#: blog/cms_plugins.py:61 msgid "Author Blog Articles" msgstr "Автор" -#: cms_plugins.py:46 templates/djangocms_blog/plugins/tags.html:4 +#: blog/cms_plugins.py:75 blog/templates/blog/plugins/tags.html:4 msgid "Tags" msgstr "Тэги" -#: cms_plugins.py:57 templates/djangocms_blog/plugins/categories.html:4 +#: blog/cms_plugins.py:87 blog/templates/blog/plugins/categories.html:4 msgid "Categories" msgstr "Categories" -#: cms_plugins.py:68 templates/djangocms_blog/post_list.html:12 -#: templates/djangocms_blog/plugins/archive.html:4 +#: blog/cms_plugins.py:99 blog/templates/blog/plugins/archive.html:4 +#: blog/templates/blog/post_list.html:13 msgid "Archive" msgstr "Архив" -#: cms_toolbar.py:20 +#: blog/cms_toolbar.py:20 msgid "Post list" msgstr "Список статей" -#: cms_toolbar.py:22 +#: blog/cms_toolbar.py:22 msgid "Add post" msgstr "Добавить статью" -#: cms_toolbar.py:26 +#: blog/cms_toolbar.py:26 msgid "Edit Post" msgstr "" -#: feeds.py:16 +#: blog/feeds.py:16 #, python-format msgid "Blog articles on %(site_name)s" msgstr "Статьи из блог на %(site_name)s" -#: models.py:31 +#: blog/models.py:33 msgid "parent" msgstr "предок" -#: models.py:33 +#: blog/models.py:35 msgid "created at" msgstr "время создания" -#: models.py:34 +#: blog/models.py:36 msgid "modified at" msgstr "время изменения" -#: models.py:37 +#: blog/models.py:39 msgid "name" msgstr "название" -#: models.py:38 models.py:105 +#: blog/models.py:40 blog/models.py:116 msgid "slug" msgstr "URL" -#: models.py:45 +#: blog/models.py:47 msgid "blog category" msgstr "категория блога" -#: models.py:46 +#: blog/models.py:48 msgid "blog categories" msgstr "категории блога" -#: models.py:70 +#: blog/models.py:78 msgid "Author" msgstr "Автор" -#: models.py:75 +#: blog/models.py:83 msgid "Published Since" msgstr "Опубликована с" -#: models.py:77 +#: blog/models.py:85 msgid "Published Until" msgstr "Опубликована до" -#: models.py:79 +#: blog/models.py:87 msgid "Publish" msgstr "Показывать на сайте" -#: models.py:80 +#: blog/models.py:88 msgid "category" msgstr "категория" -#: models.py:82 +#: blog/models.py:90 msgid "Main image" msgstr "Картинка для статьи" -#: models.py:85 +#: blog/models.py:94 msgid "Main image thumbnail" msgstr "Уменьшенная копия" -#: models.py:89 +#: blog/models.py:99 msgid "Main image full" msgstr "Полный размер" -#: models.py:93 +#: blog/models.py:104 msgid "Enable comments on post" msgstr "" -#: models.py:96 +#: blog/models.py:107 msgid "Site(s)" msgstr "" -#: models.py:98 +#: blog/models.py:109 msgid "" -"Select sites in which to show the post. If none is set it will be visible in" -" all the configured sites." +"Select sites in which to show the post. If none is set it will be visible in " +"all the configured sites." msgstr "" -#: models.py:104 +#: blog/models.py:115 msgid "Title" msgstr "Заголовок" -#: models.py:106 +#: blog/models.py:117 msgid "Abstract" msgstr "" -#: models.py:107 +#: blog/models.py:118 msgid "Post meta description" msgstr "" -#: models.py:109 +#: blog/models.py:120 msgid "Post meta keywords" msgstr "" -#: models.py:111 +#: blog/models.py:122 msgid "Post meta title" msgstr "" -#: models.py:112 +#: blog/models.py:123 msgid "used in title tag and social sharing" msgstr "" -#: models.py:115 +#: blog/models.py:126 msgid "Text" msgstr "" -#: models.py:178 +#: blog/models.py:189 msgid "blog article" msgstr "статья блога" -#: models.py:179 +#: blog/models.py:190 msgid "blog articles" msgstr "статьи блога" -#: models.py:222 models.py:250 +#: blog/models.py:258 blog/models.py:282 msgid "Articles" msgstr "Статьи" -#: models.py:223 +#: blog/models.py:259 msgid "The number of latests articles to be displayed." msgstr "Количество показываемых последних статей." -#: models.py:225 -msgid "Show only the blog articles tagged with chosen tags." -msgstr "Показывать только статьи с выбранными тэгами." - -#: models.py:227 +#: blog/models.py:261 msgid "Show only the blog articles tagged with chosen categories." msgstr "Показывать только статьи из выбранныех категорий." -#: models.py:246 templates/djangocms_blog/plugins/authors.html:3 +#: blog/models.py:278 blog/templates/blog/plugins/authors.html:3 msgid "Authors" msgstr "Авторы" -#: models.py:251 +#: blog/models.py:283 msgid "The number of author articles to be displayed." msgstr "Количество статей автора, которые будут показаны." -#: templates/djangocms_blog/post_detail.html:18 -#: templates/djangocms_blog/includes/blog_item.html:11 +#: blog/templates/blog/includes/blog_meta.html:7 msgid "by" msgstr "создана" -#: templates/djangocms_blog/post_list.html:11 +#: blog/templates/blog/plugins/archive.html:18 +#: blog/templates/blog/plugins/authors.html:10 +#: blog/templates/blog/plugins/categories.html:11 +#: blog/templates/blog/plugins/tags.html:11 +#, python-format +msgid "1 article" +msgid_plural "%(articles)s articles" +msgstr[0] "%(articles)s статья" +msgstr[1] "%(articles)s статьи" +msgstr[2] "%(articles)s статей" + +#: blog/templates/blog/plugins/archive.html:19 +#: blog/templates/blog/plugins/authors.html:11 +#: blog/templates/blog/plugins/categories.html:12 +#: blog/templates/blog/plugins/tags.html:12 +msgid "0 articles" +msgstr "0 статей" + +#: blog/templates/blog/plugins/archive.html:27 +#: blog/templates/blog/plugins/authors.html:15 +#: blog/templates/blog/plugins/latest_entries.html:10 +#: blog/templates/blog/plugins/tags.html:16 +#: blog/templates/blog/post_list.html:33 +msgid "No article found." +msgstr "Не найдено ни одной статьи." + +#: blog/templates/blog/plugins/categories.html:16 +#, fuzzy +#| msgid "No article found." +msgid "No categories found." +msgstr "Не найдено ни одной статьи." + +#: blog/templates/blog/post_list.html:12 msgid "Articles by" msgstr "Статьи созданы" -#: templates/djangocms_blog/post_list.html:13 +#: blog/templates/blog/post_list.html:14 msgid "Tag" msgstr "Тэг" -#: templates/djangocms_blog/post_list.html:14 +#: blog/templates/blog/post_list.html:15 msgid "Category" msgstr "Категория" -#: templates/djangocms_blog/post_list.html:21 -#: templates/djangocms_blog/plugins/archive.html:27 -#: templates/djangocms_blog/plugins/authors.html:15 -#: templates/djangocms_blog/plugins/categories.html:16 -#: templates/djangocms_blog/plugins/latest_entries.html:7 -#: templates/djangocms_blog/plugins/tags.html:16 -msgid "No article found." -msgstr "Не найдено ни одной статьи." - -#: templates/djangocms_blog/post_list.html:24 +#: blog/templates/blog/post_list.html:37 msgid "Back" msgstr "Назад" -#: templates/djangocms_blog/post_list.html:30 +#: blog/templates/blog/post_list.html:42 msgid "previous" msgstr "предыдущая" -#: templates/djangocms_blog/post_list.html:33 +#: blog/templates/blog/post_list.html:45 msgid "Page" msgstr "Страница" -#: templates/djangocms_blog/post_list.html:33 +#: blog/templates/blog/post_list.html:45 msgid "of" msgstr "из" -#: templates/djangocms_blog/post_list.html:36 +#: blog/templates/blog/post_list.html:48 msgid "next" msgstr "следующая" -#: templates/djangocms_blog/includes/blog_item.html:46 -msgid "read more" -msgstr "продолжение" +#~ msgid "Show only the blog articles tagged with chosen tags." +#~ msgstr "Показывать только статьи с выбранными тэгами." -#: templates/djangocms_blog/plugins/archive.html:18 -#: templates/djangocms_blog/plugins/authors.html:10 -#: templates/djangocms_blog/plugins/categories.html:11 -#: templates/djangocms_blog/plugins/tags.html:11 -#, python-format -msgid "1 article" -msgid_plural "%(articles)s articles" -msgstr[0] "%(articles)s статья" -msgstr[1] "%(articles)s статьи" -msgstr[2] "%(articles)s статей" - -#: templates/djangocms_blog/plugins/archive.html:19 -#: templates/djangocms_blog/plugins/authors.html:11 -#: templates/djangocms_blog/plugins/categories.html:12 -#: templates/djangocms_blog/plugins/tags.html:12 -msgid "0 articles" -msgstr "0 статей" +#~ msgid "read more" +#~ msgstr "продолжение" #~ msgid "blog post" #~ msgstr "blog post" diff --git a/blog/templates/blog/post_list.html b/blog/templates/blog/post_list.html index c8b781e..0579c63 100644 --- a/blog/templates/blog/post_list.html +++ b/blog/templates/blog/post_list.html @@ -17,11 +17,22 @@ {% endblock %} + {% include "blog/includes/blog_item.html" with post=post_list.0 image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} +
+
{% for post in post_list %} - {% include "blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} + {% if forloop.counter != 1 %} + + {% endif %} {% empty %}

{% trans "No article found." %}

{% endfor %} +
{% if author or archive_date or tagged_entries %}

{% trans "Back" %}

{% endif %} diff --git a/zsite/locale/ru/LC_MESSAGES/django.mo b/zsite/locale/ru/LC_MESSAGES/django.mo index a12fc98..a2a29f8 100644 Binary files a/zsite/locale/ru/LC_MESSAGES/django.mo and b/zsite/locale/ru/LC_MESSAGES/django.mo differ diff --git a/zsite/locale/ru/LC_MESSAGES/django.po b/zsite/locale/ru/LC_MESSAGES/django.po index 9da0e17..89295cd 100644 --- a/zsite/locale/ru/LC_MESSAGES/django.po +++ b/zsite/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.10\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-07 14:18+0300\n" +"POT-Creation-Date: 2015-07-14 22:30+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Alexander Kondratev \n" "Language-Team: Zuykov and partners\n" @@ -19,21 +19,27 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: zsite/templates/aldryn_people/includes/people_item.html:11 +#: zsite/templates/aldryn_people/plugins/feature/people_list.html:13 msgid "Phone:" msgstr "Телефон:" -#: zsite/templates/aldryn_people/includes/people_item.html:12 -msgid "Mobile:" -msgstr "Мобильный телефон6" +#: zsite/templates/aldryn_people/plugins/feature/people_list.html:14 +msgid "Address:" +msgstr "Адрес" -#: zsite/templates/aldryn_people/includes/people_item.html:13 -msgid "E-Mail:" -msgstr "Электропочта:" +#: zsite/templates/aldryn_people/plugins/feature/people_list.html:30 +msgid "our" +msgstr "наш" -#: zsite/templates/aldryn_people/includes/people_item.html:14 -msgid "Download vCard" -msgstr "Скачать vCard" +#: zsite/templates/aldryn_people/plugins/feature/people_list.html:30 +msgid "answer your question" +msgstr "доступно обо всём расскажет" + +#: zsite/templates/aldryn_people/plugins/feature/people_list.html:33 +#, fuzzy +#| msgid "Contact us:" +msgid "Contact" +msgstr "Пишите" #: zsite/templates/aldryn_people/plugins/standard/people_list.html:4 msgid "Our Team" @@ -83,3 +89,11 @@ msgstr "Москва, Россия, 129090" msgid "Change to language:" msgstr "Изменить язык на:" +#~ msgid "Mobile:" +#~ msgstr "Мобильный телефон6" + +#~ msgid "E-Mail:" +#~ msgstr "Электропочта:" + +#~ msgid "Download vCard" +#~ msgstr "Скачать vCard" diff --git a/zsite/settings.py b/zsite/settings.py index 98159be..836f705 100644 --- a/zsite/settings.py +++ b/zsite/settings.py @@ -181,6 +181,7 @@ INSTALLED_APPS = ( 'zsite', # People + 'aldryn_common', 'aldryn_people', 'easy_thumbnails', 'filer', diff --git a/zsite/static/imgs/btn_bg.png b/zsite/static/imgs/btn_bg.png new file mode 100644 index 0000000..bccce9d Binary files /dev/null and b/zsite/static/imgs/btn_bg.png differ diff --git a/zsite/static/less/about.less b/zsite/static/less/about.less new file mode 100644 index 0000000..ce67d1e --- /dev/null +++ b/zsite/static/less/about.less @@ -0,0 +1,78 @@ +.about-map { + position: absolute; + z-index: 0; + width: 65%; + margin-left: 35%; + margin-top: -16%; + + img { + width: 100%; + } +} + +.about-consultation { + h3 { + margin-top: 0; + margin-bottom: 5px; + } + + margin-bottom: 25px; +} + +.about-videos { + li { + margin-right: 2%; + vertical-align: top; + + font-size: 12px; + } +} + +.about-organizations, .about-clients { + .make-row(); + + li { + .make-xs-column(4); + .make-sm-column(2); + + + } +} + +.about-videos { + li { + width: 165px; + } + + .plugin_video { + margin-bottom: 8px; + } +} + +.about-organizations { + li { + text-align: center; + p { + height: 70px; + line-height: 70px; + vertical-align: middle; + } + + a { + font-size: 12px; + } + } +} + +.about-clients { + li { + h5 { + height: 35px; + } + + p { + text-align: center; + } + } +} + diff --git a/zsite/static/less/blog.less b/zsite/static/less/blog.less index e14cbd3..e9c801d 100644 --- a/zsite/static/less/blog.less +++ b/zsite/static/less/blog.less @@ -4,14 +4,33 @@ } } -.plugin-blog-category-our-cases { +.plugin-blog-category-cases { + .make-row(); + + li { - display: inline-block; + .make-xs-column(4); + .make-sm-column(3); font-size: 12px; - width: 220px; - margin-right: 2%; vertical-align: top; } +} + +.blog-list-older { + margin-top: 40px; +} + +article { + width: 80%; + + header { + h2, h4 { + margin-bottom: 5px; + } + p { + margin-bottom: 15px; + } + } } \ No newline at end of file diff --git a/zsite/static/less/header.less b/zsite/static/less/header.less index 72c9562..b94b68a 100644 --- a/zsite/static/less/header.less +++ b/zsite/static/less/header.less @@ -79,21 +79,39 @@ font-family: @font-family-monospace; } + + .header-menu { font-size: 16px; li { margin-top: 1px; + + font-weight: 400; + vertical-align: top; + white-space: nowrap; + // width: 13.9%; + @media (min-width: 0) { + width: auto; + } + @media (min-width: @screen-md-min) { margin-right: 22px; } - @media (min-width: @screen-lg-min) { - margin-right: 50px; + @media (min-width: 1200px) { + margin-right: initial; + width: 13.9%; } + + + // @media (min-width: @screen-lg-min) { + // margin-right: 50px; + // } + a { text-decoration: underline; } @@ -110,3 +128,20 @@ } } } + +.header-menu-description { + font-size: 12px; + + @media (min-width: 0) { + display: none; + } + + @media (min-width: 1200px) { + display: block; + } + + li { + width: 13.9%; + + } +} diff --git a/zsite/static/less/main.less b/zsite/static/less/main.less index d613cf8..ae779d2 100644 --- a/zsite/static/less/main.less +++ b/zsite/static/less/main.less @@ -14,6 +14,8 @@ @import 'clients.less'; +@import 'blog.less'; + @import url(http://fonts.googleapis.com/css?family=PT+Sans:400,700,400italic,700italic|Roboto+Slab:700,400&subset=cyrillic-ext,latin); @@ -40,3 +42,22 @@ z-index: -1; left: 0; } + +.btn-primary { + //.button-variant(@btn-primary-color; @btn-primary-bg; @btn-primary-border); + .button-variant(#fff; #135898; #fff); + + color: #ffffff; + background-color: #135898; + background: url('/static/imgs/btn_bg.png'); + + border: 1px dashed #fff; + border-radius: 3px; + box-shadow: 0 0 0 2px #135898; + + font-family: 'Roboto Slab'; + font-weight: 500; + + padding-top: 3px; + +} \ No newline at end of file diff --git a/zsite/templates/aldryn_people/plugins/feature/people_list.html b/zsite/templates/aldryn_people/plugins/feature/people_list.html new file mode 100644 index 0000000..08146cc --- /dev/null +++ b/zsite/templates/aldryn_people/plugins/feature/people_list.html @@ -0,0 +1,39 @@ +{% load i18n thumbnail shuffle %} + +
+{% if people_groups %} + {# Because of hvad I have to activate the plugin's language :( #} + {% language instance.language %} + {% for group, people_list in people_groups.items %} + {% if group.name %} +
+

{{ group.name }}

+
{{ group.description|safe }}
+

+ {% if group.phone %}{% trans "Phone:" %} {{ group.phone }}
{% endif %} + {% trans "Address:" %} + {{ group.address }} +

+
+ {% endif %} + {% endfor %} + {% endlanguage %} +{% endif %} + +{% if not people_groups %} +
+ {% for person in people|shuffle|slice:":1" %} +
+ {{ person.name }} +
+
+

{{ person.name }}, {% trans 'our' %} {{ person.function|lower }}, {% trans 'answer your question' %}

+
+
+ {% trans 'Free Consultation' %} +
+ {% endfor %} +
+
+{% endif %} +
\ No newline at end of file diff --git a/zsite/templates/base.html b/zsite/templates/base.html index 7d26a9e..d4f9fd0 100644 --- a/zsite/templates/base.html +++ b/zsite/templates/base.html @@ -26,7 +26,7 @@

{% trans 'Moscow' %}

diff --git a/zsite/templates/cms/plugins/video.html b/zsite/templates/cms/plugins/video.html new file mode 100644 index 0000000..c5f16e6 --- /dev/null +++ b/zsite/templates/cms/plugins/video.html @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/zsite/templatetags/__init__.py b/zsite/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/zsite/templatetags/shuffle.py b/zsite/templatetags/shuffle.py new file mode 100644 index 0000000..e5868f5 --- /dev/null +++ b/zsite/templatetags/shuffle.py @@ -0,0 +1,9 @@ +import random +from django import template +register = template.Library() + +@register.filter +def shuffle(arg): + aux = list(arg)[:] + random.shuffle(aux) + return aux