0.0.45
This commit is contained in:
@@ -824,7 +824,7 @@
|
||||
|
||||
.phones_carrier_span{
|
||||
position: relative;
|
||||
top: 4px;
|
||||
top: 6px;
|
||||
background: linear-gradient(99deg, #040404 56%, #9f9f9f 25%, #ffffff);
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
@@ -860,7 +860,7 @@
|
||||
|
||||
.email_carrier_span{
|
||||
position: relative;
|
||||
top: 2px;
|
||||
top: 5px;
|
||||
background: linear-gradient(99deg, #040404 2%, #f5f5f5 16%, #ffffff);
|
||||
-webkit-background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
|
||||
@@ -170,7 +170,7 @@ function selectedUserMessenger (el,ticket_id){
|
||||
});
|
||||
}
|
||||
|
||||
function sendMessage(id_ticket,sender,receiver){
|
||||
function sendMessage(id_ticket=null,sender,receiver){
|
||||
event.preventDefault()
|
||||
|
||||
let text = document.querySelector(".enter-message-inp").value
|
||||
@@ -179,14 +179,24 @@ function sendMessage(id_ticket,sender,receiver){
|
||||
//
|
||||
}
|
||||
else {
|
||||
let data = {
|
||||
'ticket_id': id_ticket,
|
||||
'sender': sender,
|
||||
'receiver': receiver,
|
||||
'text': text
|
||||
let data = {}
|
||||
if (id_ticket === null){
|
||||
data = {
|
||||
'sender': sender,
|
||||
'receiver': receiver,
|
||||
'text': text
|
||||
}
|
||||
} else {
|
||||
data = {
|
||||
'ticket_id': id_ticket,
|
||||
'sender': sender,
|
||||
'receiver': receiver,
|
||||
'text': text
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
$.ajax({
|
||||
headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
|
||||
url: '/ru/messages/send_msg/',
|
||||
|
||||
@@ -4,35 +4,84 @@
|
||||
<h1>Написать сообщение</h1>
|
||||
</div>
|
||||
|
||||
<div class="container-messenger">
|
||||
<div class="block-chat">
|
||||
<div class="container-header-chat">
|
||||
<div class="header-chat-left-part">
|
||||
<img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}">
|
||||
<span class="chat-username">Сергейко Сергей</span>
|
||||
</div>
|
||||
<div class="header-chat-right-part">
|
||||
<img class="header-icons-right-part-padding" src="{% static "img/svg/phone.svg" %}">
|
||||
<img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">
|
||||
</div>
|
||||
{#<div class="container-messenger">#}
|
||||
{# <div class="block-chat">#}
|
||||
{# <div class="container-header-chat">#}
|
||||
{# <div class="header-chat-left-part">#}
|
||||
{# <img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}">#}
|
||||
{# <span class="chat-username">Сергейко Сергей</span>#}
|
||||
{# </div>#}
|
||||
{# <div class="header-chat-right-part">#}
|
||||
{# <img class="header-icons-right-part-padding" src="{% static "img/svg/phone.svg" %}">#}
|
||||
{# <img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">#}
|
||||
{# </div>#}
|
||||
{# </div>#}
|
||||
{# <div class="container-messages">#}
|
||||
{# {% include "widgets/w_message.html" %}#}
|
||||
{# </div>#}
|
||||
{# <div class="footer-chat">#}
|
||||
{# <div class="left-part-block-enter-message">#}
|
||||
{# <input class="enter-message-inp" placeholder="Отправить сообщение">#}
|
||||
{# </div>#}
|
||||
{# <div class="right-part-block-enter-message">#}
|
||||
{# <button class="attach-file-btn-message" onclick="attachFilemeassge()"></button>#}
|
||||
{# <button class="send-message"></button>#}
|
||||
{# </div>#}
|
||||
{# </div>#}
|
||||
{# </div>#}
|
||||
{# <div class="block-list-of-users">#}
|
||||
{# <span class="title-list-of-users">Пользователи</span>#}
|
||||
{# <div class="insert_users">#}
|
||||
{# {% include "widgets/w_tab_user.html" %}#}
|
||||
{# </div>#}
|
||||
{# </div>#}
|
||||
{#</div>#}
|
||||
|
||||
|
||||
<div class="block-chat">
|
||||
<div class="container-header-chat">
|
||||
<div class="header-chat-left-part">
|
||||
<img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}">
|
||||
<span class="chat-username">{{ ticket.manager.last_name }} {{ ticket.manager.first_name }}</span>
|
||||
</div>
|
||||
<div class="container-messages">
|
||||
{% include "widgets/w_message.html" %}
|
||||
</div>
|
||||
<div class="footer-chat">
|
||||
<div class="left-part-block-enter-message">
|
||||
<input class="enter-message-inp" placeholder="Отправить сообщение">
|
||||
</div>
|
||||
<div class="right-part-block-enter-message">
|
||||
<button class="attach-file-btn-message" onclick="attachFilemeassge()"></button>
|
||||
<button class="send-message"></button>
|
||||
</div>
|
||||
<div class="header-chat-right-part">
|
||||
<img class="header-icons-right-part-padding" src="{% static "img/svg/phone.svg" %}">
|
||||
<img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="block-list-of-users">
|
||||
<span class="title-list-of-users">Пользователи</span>
|
||||
<div class="insert_users">
|
||||
{% include "widgets/w_tab_user.html" %}
|
||||
|
||||
<div class="container-messages">
|
||||
{% if not messages %}
|
||||
{% with text=ticket.text modifiedDT=ticket.modifiedDT %}
|
||||
{% include "widgets/w_message.html" %}
|
||||
{% endwith %}
|
||||
{% else %}
|
||||
{% for msg in messages %}
|
||||
{% with text=msg.text modifiedDT=msg.modifiedDT %}
|
||||
{% include "widgets/w_message.html" %}
|
||||
{% endwith %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
<div class="footer-chat">
|
||||
<div class="left-part-block-enter-message">
|
||||
<input class="enter-message-inp" onkeypress="sendMessageEnter(event,{{ ticket.id }},{{ user.id }},{{ ticket.owner.id }})" placeholder="Отправить сообщение">
|
||||
</div>
|
||||
<div class="right-part-block-enter-message">
|
||||
<button class="attach-file-btn-message" onclick="attachFilemeassge()"></button>
|
||||
<button class="send-message" onclick="sendMessage({{ ticket.id }},{{ user.id }},{{ ticket.owner.id }})"></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="block-list-of-users">
|
||||
<span class="title-list-of-users">Неразобранные тикеты</span>
|
||||
<div class="insert_users">
|
||||
{% if tickets_wo_manager %}
|
||||
{% for item in tickets_wo_manager %}
|
||||
{% include "widgets/w_tab_user.html" %}
|
||||
{% endfor %}
|
||||
{% endif %}
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@@ -8,9 +8,11 @@
|
||||
|
||||
<script src='{% static "js/jquery_v3_6_4.js" %}'> </script>
|
||||
|
||||
|
||||
<link rel="stylesheet" href="{% static 'css/styles.css' %}">
|
||||
|
||||
<link rel="stylesheet" href="{% static 'css/styles(boris).css' %}">
|
||||
<link rel="stylesheet" href="{% static 'css/styles(boris).css' %}" >
|
||||
|
||||
|
||||
|
||||
{% block meta %}
|
||||
|
||||
@@ -43,9 +43,9 @@
|
||||
</a>
|
||||
</div>
|
||||
<button class="open_chat_carrier" onclick="open_chat({{ route.owner_id }})">
|
||||
<img src="{% static "img/svg/Logo.svg" %}" width="30px" style="position:relative;top: 8px;">
|
||||
<span style="position: relative;top: 4px;">Написать</span>
|
||||
<img src="{% static "/img/svg/email.svg" %}" width="25px" style="position:relative;left: 3px;">
|
||||
<img src="{% static "img/svg/Logo.svg" %}" width="30px" style="position:relative;top: 6px;">
|
||||
<span style="position: relative;top: 2px;">Написать</span>
|
||||
{# <img src="{% static "/img/svg/email.svg" %}" width="25px" style="position:relative;left: 3px;">#}
|
||||
</button>
|
||||
<button class="open_inf_carrier" onclick="show_inf_carrier(this)">Открыть контакт</button>
|
||||
</form>
|
||||
|
||||
Reference in New Issue
Block a user