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

0.0.304

Browse Source
This commit is contained in:
borissedw
2023-10-29 22:20:02 +03:00
parent 928c737ead
commit c6edd2c533
5 changed files with 95 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,22 +51,24 @@
<img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">
</div>
</div>
<div class="container-messages" data-user-id="{{ user.id }}" data-cur-receiver="{{ cur_receiver.id }}" data-ticket-id="null" >
{% include "blocks/profile/b_messages_container.html" %}
</div>
<div class="footer-chat">
<div class="left-part-block-enter-message">
<input class="enter-message-inp" onfocus="check_new_messages_timeout()" onkeypress="sendMessageEnter(event,null,{{ user.id }},{{ cur_receiver.id }})" placeholder="Отправить сообщение">
<div class="bottom_part_of_chats">
<div class="container-messages" data-user-id="{{ user.id }}" data-cur-receiver="{{ cur_receiver.id }}" data-ticket-id="null" >
{% include "blocks/profile/b_messages_container.html" %}
</div>
<div class="right-part-block-enter-message">
{# <button class="attach-file-btn-message" onclick="attachFilemeassge(event,this,null,{{ user.id }},{{ cur_receiver.id }})"></button>#}
<input style="display: none;" type="file" onchange="attachFilemeassge(this,null,{{ user.id }},{{ cur_receiver.id }})" id="id_choce_file" multiple>
<label for="id_choce_file" class="attach-file-btn-message"></label>
<button class="send-message" onclick="sendMessage(null,{{ user.id }},{{ cur_receiver.id }})"></button>
<img src="{% static "/img/svg/loader.svg" %}" class="loader_show_message">
{# <button class="send-message" onclick="send_ws_msg('message')"></button>#}
<div class="footer-chat">
<div class="left-part-block-enter-message">
<input class="enter-message-inp" onfocus="check_new_messages_timeout()" onkeypress="sendMessageEnter(event,null,{{ user.id }},{{ cur_receiver.id }})" placeholder="Отправить сообщение">
</div>
<div class="right-part-block-enter-message">
{# <button class="attach-file-btn-message" onclick="attachFilemeassge(event,this,null,{{ user.id }},{{ cur_receiver.id }})"></button>#}
<input style="display: none;" type="file" onchange="attachFilemeassge(this,null,{{ user.id }},{{ cur_receiver.id }})" id="id_choce_file" multiple>
<label for="id_choce_file" class="attach-file-btn-message"></label>
<button class="send-message" onclick="sendMessage(null,{{ user.id }},{{ cur_receiver.id }})"></button>
<img src="{% static "/img/svg/loader.svg" %}" class="loader_show_message">
{# <button class="send-message" onclick="send_ws_msg('message')"></button>#}
</div>
</div>
</div>
</div>

37
templates/pages/p_main.html
View File

@@ -101,7 +101,7 @@
</div>
<div class="button_container">
<button id="more_button">{% translate "Отправить посылку" %}</button>
<a class="a_btn_standart" href="{% url 'profile_page' 'create_route_for_customer' %}" id="more_button">{% translate "Отправить посылку" %}</a>
</div>
</div>
<div id="content-2">
@@ -225,18 +225,35 @@
<div class="news_block_main">
{% for art in articles %}
{# {% for art in articles %}#}
{##}
{# <div class="news_item">#}
{# <div class="news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>#}
{# <div class="news_header">{{ art.name }}</div>#}
{# <div class="news_description">#}
{# {{ art.description|truncatechars:100 }}#}
{# <div class="news_gradient"></div>#}
{# </div>#}
{# </div>#}
{##}
{# {% endfor %}#}
{# <div class="three_pinned_news">#}
{% for art in articles %}
<div class="news_item">
<div class="news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>
<div class="news_header">{{ art.name }}</div>
<div class="news_description">
{{ art.description|truncatechars:100 }}
<div class="news_gradient"></div>
</div>
<a href="{% url "article_one" art.url %}">
<div class="news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>
<div class="news_header">{{ art.name }}</div>
<div class="news_description">
{{ art.description|truncatechars:100 }}
<div class="news_gradient"></div>
</div>
</a>
</div>
{% endfor %}
{#<div>{{ art.text|safe }}</div>#}
{% endfor %}
{# </div>#}
</div>