sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
ArtemB
2023-11-24 16:09:47 +03:00
parent 55eff16b9c 31857131be
commit 64b8e74612
8 changed files with 438 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/blocks/b_header.html
View File

@@ -62,7 +62,7 @@
{% if user.is_authenticated %}
{# boris changed #}
<div class="cont_header_btn_profile">
<div class="button_profile_header" {% if not page_type == 'profile' %}onclick="open_curtain(null,'right')"{% endif %} data-user-id="{{ user.id }}">
<div class="button_profile_header" {% if not page_type == 'profile' %}onclick="open_curtain_w_btn_profile()"{% endif %} data-user-id="{{ user.id }}">
{# <div class="button_profile_header" onclick="open_curtain(null,'right')" data-user-id="{{ user.id }}">#}
<span class="btn_profile_name">
@@ -75,7 +75,7 @@
</div>
</div>
</div>
<div class="button_profile_header_mobile" onclick="open_curtain(null,'right')">
<div class="button_profile_header_mobile" onclick="open_curtain_w_btn_profile()">
<img src="/static/img/svg/userMobile.svg" alt="">
</div>
{# <div class="menu_profile_btn">#}

2
templates/blocks/profile/b_chats.html
View File

@@ -7,7 +7,7 @@
<div class="container_block_list_of_users">
{% include 'blocks/profile/b_list_of_users_messenger.html' %}
</div>
<div class="handler_menu close" onclick="open_curtain('left')">
<div class="handler_menu close" onclick="open_curtain_w_contacts()">
<img class="btns_f_curtain close left" src="{% static 'img/svg/arrow_f_curtain.svg' %}">
<div class="text_f_curtain left"><img style='width: 25px;display: block;position: relative;bottom: 2px;transform: rotate(270deg);' src='{% static "/img/svg/group.png" %}'></div>
<img class="btns_f_curtain close right" src="{% static 'img/svg/arrow_f_curtain.svg' %}">

6
templates/blocks/profile/b_support_chat.html
View File

@@ -13,12 +13,12 @@
{# <h1>Техническая поддержка</h1>#}
{# </div>#}
<img class="loader_chat_f_sw_chats support" src="{% static "/img/svg/loader.svg" %}" alt="loader">
{% if user.is_staff %}
<div class="menu_buttons curtain left {% if not ticket %}open{% else %}close{% endif %} {% if name.ticket %}margin{% endif %}" data-name="<img style='width: 25px;display: block;position: relative;bottom: 2px;' src='{% static "/img/svg/group.png" %}'>">
{% if user.is_staff or staff %}
<div class="menu_buttons curtain left {% if mobile %}{% if not ticket %}open{% else %}close{% endif %}{% else %}open margin{% endif %}{% if name.ticket %}margin{% endif %}" data-name="<img style='width: 25px;display: block;position: relative;bottom: 2px;' src='{% static "/img/svg/group.png" %}'>">
<div class="container_block_list_of_users">
{% include 'blocks/profile/b_list_of_tickets_support_chat.html' %}
</div>
<div class="handler_menu close" onclick="open_curtain('left')">
<div class="handler_menu close" onclick="open_curtain_w_contacts()">
<img class="btns_f_curtain close left" src="{% static 'img/svg/arrow_f_curtain.svg' %}">
<div class="text_f_curtain left"><img style='width: 25px;display: block;position: relative;bottom: 2px;transform: rotate(270deg);' src='{% static "/img/svg/group.png" %}'></div>
<img class="btns_f_curtain close right" src="{% static 'img/svg/arrow_f_curtain.svg' %}">

8
templates/tb_base.html
View File

@@ -53,16 +53,16 @@
{% endblock %}
</head>
<body {% if page_type == 'routes' %}onscroll="scroll_ev(event,this)" {% endif %}>
<div class="block_overlay {% if page_type == 'profile' %}show{% elif page_type == 'routes' %} routes n_profile{% else %}hidden n_profile{% endif %}" onclick="open_curtain()"></div>
<div class="block_overlay {% if page_type == 'profile' %}show{% elif page_type == 'routes' %} routes n_profile hidden{% else %}hidden n_profile{% endif %}" onclick="close_open_curtain()"></div>
<div class="wrapper_main">
{% include 'blocks/b_header.html' %}
<div class="cut_width_f_curtain close{% if page_type == 'profile' %}{% else %} n_profile{% endif %} right" onclick="check_ev_f_cut_width_f_curtain(event)">
<div class="cut_width_f_curtain close{% if page_type == 'profile' %}{% else %} n_profile{% endif %} right">
<div class="menu_buttons curtain right {% if page_type == 'profile' %}open{% else %} n_profile close{% endif %}" data-name="<img style='width: 25px;display: block;position: relative;bottom: 2px;transform: rotate(270deg);' src='{% static "/img/svg/burger.svg" %}'>">
{% include "blocks/profile/b_buttons_menu_profile.html" %}
<div class="handler_menu close" onclick="open_curtain(null,'right')">
<div class="handler_menu close" onclick="open_curtain_w_btn_profile()">
<img class="btns_f_curtain close left" src="{% static 'img/svg/arrow_f_curtain.svg' %}">
<div class="text_f_curtain left"><img style='width: 25px;display: block;position: relative;bottom: 2px;transform: rotate(270deg);' src='{% static "/img/svg/burger.svg" %}'></div>
<img class="btns_f_curtain close right" src="{% static 'img/svg/arrow_f_curtain.svg' %}">
@@ -75,7 +75,7 @@
<div class="menu_buttons curtain left open first filters" data-name="<img style='width: 25px;display: block;position: relative;bottom: 2px;transform: rotate(270deg);' src='{% static "/img/svg/filter.svg" %}'>">
{% include "forms/f_find_route_filters_form.html" %}
<div class="handler_menu close" onclick="open_curtain('left')">
<div class="handler_menu close" onclick="open_curtain_w_contacts()">
<img class="btns_f_curtain close left" src="{% static 'img/svg/arrow_f_curtain.svg' %}">
<div class="text_f_curtain left"><img style='width: 25px;display: block;position: relative;bottom: 2px;transform: rotate(270deg);' src='{% static "/img/svg/filter.svg" %}'></div>
<img class="btns_f_curtain close right" src="{% static 'img/svg/arrow_f_curtain.svg' %}">