sysadminix/Aerbim
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:
SBD
2024-01-12 18:21:18 +03:00
parent 413c72e79e 2fbe0605a2
commit 0285770f59
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GeneralApp/forms.py
View File

@@ -13,7 +13,7 @@ class FeedbackForm(forms.Form):
name = forms.CharField(label=_('Имя'), required=True) name = forms.CharField(label=_('Имя'), required=True)
company = forms.CharField(label=_('Компания'), required=True) company = forms.CharField(label=_('Компания'), required=True)
contacts = forms.CharField(label=_('Контактные данные'), required=True) contacts = forms.CharField(label=_('Ваш email или телефон'), required=True)
description = forms.CharField(label=_('Тематика запроса'), required=True) description = forms.CharField(label=_('Тематика запроса'), required=True)
agreement = forms.BooleanField( agreement = forms.BooleanField(

3
ServicesApp/js_views.py
View File

@@ -15,8 +15,9 @@ from django.template.loader import render_to_string
from django.urls import reverse from django.urls import reverse
from .funcs import * from .funcs import *
from django.utils.translation import activate, get_language_info from django.utils.translation import activate, get_language_info
from django.views.decorators.csrf import csrf_exempt
@csrf_exempt
def get_content_for_section_ajax(request): def get_content_for_section_ajax(request):
if request.method != 'POST': if request.method != 'POST':

2
pAerBim/settings.py
View File

@@ -27,6 +27,8 @@ DEBUG = True
ALLOWED_HOSTS = ['*'] ALLOWED_HOSTS = ['*']
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
CSRF_TRUSTED_ORIGINS = ['https://aerbim.com']
# Application definition # Application definition

8
static/aerbimCSS.css
View File

@@ -450,8 +450,8 @@ body.n_scroll{
.photo_container_descript_process{ .photo_container_descript_process{
text-align: center; text-align: center;
width: 65px; width: 150px;
height: 65px; height: 150px;
} }
.txt_descript_process.standart_txt{ .txt_descript_process.standart_txt{
@@ -463,8 +463,8 @@ body.n_scroll{
/*text-transform: uppercase;*/ /*text-transform: uppercase;*/
} }
.img_descript_process{ .img_descript_process{
width: 65px; width: 150px;
height: 65px; height: 150px;
object-fit: contain; object-fit: contain;
object-position: bottom; object-position: bottom;
} }

1
static/aerbimJS.js
View File

@@ -43,6 +43,7 @@ function renderContent (el=null) {
} else { } else {
data['section_url'] = el.dataset['url'] data['section_url'] = el.dataset['url']
} }
data['csrfmiddlewaretoken'] = $('input[name=csrfmiddlewaretoken]').val();
let language = $('html').attr('lang'); let language = $('html').attr('lang');
data['lang'] = language data['lang'] = language
$.ajax({ $.ajax({

2
templates/tb_base.html
View File

@@ -20,7 +20,7 @@
</head> </head>
<body> <body>
{% csrf_token %} {% csrf_token %}
<div class="block_overlay hide"></div> <div class="block_overlay hide"></div>
{% include "blocks/b_header.html" %} {% include "blocks/b_header.html" %}
{% include "blocks/b_curtain.html" %} {% include "blocks/b_curtain.html" %}