diff --git a/templates/client/includes/accounts/calendar_table.html b/templates/client/includes/accounts/calendar_table.html index d783eb54..d7ed91fa 100644 --- a/templates/client/includes/accounts/calendar_table.html +++ b/templates/client/includes/accounts/calendar_table.html @@ -1,201 +1,182 @@ {% load static %} {% load i18n %} {% load template_filters %} - - -
-
{% trans 'визуализация' %}
-
-
-
- < -
{{ days.15|date:"F"}}’{{ days.15|date:"y"}}
- > -
-
-
-
-
- {% with events=events %} - - - - {% for day in days %} - {% ifnotequal day current_day %} - - {% else %} - - {% endifnotequal %} - {% endfor %} - - - - - {# первый ряд с отображениями дней где нет событий #} - - {% for day in days %} - - {% if day_colspan|get_item:day|get_item:'event' %} - {% ifnotequal day current_day %} - - {% else %} - - {% endifnotequal %} - - {% else %} - {% if day_colspan|get_item:day|get_item:'counter' %} - {# здесь ячейка с днями без событий #} - - - {% endif %} - - {% endif %} - - - {% endfor %} - - - {% for day in days %} - {% ifnotequal day current_day %} - - {% else %} - - {% endifnotequal %} - {% endfor %} - - - - {% for event in events %} - - {% for day in days %} - - {% if event|in_event:day %} - {% if day.month == event.data_begin.month %} - {% if day.day == event.data_begin.day %} - + {% endif %} + {% else %} + {% comment %} + {% if day.day == event.data_end.day %} + + {% endif %} + {% endcomment %} + + {% endif %} + {% else %} + {% ifnotequal day current_day %} + + {% else %} + + {% endifnotequal %} + + {% endif %} + {% endfor %} + + + {% for day in days %} + {% ifnotequal day current_day %} + + {% else %} + + {% endifnotequal %} + {% endfor %} + + {% endfor %} + +
{{ day|date:"d" }}/{% if LANGUAGE_CODE == 'ru' %}{{ day|get_rus_day }}{% else %}{{ day|date:"D" }}{% endif %}
 -
-
{% trans 'Сегодня' %}
- {{ day|date:"d" }}/{% if LANGUAGE_CODE == 'ru' %}{{ day|get_rus_day }}{% else %}{{ day|date:"D" }}{% endif %} -
-
-
-
{% trans "Нет отмеченых событий" %}
-
-
+
{% trans 'визуализация' %}
+
+
+
+ < +
{{ days.15|date:"F"}}’{{ days.15|date:"y"}}
+ > +
+
+
+
+
+ {% with events=events %} + + + + {% for day in days %} + {% ifnotequal day current_day %} + + {% else %} + + {% endifnotequal %} + {% endfor %} + + + + + {# первый ряд с отображениями дней где нет событий #} + + {% for day in days %} + {% if day_colspan|get_item:day|get_item:'event' %} + {% ifnotequal day current_day %} + + {% else %} + + {% endifnotequal %} + {% else %} + {% if day_colspan|get_item:day|get_item:'counter' %} + {# здесь ячейка с днями без событий #} + + {% endif %} + {% endif %} + {% endfor %} + + + {% for day in days %} + {% ifnotequal day current_day %} + + {% else %} + + {% endifnotequal %} + {% endfor %} + + {% for event in events %} + + {% for day in days %} + {% if event|in_event:day %} + {% if day.month == event.data_begin.month %} + {% if day.day == event.data_begin.day %} + - {% endif %} - {% else %} - {% comment %} - {% if day.day == event.data_end.day %} - - {% endif %} - {% endcomment %} - - {% endif %} - {% else %} - {% ifnotequal day current_day %} - - {% else %} - - {% endifnotequal %} - - {% endif %} - {% endfor %} - - - - {% for day in days %} - {% ifnotequal day current_day %} - - {% else %} - - {% endifnotequal %} - {% endfor %} - - - - {% endfor %} - - -
{{ day|date:"d" }}/{% if LANGUAGE_CODE == 'ru' %}{{ day|get_rus_day }}{% else %}{{ day|date:"D" }}{% endif %}
 +
+
{% trans 'Сегодня' %}
+ {{ day|date:"d" }}/{% if LANGUAGE_CODE == 'ru' %}{{ day|get_rus_day }}{% else %}{{ day|date:"D" }}{% endif %} +
+
+
+
{% trans "Нет отмеченых событий" %}
+
+
{% comment %} -
+
{% endcomment %}
-
-

{{ event.name|safe }}

- -
-
- {% if request.user in event.users.all %} - - {% endif %} - -
-
{{ event.country }}, {{ event.city }} - {% if event.place %} - , {{ event.place.address.address }} - {% endif %} -
-
-
-
-
-
-
- -

{{ event.name|safe }}

- -
-
- {% if request.user in event.users.all %} - - {% endif %} - -
-
{{ event.country }}, {{ event.city }} - {% if event.place %} - , {{ event.place.address.address }} - {% endif %} -
-
- - -
-
-
- {% endwith %} -
+

{{ event.name|safe }}

+
+
+ {% if request.user in event.users.all %} + + {% endif %} + +
+
{{ event.country }}, {{ event.city }} + {% if event.place %} + , {{ event.place.address.address }} + {% endif %} +
+
+
+
+
+
+
-
-
- -
 
-
 
+

{{ event.name|safe }}

+ +
+
+ {% if request.user in event.users.all %} + + {% endif %} + +
+
{{ event.country }}, {{ event.city }} + {% if event.place %} + , {{ event.place.address.address }} + {% endif %} +
+
+ + + + +
+ {% endwith %} +
+
+
+
+
 
+
 
{% block scripts %} - - - +{% if request.GET.debug == '1' %} + +{% else %} + +{% endif %} - -{% endblock %} - +{% endblock %} \ No newline at end of file