diff --git a/content/context_processors.py b/content/context_processors.py index 07c1b32..6b55a07 100644 --- a/content/context_processors.py +++ b/content/context_processors.py @@ -5,7 +5,7 @@ def show_system_content(request): return { 'blog_categories': models.BlogCategory.objects.all(), - 'video_cast_categories': models.VideocastCategory.objects.all(), + 'videocast_categories': models.VideocastCategory.objects.all(), 'podcast_categories': models.PodcastCategory.objects.all(), 'podcasts': models.Podcast.objects.order_by('-pk').filter(publish=True)[:2], 'config': config diff --git a/content/urls.py b/content/urls.py index 5e4a97d..09e6d4e 100644 --- a/content/urls.py +++ b/content/urls.py @@ -10,11 +10,11 @@ path('create/blog_category/', views.BlogCategoryCreateView.as_view(), name='blog_category_create'), path('blog//', views.BlogArchiveByCategoryPK.as_view(), name='blog_archive_by_category_pk'), path('blog//', views.BlogSingle.as_view(), name='blog_single'), - path('create/video_cast_category/', views.VideocastCategoryCreateView.as_view(), name='video_cast_category_create'), - path('video_cast/', views.Videocast.as_view(), name='video_cast'), - path('create/video_cast/', views.VideocastCreateView.as_view(), name='video_cast_create'), - path('video_cast//', views.VideocastArchiveByCategoryPK.as_view(), name='video_cast_archive_by_category_pk'), - path('video_cast//', views.VideocastSingle.as_view(), name='video_cast_single'), + path('create/videocast_category/', views.VideocastCategoryCreateView.as_view(), name='videocast_category_create'), + path('videocast/', views.Videocast.as_view(), name='videocast'), + path('create/videocast/', views.VideocastCreateView.as_view(), name='videocast_create'), + path('videocast//', views.VideocastArchiveByCategoryPK.as_view(), name='videocast_archive_by_category_pk'), + path('videocast//', views.VideocastSingle.as_view(), name='videocast_single'), path('create/podcast_category/', views.PodcastCategoryCreateView.as_view(), name='podcast_category_create'), path('podcast/', views.Podcast.as_view(), name='podcast'), path('create/podcast/', views.PodcastCreateView.as_view(), name='podcast_create'), diff --git a/content/views.py b/content/views.py index 38b0273..a3e00bf 100644 --- a/content/views.py +++ b/content/views.py @@ -17,7 +17,7 @@ def get(self, request, *args, **kwargs): 'last_blog': models.Blog.objects.order_by('-pk').filter(publish=True)[:1], 'skills': models.Skill.objects.all(), 'blogs': models.Blog.objects.order_by('-pk').filter(publish=True)[1:5], - 'video_casts': models.Videocast.objects.order_by('-pk').filter(publish=True)[:4] + 'videocasts': models.Videocast.objects.order_by('-pk').filter(publish=True)[:4] } return render(request, self.template_name, context) @@ -91,12 +91,12 @@ class VideocastCategoryCreateView(LoginRequiredMixin, SuccessMessageMixin, gener success_message = 'Video cast category was created successfully' def get_success_url(self): - return reverse('content:video_cast_category_create') + return reverse('content:videocast_category_create') class Videocast(generic.ListView): model = models.Videocast - template_name = 'video_cast_archive.html' + template_name = 'videocast_archive.html' class VideocastCreateView(LoginRequiredMixin, SuccessMessageMixin, generic.CreateView): @@ -105,12 +105,12 @@ class VideocastCreateView(LoginRequiredMixin, SuccessMessageMixin, generic.Creat success_message = 'Video cast was created successfully' def get_success_url(self): - return reverse('content:video_cast_create') + return reverse('content:videocast_create') class VideocastArchiveByCategoryPK(generic.ListView): model = models.Videocast - template_name = 'video_cast_archive.html' + template_name = 'videocast_archive.html' def get_queryset(self): return self.model.objects.filter(category=self.kwargs['pk']) diff --git a/templates/base.html b/templates/base.html index d755f36..95445ff 100644 --- a/templates/base.html +++ b/templates/base.html @@ -94,12 +94,12 @@

Menu

{% endfor %} -
  • {% translate 'Video Cast' %}
    • +
  • {% translate 'Videocast' %}
  • - {% translate 'Video Cast Categories' %} + {% translate 'Videocast Categories' %}
    • @@ -122,7 +122,7 @@

    Menu

    {% translate 'Create New Objects' %} @@ -131,7 +131,7 @@

    Menu

    {% translate 'Create Category Object' %} diff --git a/templates/index.html b/templates/index.html index d20c5b6..49c3a6e 100644 --- a/templates/index.html +++ b/templates/index.html @@ -74,16 +74,16 @@

    {{ blog_post.title }}

    {% translate 'The latest Video Casts' %}

    - {% for video_cast in video_casts %} + {% for videocast in videocasts %} diff --git a/templates/search.html b/templates/search.html index c56bb29..d88d61c 100644 --- a/templates/search.html +++ b/templates/search.html @@ -18,7 +18,7 @@

    {{ blog.title }}

    {% for videocast in videocasts %}
    - +

    {{ videocast.title }}

    {{ videocast.content | safe | truncatewords_html:10 }}

    diff --git a/templates/video_cast_archive.html b/templates/videocast_archive.html similarity index 74% rename from templates/video_cast_archive.html rename to templates/videocast_archive.html index 86aafaf..76e8cb0 100644 --- a/templates/video_cast_archive.html +++ b/templates/videocast_archive.html @@ -6,20 +6,20 @@

    - {% translate 'Video Cast Archive' %} + {% translate 'Videocast Archive' %}

    {% for object in object_list %}