diff --git a/AuthApp/admin.py b/AuthApp/admin.py index b4a262d..516022c 100644 --- a/AuthApp/admin.py +++ b/AuthApp/admin.py @@ -39,7 +39,7 @@ class Admin_ProfileInline(admin.StackedInline): (None, { 'classes': ['wide'], 'fields': ( - ('account_type',), + # ('account_type',), ('enable',), ('phone',), ('country', 'city'), @@ -107,45 +107,45 @@ admin.site.unregister(User) admin.site.register(User, Admin_User) -class Admin_UserProfile(Admin_BaseIconModel): - - fieldsets = ( - (None, { - 'classes': ['wide'], - 'fields': ( - 'user', 'enable', - ('account_type',), - ('phone',), - ('country', 'city'), - ('authMailCode',), - ('birthdate'), - 'creator' - ) - }), - ('1С', { - 'classes': ['wide'], - 'fields': ( - ('name',), - ) - }), - ) - - save_on_top = True - - list_display = [ - 'id', 'user', 'enable', 'birthdate', 'modifiedDT', 'createDT' - ] - list_editable = ['enable', 'birthdate'] - list_display_links = ['id', ] # 'user__last_name', 'user__first_name'] - search_fields = [ - 'id', 'user__last_name', 'user__first_name', 'user__email', - ] - - list_filter = ['enable', 'account_type'] - - # filter_horizontal = ['connected_mailings'] - # raw_id_fields = ("favourites",) - verbose_name_plural = _(u'Профиль пользователя') - - -admin.site.register(UserProfile, Admin_UserProfile) +# class Admin_UserProfile(Admin_BaseIconModel): +# +# fieldsets = ( +# (None, { +# 'classes': ['wide'], +# 'fields': ( +# 'user', 'enable', +# ('account_type',), +# ('phone',), +# ('country', 'city'), +# ('authMailCode',), +# ('birthdate'), +# 'creator' +# ) +# }), +# ('1С', { +# 'classes': ['wide'], +# 'fields': ( +# ('name',), +# ) +# }), +# ) +# +# save_on_top = True +# +# list_display = [ +# 'id', 'user', 'enable', 'birthdate', 'modifiedDT', 'createDT' +# ] +# list_editable = ['enable', 'birthdate'] +# list_display_links = ['id', ] # 'user__last_name', 'user__first_name'] +# search_fields = [ +# 'id', 'user__last_name', 'user__first_name', 'user__email', +# ] +# +# list_filter = ['enable', 'account_type'] +# +# # filter_horizontal = ['connected_mailings'] +# # raw_id_fields = ("favourites",) +# verbose_name_plural = _(u'Профиль пользователя') +# +# +# admin.site.register(UserProfile, Admin_UserProfile) diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index fba6770..1f899e7 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -52,33 +52,33 @@ class Admin_StaticPage(Admin_Trans_BaseModelViewPage): admin.site.register(StaticPage,Admin_StaticPage) -class Admin_Block(Admin_Trans_BaseModel): - pass - - # def get_fieldsets(self, request, obj=None): - # fieldsets = super(type(self), self).get_fieldsets(request, obj) - # if not request.user.is_superuser and obj.name and obj.name in ('About US', 'machines', 'works'): - # fieldsets[0][1]['fields'].pop(0) - # fieldsets.insert( - # 1, (_('Контент'), { - # 'classes': ['wide'], - # 'fields': ( - # 'title', 'description', 'text', - # 'picture', - # ) - # - # }) - # ) - # return fieldsets - # - # def has_delete_permission(self, request, obj=None): - # if request.user.is_superuser: - # return True - # - # if obj.name in ('About US', 'machines', 'works'): - # return False - -admin.site.register(Block,Admin_Block) +# class Admin_Block(Admin_Trans_BaseModel): +# pass +# +# # def get_fieldsets(self, request, obj=None): +# # fieldsets = super(type(self), self).get_fieldsets(request, obj) +# # if not request.user.is_superuser and obj.name and obj.name in ('About US', 'machines', 'works'): +# # fieldsets[0][1]['fields'].pop(0) +# # fieldsets.insert( +# # 1, (_('Контент'), { +# # 'classes': ['wide'], +# # 'fields': ( +# # 'title', 'description', 'text', +# # 'picture', +# # ) +# # +# # }) +# # ) +# # return fieldsets +# # +# # def has_delete_permission(self, request, obj=None): +# # if request.user.is_superuser: +# # return True +# # +# # if obj.name in ('About US', 'machines', 'works'): +# # return False +# +# admin.site.register(Block,Admin_Block) class Admin_Option(Admin_Trans_BaseModel): diff --git a/GeneralApp/init_options.py b/GeneralApp/init_options.py index bc8ce1f..84edb2e 100644 --- a/GeneralApp/init_options.py +++ b/GeneralApp/init_options.py @@ -3,47 +3,47 @@ from django.utils.translation import gettext as _ required_options_Dict = { - 'Адрес почтового сервера': { + 'mail_server_url': { 'name_ru': 'Адрес почтового сервера', 'opt_type': 'mail_server_url', 'value': '213.142.147.40', }, - 'SMTP порт почтового сервера': { + 'mail_server_smtp_port': { 'name_ru': 'SMTP порт почтового сервера', 'opt_type': 'mail_server_smtp_port', 'value': 587, }, - 'login для отправки писем с сайта': { + 'sender_mail_login': { 'name_ru': 'email для отправки писем с сайта', 'opt_type': 'sender_mail_login', 'value': 'admin@tripwb.com', }, - 'email для отправки': { + 'sender_email': { 'name_ru': 'email для отправки', 'opt_type': 'sender_email', 'value': 'admin@tripwb.com', }, - 'Пароль для отправки писем с сайта': { + 'sender_mail_password': { 'name_ru': 'пароль для отправки писем с сайта', 'opt_type': 'sender_mail_password', 'value': 't5Fdcah^gdajY', }, - 'Название проекта': { + 'project_name': { 'name_ru': 'Название проекта', 'opt_type': 'project_name', 'value': 'TWB', }, - 'Адрес сайта': { + 'domain': { 'name_ru': 'Адрес сайта', 'opt_type': 'domain', 'value': 'tripwb.com', }, - 'email техподдержки': { + 'support_email': { 'name_ru': 'email техподдержки', 'opt_type': 'support_email', 'value': 'admin@tripwb.com', }, - 'корпоративный email': { + 'corp_email': { 'name_ru': 'корпоративный email', 'opt_type': 'corp_email', 'value': 'admin@tripwb.com', @@ -53,11 +53,11 @@ required_options_Dict = { def init_options(): options = Option.objects.all() - option_names = options.values_list('name', flat=True) + option_types_list = options.values_list('opt_type', flat=True) opts_for_create = [] - for name, data_Dict in required_options_Dict.items(): - if not name in option_names: + for opt_type, data_Dict in required_options_Dict.items(): + if not opt_type in option_types_list: opt = Option(**data_Dict) opts_for_create.append(opt) diff --git a/static/css/styles.css b/static/css/styles.css index 7346f55..45474cb 100644 --- a/static/css/styles.css +++ b/static/css/styles.css @@ -1989,7 +1989,11 @@ button.cancel_remove.show, button.confirm_remove.show{ font-style: normal; font-weight: 700; line-height: 52px; - margin-bottom: 40px; + +} + +.ta_center{ + margin: 120px auto 40px; } #title_static_customer{ text-align: center; diff --git a/static/js/user_profile.js b/static/js/user_profile.js index ae9b4f2..48358e5 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -951,13 +951,13 @@ function hideErrors(el) { let error_footer = document.getElementById('error_footer') - if(error_feeedback === counter_text ){ + if(error_feeedback === counter_text && error_feeedback !== null && error_feeedback_text !== null ){ error_feeedback_text.classList.add('hide') - } else if(error_feeedback === footer_button ){ + } else if(error_feeedback === footer_button && error_footer !== null ){ error_footer.classList.add('hide') } - else { + else if(error_feeedback !== null) { error_feeedback.classList.add('hide') } diff --git a/templates/forms/f_commercial_offer.html b/templates/forms/f_commercial_offer.html index 1c97a0a..316f0db 100644 --- a/templates/forms/f_commercial_offer.html +++ b/templates/forms/f_commercial_offer.html @@ -15,7 +15,7 @@ type="text" onkeydown = "hideErrors(this)" placeholder="{% translate 'Имя' %}" - {% if form.data.name %} value="{{ form.data.name }}"{% endif %}> + {% if form.name %} value="{{ form.name }}"{% endif %}> {% if form.errors.name %} {{ form.errors.name }} {% endif %} @@ -25,7 +25,7 @@ + placeholder="{% translate 'Телефон' %}"{% if form.phone %} value="{{ form.phone }}"{% endif %}> {% if form.errors.phone %} {{ form.errors.phone }} {% endif %} diff --git a/templates/forms/f_one_field_form.html b/templates/forms/f_one_field_form.html index b0d82dd..c8c0af6 100644 --- a/templates/forms/f_one_field_form.html +++ b/templates/forms/f_one_field_form.html @@ -2,7 +2,7 @@ {% load i18n %}
{% translate "в 3 раза" %}
{% translate "быстрее других сервисов" %}
{% translate "Почтовые сервисы доставляет посылки в среднем за 10 дней. С нами - быстрее!" %}
-
+{#
#} {#
#} @@ -233,7 +233,7 @@
-

{% translate "Последние новости" %}

+

{% translate "Последние новости" %}

{# {% for art in articles %}#} {##} {#
#}