From 28a680fdf1b57396a98c4858e9e63551124b5550 Mon Sep 17 00:00:00 2001 From: erjemin Date: Fri, 30 Dec 2022 19:58:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=BA=D0=B0=D1=82=D0=B0=D0=BB=D0=BE=D0=B3=20?= =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=20=D0=B2=D1=8B=D0=BF=D0=B0=D0=B4=D0=B0=D1=8E=D1=89=D0=B5?= =?UTF-8?q?=D0=B9=20=D0=BE=D0=BA=D0=BE=D0=BD=20--=20minor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oknardia/templates/index.html | 2 +- .../{ => popup}/popup_incorrect_address.html | 0 .../templates/{ => popup}/popup_index.html | 168 +++++++++--------- .../popup_show_apartment_variants.html} | 0 oknardia/web/views.py | 6 +- 5 files changed, 88 insertions(+), 88 deletions(-) rename oknardia/templates/{ => popup}/popup_incorrect_address.html (100%) rename oknardia/templates/{ => popup}/popup_index.html (98%) rename oknardia/templates/{popup_1.html => popup/popup_show_apartment_variants.html} (100%) diff --git a/oknardia/templates/index.html b/oknardia/templates/index.html index 4372008..d854a62 100755 --- a/oknardia/templates/index.html +++ b/oknardia/templates/index.html @@ -44,7 +44,7 @@ function init () {
{% if not CONFIRM_OK %} - {% include "popup_index.html" %} + {% include "popup/popup_index.html" %} {% elif CONFIRM_OK == "YES" %} {% include "user_manager/popup_cofirm_email_ok.html" %} {% elif CONFIRM_OK == "NO" %} diff --git a/oknardia/templates/popup_incorrect_address.html b/oknardia/templates/popup/popup_incorrect_address.html similarity index 100% rename from oknardia/templates/popup_incorrect_address.html rename to oknardia/templates/popup/popup_incorrect_address.html diff --git a/oknardia/templates/popup_index.html b/oknardia/templates/popup/popup_index.html similarity index 98% rename from oknardia/templates/popup_index.html rename to oknardia/templates/popup/popup_index.html index 7f9a685..9f46805 100755 --- a/oknardia/templates/popup_index.html +++ b/oknardia/templates/popup/popup_index.html @@ -1,85 +1,85 @@ -{% load static %} -{% with APP_INVITATION_STRING_IN_FORM="Город, улица, дом" %} - -

Выбирайте окна в квартиру:

- {% if NV <= 1 %} -
    -
  1. Вводите адрес дома или выберите его из подсказки,
  2. -
  3. укажите тип квартиры,
  4. -
  5. получите актуальные цены и сравнивайте характеристики предложений.
  6. -
- {% endif %} -
- {% csrf_token %} -
- - - Подсказывать адреса: -
-
- - - - - - - -
- {% if LAST_VISIT %}
Ваши последние просмотры:
- -
{% endif %} - -
+{% load static %} +{% with APP_INVITATION_STRING_IN_FORM="Город, улица, дом" %} + +

Выбирайте окна в квартиру:

+ {% if NV <= 1 %} +
    +
  1. Вводите адрес дома или выберите его из подсказки,
  2. +
  3. укажите тип квартиры,
  4. +
  5. получите актуальные цены и сравнивайте характеристики предложений.
  6. +
+ {% endif %} +
+ {% csrf_token %} +
+ + + Подсказывать адреса: +
+
+ + + + + + + +
+ {% if LAST_VISIT %}
Ваши последние просмотры:
+ +
{% endif %} + +

{% endwith %} \ No newline at end of file diff --git a/oknardia/templates/popup_1.html b/oknardia/templates/popup/popup_show_apartment_variants.html similarity index 100% rename from oknardia/templates/popup_1.html rename to oknardia/templates/popup/popup_show_apartment_variants.html diff --git a/oknardia/web/views.py b/oknardia/web/views.py index 5136352..0a72f9d 100644 --- a/oknardia/web/views.py +++ b/oknardia/web/views.py @@ -151,9 +151,9 @@ def get_address(request: HttpRequest) -> HttpResponse: if q.R2 > 0.67: # Если расстояние между точками больше 670 метров, то не показываем результат to_template.update({'ticks': float(time.time()-time_start)}) to_template.update({'addr': addr}) - return render(request, "popup_incorrect_address.html", to_template) + return render(request, "popup/popup_incorrect_address.html", to_template) addr = q.sAddress - print("addr", addr) + # print("addr", addr) to_template.update({'ADDRESS_ID': q.id, 'SERIA': q.sSerias_Project}) if q.fTotal_Area < 0: @@ -293,4 +293,4 @@ def get_address(request: HttpRequest) -> HttpResponse: 'addr': addr, 'addr_T': pytils.translit.slugify(addr), 'ticks': float(time.time()-time_start)}) - return render(request, "popup_1.html", to_template) + return render(request, "popup/popup_show_apartment_variants.html", to_template)