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

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	static/js/user_profile.js
This commit is contained in:
borissedw
2023-10-27 17:21:28 +03:00
parent b8c282f95f 47e39a1d9c
commit cc86400957
8 changed files with 259 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
templates/blocks/b_footer.html
View File

@@ -68,14 +68,16 @@
<div class="second-footer">
<div>
<div class="sf_1-column">Copyright © 2023. Все права защищены.</div>
<div class="sf_2-column">
<div class="sf_1_column">Copyright © 2023. Все права защищены.</div>
<div class="sf_2_column">
<a href="/ru/info_page/publichnaya-oferta/">Публичная оферта</a>
</div>
<div class="sf_3-column">
<a href="/ru/info_page/politika-konfidencialnosti/">Политика конфиденциальности</a></div>
<div class="sf_4-column">
<a href="/ru/info_page/pravila-polzovaniya-servisom/">Правила пользования сервисом</a></div>
<div class="sf_3_column">
<a href="/ru/info_page/politika-konfidencialnosti/">Политика конфиденциальности</a>
</div>
<div class="sf_4_column">
<a href="/ru/info_page/pravila-polzovaniya-servisom/">Правила пользования сервисом</a>
</div>
</div>

11
templates/blocks/b_header.html
View File

@@ -1,5 +1,7 @@
{% load i18n %}
{% load base_tags_extra %}
<div class="header_big_background">
</div>
<header id="header_bg">
<div class="header-first">
<div class="header_logo">
@@ -37,12 +39,12 @@
</div>
<div class="header-second">
<div>
<div class="header-second-item-lang">
<div class="dropdown_lang">
<div id="dropbtn_lang" class="dropbtn_lang">RU</div>
<div class="dropdown-content-lang">
<a onclick="changeImgLang(this)" href="/ru{{ request.path|del_lang_from_path }}">RU</a>
<a onclick="changeImgLang(this)" href="/en{{ request.path|del_lang_from_path }}">EN</a>
<a id="ru_lang" href="/ru{{ request.path|del_lang_from_path }}">RU</a>
<a id="en_lang" href="/en{{ request.path|del_lang_from_path }}">EN</a>
</div>
</div>
</div>
@@ -103,4 +105,5 @@
</div>
<div class="clear_both"></div>
</header>
</header>
<div class="line_f_header"></div>

2
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 class="abbreviation_airport_in_search"></div>
<div id="abbreviation_airport_in_search" class="abbreviation_airport_in_search"></div>
<div class="input_list find_route" name="from_address_point_txt_list">
</div>

16
templates/tb_base.html
View File

@@ -34,8 +34,8 @@
<link rel="stylesheet" href="{% static 'css/styles.css' %}">
<link rel="stylesheet" href="{% static 'css/styles(boris).css' %}" >
<link rel="stylesheet" href="{% static 'css/mobile_styles.css' %}">
<script src='{% static "js/find_route.js" %}'></script>
<script src="{% static "js/filters_functions_find_route.js" %}"></script>
@@ -52,17 +52,17 @@
{% endblock %}
</head>
<body>
<div class="wrapper">
{# modifided by boris#}
<div class="header_big_background">
</div>
<div class="wrapper_main">
{% include 'blocks/b_header.html' %}
<div class="line_f_header"></div>
<div class="wrapper_content">
{% block content %}
{% endblock %}
{% block content %}
{% endblock %}
</div>
</div>
{% include 'blocks/b_footer.html' %}