From 3ec81842a018c9ad6c5d46fd5111daa730998a71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9D=D0=B0=D0=B7=D0=B0=D1=80=20=D0=9A=D0=BE=D1=82=D1=8E?= =?UTF-8?q?=D0=BA?= Date: Tue, 24 Mar 2015 14:33:45 +0200 Subject: [PATCH] Merge --- templates/client/accounts/calendar.html | 69 +--- templates/client/article/news_list.html | 27 +- templates/client/blank.html | 2 +- templates/client/includes/catalog_search.html | 14 +- .../client/includes/catalog_search_main.html | 14 +- .../client/includes/company/company_edit.html | 27 +- .../includes/company/company_object.html | 124 ++++++- .../client/includes/place/place_object.html | 32 +- templates/client/popups/advertise_member.html | 87 +++-- templates/client/static_client/css/main.css | 165 ++++++++- .../client/static_client/css/main.min.css | 3 - .../static_client/css/normalize.min.css | 1 - .../client/static_client/css/regions.min.css | 1 - templates/client/static_client/css/vendor.css | 1 - .../client/static_client/css_min/main.min.css | 2 +- .../static_client/css_min/vendor.min.css | 2 +- .../client/static_client/img/sprites.png | Bin 18205 -> 53417 bytes .../js/_modules/block.newsFilter.js | 109 ++++++ .../static_client/js/_modules/block.search.js | 8 +- .../static_client/js/_modules/page.company.js | 349 +++++++++++++++--- .../js/_modules/page.exposition.object.js | 21 +- .../js/_modules/page.place.object.js | 26 +- .../js/_modules/page.profile.calendar.js | 128 +++++-- .../static_client/js/_modules/page.profile.js | 78 ++-- .../js_min/_modules/block.newsFilter.min.js | 1 + .../block.registration.completion.min.js | 2 +- .../js_min/_modules/block.search.min.js | 2 +- .../js_min/_modules/page.company.min.js | 2 +- .../_modules/page.exposition.object.min.js | 2 +- .../js_min/_modules/page.place.object.min.js | 2 +- .../_modules/page.profile.calendar.min.js | 2 +- .../js_min/_modules/page.profile.min.js | 2 +- 32 files changed, 1005 insertions(+), 300 deletions(-) delete mode 100644 templates/client/static_client/css/main.min.css delete mode 100644 templates/client/static_client/css/normalize.min.css delete mode 100644 templates/client/static_client/css/regions.min.css create mode 100644 templates/client/static_client/js/_modules/block.newsFilter.js create mode 100644 templates/client/static_client/js_min/_modules/block.newsFilter.min.js diff --git a/templates/client/accounts/calendar.html b/templates/client/accounts/calendar.html index 4b12759f..261d1bfd 100644 --- a/templates/client/accounts/calendar.html +++ b/templates/client/accounts/calendar.html @@ -25,60 +25,31 @@
-
-
{{ days.15|date:"F"}}’{{ days.15|date:"y"}}
- {% include 'includes/accounts/calendar_list.html' with events=events %} -
- -
-
{% trans 'Все / выделенные:' %}
- - -
- + {% if events|length > 0 %} +
+
{{ days.15|date:"F"}}’{{ days.15|date:"y"}}
+ {% include 'includes/accounts/calendar_list.html' with events=events %} +
+ +
+
{% trans 'Все / выделенные:' %}
+ + +
+ {% endif %}
- - {% endblock %} {% block scripts %} diff --git a/templates/client/article/news_list.html b/templates/client/article/news_list.html index 6d982fc9..1b73770b 100644 --- a/templates/client/article/news_list.html +++ b/templates/client/article/news_list.html @@ -1,4 +1,5 @@ {% extends 'base_catalog.html' %} +{% load static %} {% load i18n %} {% load template_filters %} @@ -16,7 +17,7 @@ {% endblock %} {% block content_list %} -
+
@@ -24,12 +25,18 @@
- {{ article_filter_form.theme }} +
+ + {{ article_filter_form.theme }} +
- {{ article_filter_form.tag.label }} +
+ {{ article_filter_form.tag }} +
+
@@ -52,6 +59,20 @@ {% endfor %}
+ + + {% endblock %} {% block paginator %} diff --git a/templates/client/blank.html b/templates/client/blank.html index b94ab16a..c119b6cc 100644 --- a/templates/client/blank.html +++ b/templates/client/blank.html @@ -129,7 +129,7 @@ This template include basic anf main styles and js files, {% endblock %} - + diff --git a/templates/client/includes/catalog_search.html b/templates/client/includes/catalog_search.html index 444680e3..4e7ba16a 100644 --- a/templates/client/includes/catalog_search.html +++ b/templates/client/includes/catalog_search.html @@ -36,23 +36,23 @@
{% if search_form.th %} {% endif %} {% if search_form.place_type %} {% endif %} {% if search_form.area %} @@ -69,7 +69,7 @@ по {{ search_form.to.value }} {% endif %} {% else %} - Не важно + {% trans 'Не важно' %} {% endif %}   diff --git a/templates/client/includes/catalog_search_main.html b/templates/client/includes/catalog_search_main.html index be969d0d..98774287 100644 --- a/templates/client/includes/catalog_search_main.html +++ b/templates/client/includes/catalog_search_main.html @@ -41,23 +41,25 @@
{% if search_form.th %} {% endif %} {% if search_form.place_type %} {% endif %} {% if search_form.area %} diff --git a/templates/client/includes/company/company_edit.html b/templates/client/includes/company/company_edit.html index 22b4efb6..500ed521 100644 --- a/templates/client/includes/company/company_edit.html +++ b/templates/client/includes/company/company_edit.html @@ -203,7 +203,8 @@ {% endwith %}
-
+
+  Раскрыть карту
-
+ +
+