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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
ArtemB
2023-11-19 16:44:32 +03:00
parent 70df8a53c8 3311ab5b37
commit 55b4c0ac11
11 changed files with 110 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,7 @@
{# </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 open" data-name="тик">
<div class="menu_buttons curtain left open {% if name.ticket %}margin{% endif %}" data-name="тик">
<div class="container_block_list_of_users">
{% include 'blocks/profile/b_list_of_tickets_support_chat.html' %}
</div>

4
templates/forms/f_find_route_form_main_find_routes.html
View File

@@ -32,7 +32,7 @@
id="id_from_address_point_txt"
{% if route_form.initial.from_address_point_txt %}value="{{ route_form.initial.from_address_point_txt }}"{% endif %}
/>
<div id="abbreviation_airport_in_search" class="abbreviation_airport_in_search"></div>
<div id="abbreviation_airport_in_search" onclick="focusOnInput(this)" class="abbreviation_airport_in_search"></div>
<div class="input_list find_route" name="from_address_point_txt_list">
</div>
@@ -69,7 +69,7 @@
id="id_to_address_point_txt"
class="to_address_point_txt find_route"
{% if route_form.initial.to_address_point_txt %}value="{{ route_form.initial.to_address_point_txt}}"{% endif %}/>
<div class="abbreviation_airport_in_search"></div>
<div class="abbreviation_airport_in_search" onclick="focusOnInput(this)"></div>
<div class="input_list find_route" name="to_address_point_txt_list">
</div>

63
templates/pages/p_article.html
View File

@@ -22,54 +22,45 @@
<div class="previous_next_news">
{% for art in arts_top %}
{% for item in arts_top %}
<a class="cont_one_news" href="{% url "article_one" art.url %}">
<div class="cont_img_one_news">
<img class="img_one_news" src="{{ MEDIA_URL }}{{ art.picture }}">
<div class="news_item">
<a href="{% url "article_one" item.url %}">
<div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div>
<div class="news_header">{{ item.name }}</div>
<div class="news_description">
{{ item.description|truncatechars:100 }}
<div class="news_gradient"></div>
</div>
</a>
</div>
<div class="cont_content_one_news">
<div class="container_name_one_news">
{{ art.name|truncatechars:100 }}
</div>
<div class="container_descript_one_news">
{{ art.description|truncatechars:100 }}
</div>
</div>
</a>
{#<div>{{ art.text|safe }}</div>#}
{% endfor %}
<a class="cont_one_news" href="{% url "article_one" art.url %}">
<div class="cont_img_one_news">
<img class="img_one_news" src="{{ MEDIA_URL }}{{ art.picture }}">
</div>
<div class="cont_content_one_news">
<div class="container_name_one_news">
{{ art.name|truncatechars:100 }}
</div>
<div class="container_descript_one_news">
<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>
</a>
</div>
{% for item in arts_down %}
<a class="cont_one_news" href="{% url "article_one" art.url %}">
<div class="cont_img_one_news">
<img class="img_one_news" src="{{ MEDIA_URL }}{{ art.picture }}">
</div>
<div class="cont_content_one_news">
<div class="container_name_one_news">
{{ art.name|truncatechars:100 }}
<div class="news_item">
<a href="{% url "article_one" item.url %}">
<div class="news_img"><img src="{{ MEDIA_URL }}{{ item.picture }}" /></div>
<div class="news_header">{{ item.name }}</div>
<div class="news_description">
{{ item.description|truncatechars:100 }}
<div class="news_gradient"></div>
</div>
<div class="container_descript_one_news">
{{ art.description|truncatechars:100 }}
</div>
</div>
</a>
</a>
</div>
{#<div>{{ art.text|safe }}</div>#}
{% endfor %}

28
templates/pages/p_articles.html
View File

@@ -15,19 +15,16 @@
<div class="three_pinned_news">
{% for art in articles %}
{% if forloop.counter0 < 3 %}
<a class="cont_one_news" href="{% url "article_one" art.url %}">
<div class="cont_img_one_news">
<img class="img_one_news" src="{{ MEDIA_URL }}{{ art.picture }}">
</div>
<div class="cont_content_one_news">
<div class="container_name_one_news">
{{ art.name|truncatechars:100 }}
</div>
<div class="container_descript_one_news">
<div class="news_item">
<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>
</div>
</a>
</a>
</div>
{% endif %}
{#<div>{{ art.text|safe }}</div>#}
@@ -35,12 +32,9 @@
</div>
<div class="block_w_paging">
<div class="news_block">
{% with from_el=3 %}
{% include 'blocks/articles/b_news_elements_content.html' %}
{% endwith %}
</div>
{% with from_el=3 %}
{% include 'blocks/articles/b_news_elements_content.html' %}
{% endwith %}
{# boris edited #}
{% if last_block == False %}
<div class="text-align-center">

2
templates/widgets/w_chat_right_panel_tickets.html
View File

@@ -1,5 +1,5 @@
{% load static %}
<div class="tab_user_messanger{% if item.id == ticket.id %} select{% endif %}" onclick="selectedUserMessenger({{ item.id }},null)" data-cur-receiver-item="{{ item.id }}">
<div class="tab_user_messanger{% if item.id == ticket.id %} select{% endif %}" onclick="selectedUserMessenger({{ item.id }},null,this)" data-cur-receiver-item="{{ item.id }}">
<div class="left-part-tab-user">
<img class="user_avatar_messenger" {% if item.user_profile.avatar %}src="{{ item.user_profile.avatar.url }}"{% else %}src="{% static "img/svg/User.svg" %}"{% endif %}>
<div class="status_user">

31
templates/widgets/w_news_element_item.html
View File

@@ -1,29 +1,16 @@
{% load static %}
{% if not from_el or forloop.counter > from_el %}
{# <div class="news_item_pagination">#}
{# <div class="pag_news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>#}
{# <div class="pag_news_item_text">#}
{# <div class="news_header">{{ art.name }}</div>#}
{# <div class="news_description">#}
{# {{ art.description|truncatechars:400 }}#}
<div class="news_item_pagination">
<div class="pag_news_img"><img src="{{ MEDIA_URL }}{{ art.picture }}" /></div>
<div class="pag_news_item_text">
<div class="news_header">{{ art.name }}</div>
<div class="news_description">
{{ art.description|truncatechars:400 }}
{# <div class="news_gradient"></div>#}
{# </div>#}
{# </div>#}
{# <div class="clear_both"></div>#}
{##}
{# </div>#}
<a class="cont_one_news" href="{% url "article_one" art.url %}">
<div class="cont_img_one_news">
<img class="img_one_news" src="{{ MEDIA_URL }}{{ art.picture }}">
</div>
<div class="cont_content_one_news">
<div class="container_name_one_news">
{{ art.name|truncatechars:100 }}
</div>
<div class="container_descript_one_news">
{{ art.description|truncatechars:100 }}
</div>
</div>
</a>
<div class="clear_both"></div>
</div>
{% endif %}