diff --git a/GeneralApp/admin.py b/GeneralApp/admin.py index 1c55523..0ba1027 100644 --- a/GeneralApp/admin.py +++ b/GeneralApp/admin.py @@ -23,7 +23,6 @@ admin.site.register(LogEntry, LogEntryAdmin) 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): 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): def formfield_for_dbfield(self, 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): from ServicesApp.admin import Admin_StackedInline_BlockPluginPresentation - + from SlidesApp.admin import Admin_StackedInline_Slide fieldsets = [ (None, { @@ -129,6 +126,7 @@ class Admin_StaticPage(SuperModelAdmin, Admin_Trans_BaseModelViewPage): # filter_horizontal = ['options'] inlines = [ + Admin_StackedInline_Slide, Admin_StackedInline_BlockPluginPresentation, Admin_StackedInline_Block, # AdminStacked_FAQitem, diff --git a/GeneralApp/views.py b/GeneralApp/views.py index 21ac062..5772de8 100644 --- a/GeneralApp/views.py +++ b/GeneralApp/views.py @@ -29,13 +29,13 @@ def MainPage(request): name_ru = _('Главная') ) - try: - page = StaticPage.objects.get(url='contacts') - except StaticPage.DoesNotExist: - page = StaticPage.objects.create( - url='contacts', - name_ru = _('Контакты') - ) + # try: + # page = StaticPage.objects.get(url='contacts') + # except StaticPage.DoesNotExist: + # page = StaticPage.objects.create( + # url='contacts', + # name_ru = _('Контакты') + # ) # from ArticlesApp.models import ArticleModel # arts = ArticleModel.objects.filter(enable=True).order_by('-createDT')[:4] @@ -68,11 +68,6 @@ def StaticPageView(request, url): elif url in ['main']: raise Http404 - # if url in ['for_movers', 'for_customers']: - # subscribes, all_options = get_subsribes_w_options() - # Dict.update({ - # 'subscribes': subscribes, - # }) try: page = StaticPage.objects.get(url=url) diff --git a/templates/pages/p_main.html b/templates/pages/p_main.html index 345b076..c3ce6d4 100644 --- a/templates/pages/p_main.html +++ b/templates/pages/p_main.html @@ -1,5 +1,6 @@ {% extends 'tb_base.html' %} {% block CONTENT %} +{# {% include 'blocks/b_slider.html' %}#} {% include 'blocks/dynamic/b_sections_buttons.html' %}