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

0.4.17 slides for static pages

Browse Source
This commit is contained in:
SDE
2023-12-15 13:35:45 +03:00
parent 520f83fe3f
commit efd5093b50
3 changed files with 10 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
GeneralApp/admin.py
View File

@@ -23,7 +23,6 @@ admin.site.register(LogEntry, LogEntryAdmin)
class Admin_Inline_WidgetForBlock(SuperInlineModelAdmin, Admin_Trans_BaseIconStackedInline): class Admin_Inline_WidgetForBlock(SuperInlineModelAdmin, Admin_Trans_BaseIconStackedInline):
# class Admin_Inline_WidgetForBlock(Admin_Trans_BaseIconTabularInline, SuperInlineModelAdmin):
def formfield_for_dbfield(self, db_field, request, **kwargs): def formfield_for_dbfield(self, db_field, request, **kwargs):
field = super(Admin_Inline_WidgetForBlock, self).formfield_for_dbfield(db_field, request, **kwargs) field = super(Admin_Inline_WidgetForBlock, self).formfield_for_dbfield(db_field, request, **kwargs)
@@ -53,7 +52,6 @@ class Admin_Inline_WidgetForBlock(SuperInlineModelAdmin, Admin_Trans_BaseIconSta
class Admin_StackedInline_Block(Admin_Trans_GenericBaseIconStackedInline, SuperInlineModelAdmin): class Admin_StackedInline_Block(Admin_Trans_GenericBaseIconStackedInline, SuperInlineModelAdmin):
# class Admin_StackedInline_Block(Admin_Trans_GenericBaseIconStackedInline):
def formfield_for_dbfield(self, db_field, request, **kwargs): def formfield_for_dbfield(self, db_field, request, **kwargs):
field = super(Admin_StackedInline_Block, self).formfield_for_dbfield(db_field, request, **kwargs) field = super(Admin_StackedInline_Block, self).formfield_for_dbfield(db_field, request, **kwargs)
@@ -88,10 +86,9 @@ class Admin_StackedInline_Block(Admin_Trans_GenericBaseIconStackedInline, SuperI
# class Admin_StaticPage(NestedModelAdmin, Admin_Trans_BaseModelViewPage):
class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage): class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage):
from ServicesApp.admin import Admin_StackedInline_BlockPluginPresentation from ServicesApp.admin import Admin_StackedInline_BlockPluginPresentation
from SlidesApp.admin import Admin_StackedInline_Slide
fieldsets = [ fieldsets = [
(None, { (None, {
@@ -129,6 +126,7 @@ class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage):
# filter_horizontal = ['options'] # filter_horizontal = ['options']
inlines = [ inlines = [
Admin_StackedInline_Slide,
Admin_StackedInline_BlockPluginPresentation, Admin_StackedInline_BlockPluginPresentation,
Admin_StackedInline_Block, Admin_StackedInline_Block,
# AdminStacked_FAQitem, # AdminStacked_FAQitem,

19
GeneralApp/views.py
View File

@@ -29,13 +29,13 @@ def MainPage(request):
name_ru = _('Главная') name_ru = _('Главная')
) )
try: # try:
page = StaticPage.objects.get(url='contacts') # page = StaticPage.objects.get(url='contacts')
except StaticPage.DoesNotExist: # except StaticPage.DoesNotExist:
page = StaticPage.objects.create( # page = StaticPage.objects.create(
url='contacts', # url='contacts',
name_ru = _('Контакты') # name_ru = _('Контакты')
) # )
# from ArticlesApp.models import ArticleModel # from ArticlesApp.models import ArticleModel
# arts = ArticleModel.objects.filter(enable=True).order_by('-createDT')[:4] # arts = ArticleModel.objects.filter(enable=True).order_by('-createDT')[:4]
@@ -68,11 +68,6 @@ def StaticPageView(request, url):
elif url in ['main']: elif url in ['main']:
raise Http404 raise Http404
# if url in ['for_movers', 'for_customers']:
# subscribes, all_options = get_subsribes_w_options()
# Dict.update({
# 'subscribes': subscribes,
# })
try: try:
page = StaticPage.objects.get(url=url) page = StaticPage.objects.get(url=url)

1
templates/pages/p_main.html
View File

@@ -1,5 +1,6 @@
{% extends 'tb_base.html' %} {% extends 'tb_base.html' %}
{% block CONTENT %} {% block CONTENT %}
{# {% include 'blocks/b_slider.html' %}#}
{% include 'blocks/dynamic/b_sections_buttons.html' %} {% include 'blocks/dynamic/b_sections_buttons.html' %}