From f97e495e72fb094e2a741aa872317986dddf3f3b Mon Sep 17 00:00:00 2001 From: sonny Date: Thu, 21 May 2020 13:44:04 +0200 Subject: [PATCH] Refactor news:core template paths --- src/newsreader/news/collection/widgets.py | 6 ------ src/newsreader/news/core/forms.py | 2 +- .../templates/{core => news/core/views}/categories.html | 0 .../{core => news/core/views}/category-create.html | 0 .../{core => news/core/views}/category-update.html | 0 .../templates/{core => news/core/views}/homepage.html | 0 .../templates/news/core}/widgets/rule.html | 0 .../templates/news/core}/widgets/rules.html | 0 src/newsreader/news/core/views.py | 8 ++++---- src/newsreader/news/core/widgets.py | 6 ++++++ 10 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 src/newsreader/news/collection/widgets.py rename src/newsreader/news/core/templates/{core => news/core/views}/categories.html (100%) rename src/newsreader/news/core/templates/{core => news/core/views}/category-create.html (100%) rename src/newsreader/news/core/templates/{core => news/core/views}/category-update.html (100%) rename src/newsreader/news/core/templates/{core => news/core/views}/homepage.html (100%) rename src/newsreader/news/{collection/templates/collection => core/templates/news/core}/widgets/rule.html (100%) rename src/newsreader/news/{collection/templates/collection => core/templates/news/core}/widgets/rules.html (100%) create mode 100644 src/newsreader/news/core/widgets.py diff --git a/src/newsreader/news/collection/widgets.py b/src/newsreader/news/collection/widgets.py deleted file mode 100644 index ff65e1d..0000000 --- a/src/newsreader/news/collection/widgets.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.forms.widgets import CheckboxSelectMultiple - - -class RulesWidget(CheckboxSelectMultiple): - template_name = "collection/widgets/rules.html" - option_template_name = "collection/widgets/rule.html" diff --git a/src/newsreader/news/core/forms.py b/src/newsreader/news/core/forms.py index 97f7fd0..eca603a 100644 --- a/src/newsreader/news/core/forms.py +++ b/src/newsreader/news/core/forms.py @@ -1,8 +1,8 @@ from django import forms from newsreader.news.collection.models import CollectionRule -from newsreader.news.collection.widgets import RulesWidget from newsreader.news.core.models import Category +from newsreader.news.core.widgets import RulesWidget class CategoryForm(forms.ModelForm): diff --git a/src/newsreader/news/core/templates/core/categories.html b/src/newsreader/news/core/templates/news/core/views/categories.html similarity index 100% rename from src/newsreader/news/core/templates/core/categories.html rename to src/newsreader/news/core/templates/news/core/views/categories.html diff --git a/src/newsreader/news/core/templates/core/category-create.html b/src/newsreader/news/core/templates/news/core/views/category-create.html similarity index 100% rename from src/newsreader/news/core/templates/core/category-create.html rename to src/newsreader/news/core/templates/news/core/views/category-create.html diff --git a/src/newsreader/news/core/templates/core/category-update.html b/src/newsreader/news/core/templates/news/core/views/category-update.html similarity index 100% rename from src/newsreader/news/core/templates/core/category-update.html rename to src/newsreader/news/core/templates/news/core/views/category-update.html diff --git a/src/newsreader/news/core/templates/core/homepage.html b/src/newsreader/news/core/templates/news/core/views/homepage.html similarity index 100% rename from src/newsreader/news/core/templates/core/homepage.html rename to src/newsreader/news/core/templates/news/core/views/homepage.html diff --git a/src/newsreader/news/collection/templates/collection/widgets/rule.html b/src/newsreader/news/core/templates/news/core/widgets/rule.html similarity index 100% rename from src/newsreader/news/collection/templates/collection/widgets/rule.html rename to src/newsreader/news/core/templates/news/core/widgets/rule.html diff --git a/src/newsreader/news/collection/templates/collection/widgets/rules.html b/src/newsreader/news/core/templates/news/core/widgets/rules.html similarity index 100% rename from src/newsreader/news/collection/templates/collection/widgets/rules.html rename to src/newsreader/news/core/templates/news/core/widgets/rules.html diff --git a/src/newsreader/news/core/views.py b/src/newsreader/news/core/views.py index 2a75ea7..9ef81eb 100644 --- a/src/newsreader/news/core/views.py +++ b/src/newsreader/news/core/views.py @@ -9,7 +9,7 @@ from newsreader.news.core.models import Category class NewsView(TemplateView): - template_name = "core/homepage.html" + template_name = "news/core/views/homepage.html" # TODO serialize objects to show filled main page def get_context_data(self, **kwargs): @@ -55,14 +55,14 @@ class CategoryDetailMixin: class CategoryListView(CategoryViewMixin, ListView): - template_name = "core/categories.html" + template_name = "news/core/views/categories.html" context_object_name = "categories" class CategoryUpdateView(CategoryViewMixin, CategoryDetailMixin, UpdateView): - template_name = "core/category-update.html" + template_name = "news/core/views/category-update.html" context_object_name = "category" class CategoryCreateView(CategoryViewMixin, CategoryDetailMixin, CreateView): - template_name = "core/category-create.html" + template_name = "news/core/views/category-create.html" diff --git a/src/newsreader/news/core/widgets.py b/src/newsreader/news/core/widgets.py new file mode 100644 index 0000000..b0d63bf --- /dev/null +++ b/src/newsreader/news/core/widgets.py @@ -0,0 +1,6 @@ +from django.forms.widgets import CheckboxSelectMultiple + + +class RulesWidget(CheckboxSelectMultiple): + template_name = "news/core/widgets/rules.html" + option_template_name = "news/core/widgets/rule.html"