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 'Все / выделенные:' %}
-
- {% trans 'удалить из расписания' %} - -
- -
- + {% if events|length > 0 %} +
+
{{ days.15|date:"F"}}’{{ days.15|date:"y"}}
+ {% include 'includes/accounts/calendar_list.html' with events=events %} +
+ +
+
{% trans 'Все / выделенные:' %}
+
+ {% trans 'удалить из расписания' %} + +
+ +
+ {% endif %}
{% trans 'Посмотреть прошедший календарь' %}
- - {% 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 %}
{% trans 'Тематика: ' %} - - {{ search_form.get_themes_display }} + + {# search_form.get_themes_display #}{% trans 'Не важно' %}  
{% endif %} {% if search_form.place_type %}
{% trans 'Тип: ' %} - - bla + + {% trans 'Не важно' %}
{% endif %} {% if search_form.area %}
{% trans 'Место: ' %} - - {{ search_form.get_places_display }} + + {# search_form.get_places_display #}{% trans 'Не важно' %}  
@@ -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 %}
{% trans 'Тематика: ' %} - - {{ search_form.get_themes_display }} + + {# search_form.get_themes_display #} + {% trans 'Не важно' %}  
{% endif %} {% if search_form.place_type %}
{% trans 'Тип: ' %} - - bla + + {% trans 'Не важно' %}
{% endif %} {% if search_form.area %}
{% trans 'Место: ' %} - - {{ search_form.get_places_display }} + + {# search_form.get_places_display #} + {% trans 'Не важно' %}  
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 %}
-
+
+  Раскрыть карту
 {% trans 'Добавить' %}
{% trans 'адрес компании' %} +15
@@ -232,13 +233,18 @@
-
+ +
+
- {% trans 'редактировать' %} + {% trans 'редактировать' %}

{% with tags=company.tag.all %} {% for tag in tags %} @@ -660,11 +666,11 @@ path:'http://{{ request.get_host }}/city/get-city/' }, {id:'id_tag', - placeholder:'Выберите ключевые теги', + placeholder:"{% trans 'Выберите ключевые теги' %}", path:'http://{{ request.get_host }}/theme/get-tag/' }, {id:'id_theme', - placeholder:'Укажите тематику', + placeholder:'Укажите тематику' } ], @@ -676,6 +682,17 @@ }, rating:{ id:'profile-rating' + }, + map:{ + + blockId:"address-block", + canvasId:"gmap-canvas", + autocompleteId:"id_address_inf", + zoom:{ + street:14, + city:12, + country:4 + } } diff --git a/templates/client/includes/company/company_object.html b/templates/client/includes/company/company_object.html index c7157c90..3b2031bf 100644 --- a/templates/client/includes/company/company_object.html +++ b/templates/client/includes/company/company_object.html @@ -22,11 +22,17 @@

{{ company.name|safe }}
+
+ + Украина, Белая Церковь + +
-
- {{ company.specialization|linebreaks }} +
+ {{ company.specialization|linebreaks }}
+ {% with themes=company.theme.all %}
{% for th in themes %} @@ -36,22 +42,32 @@ {% endwith %}
- {% if company.tag.all|length > 0 %} -
- {% with tags=company.tag.all %} - {% for tag in tags %} - {{ tag.name }}, - {% endfor %} - {% endwith %} -
-
- {% endif %} {% if company.address_inf %} - {{ company.address_inf }} +
+  Раскрыть карту +
+ {{ company.address_inf }} +
+ + +
{% endif %} + {% if company.tag.all|length > 0 %} +
+ {% with tags=company.tag.all %} + {% for tag in tags %} + {{ tag.name }}, + {% endfor %} + {% endwith %} +
+
+ {% endif %}
{% if company.facebook or company.linkedin or company.vk or company.twitter %}
@@ -245,4 +261,86 @@ {% endif %}
+ {% endblock %} \ No newline at end of file diff --git a/templates/client/includes/place/place_object.html b/templates/client/includes/place/place_object.html index b26b471b..c4600fc6 100644 --- a/templates/client/includes/place/place_object.html +++ b/templates/client/includes/place/place_object.html @@ -5,7 +5,7 @@ {% block page_body %}
-
+