From dfd39bf9208096e87786afac36337bb03a2ce7ba Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Fri, 3 Feb 2023 15:12:20 +0100 Subject: [PATCH] Remove OG views Moved to hosting project --- .../templates/froide_govplan/detail.html | 5 -- .../templates/froide_govplan/plan_og.html | 67 ------------------- .../templates/froide_govplan/section.html | 5 -- .../templates/froide_govplan/section_og.html | 18 ----- froide_govplan/urls.py | 12 ---- froide_govplan/views.py | 8 --- 6 files changed, 115 deletions(-) delete mode 100644 froide_govplan/templates/froide_govplan/plan_og.html delete mode 100644 froide_govplan/templates/froide_govplan/section_og.html diff --git a/froide_govplan/templates/froide_govplan/detail.html b/froide_govplan/templates/froide_govplan/detail.html index bf05208..3e98e22 100644 --- a/froide_govplan/templates/froide_govplan/detail.html +++ b/froide_govplan/templates/froide_govplan/detail.html @@ -5,7 +5,6 @@ {% load cms_tags %} {% load follow_tags %} {% load govplan %} -{% load fds_ogimage %} {% load form_helper %} {% load content_helper %} {% load thumbnail %} @@ -14,10 +13,6 @@ {% block meta %} {% include "snippets/meta.html" %} - - {% url 'govplan:plan_og' gov=object.government.slug plan=object.slug as plan_og_path %} - {% ogimage_url path=plan_og_path template="froide_govplan/plan_og.html" as og_image_url %} - {% include "fds_cms/social_meta.html" with object=object title=object.title description=object.description image_url=og_image_url %} {% endblock %} {% block govplan_breadcrumbs %} diff --git a/froide_govplan/templates/froide_govplan/plan_og.html b/froide_govplan/templates/froide_govplan/plan_og.html deleted file mode 100644 index 8fe8be9..0000000 --- a/froide_govplan/templates/froide_govplan/plan_og.html +++ /dev/null @@ -1,67 +0,0 @@ -{% extends "fds_ogimage/base.html" %} - -{% load humanize %} - -{% block title %}{{ object.title }}{% endblock %} - -{% block extra_style %} - -{% endblock %} - -{% block body %} -
-
- Koalitionstracker -
-
-
-

- {% block tagline %} - {{ object.title|truncatechars:100 }} - {% endblock %} -

-
-
-
- {% block bottom_row %} -
-
- - - {{ object.get_status_display }} - -
-
-
- {% if object.due_date %} -
-
- -
-
-

- {{ object.due_date | date }} -

-
-
- {% endif %} -
- {% endblock bottom_row %} -
- FragDenStaat.de -
-
-
-
-
-{% endblock %} diff --git a/froide_govplan/templates/froide_govplan/section.html b/froide_govplan/templates/froide_govplan/section.html index 5bd319f..3364e1e 100644 --- a/froide_govplan/templates/froide_govplan/section.html +++ b/froide_govplan/templates/froide_govplan/section.html @@ -5,16 +5,11 @@ {% load cms_tags %} {% load follow_tags %} {% load thumbnail %} -{% load fds_ogimage %} {% block title %}{{ object.title }}{% endblock %} {% block meta %} {% include "snippets/meta.html" %} - - {% url 'govplan:section_og' gov=object.government.slug section=object.slug as section_og_path %} - {% ogimage_url path=section_og_path template="froide_govplan/section_og.html" as og_image_url %} - {% include "fds_cms/social_meta.html" with object=object title=object.title description=object.description image_url=og_image_url %} {% endblock %} {% block govplan_breadcrumbs %} diff --git a/froide_govplan/templates/froide_govplan/section_og.html b/froide_govplan/templates/froide_govplan/section_og.html deleted file mode 100644 index a47a43d..0000000 --- a/froide_govplan/templates/froide_govplan/section_og.html +++ /dev/null @@ -1,18 +0,0 @@ -{% extends "froide_govplan/plan_og.html" %} - -{% load govplan %} - -{% block tagline %}Themenbereich {{ object.title }}{% endblock %} - -{% block bottom_row %} - {% get_plan_progress plans as progress %} -
-
- {% for section in progress.sections %} -
-
- {% endfor %} -
-
-
-{% endblock %} diff --git a/froide_govplan/urls.py b/froide_govplan/urls.py index b25a56f..6e01e95 100644 --- a/froide_govplan/urls.py +++ b/froide_govplan/urls.py @@ -2,10 +2,8 @@ from django.urls import path from django.utils.translation import pgettext_lazy from .views import ( - GovPlanDetailOGView, GovPlanDetailView, GovPlanProposeUpdateView, - GovPlanSectionDetailOGView, GovPlanSectionDetailView, search, ) @@ -19,11 +17,6 @@ urlpatterns = [ GovPlanDetailView.as_view(), name="plan", ), - path( - pgettext_lazy("url part", "/plan//_og/"), - GovPlanDetailOGView.as_view(), - name="plan_og", - ), path( pgettext_lazy("url part", "/plan//propose-update/"), GovPlanProposeUpdateView.as_view(), @@ -34,9 +27,4 @@ urlpatterns = [ GovPlanSectionDetailView.as_view(), name="section", ), - path( - pgettext_lazy("url part", "//_og/"), - GovPlanSectionDetailOGView.as_view(), - name="section_og", - ), ] diff --git a/froide_govplan/views.py b/froide_govplan/views.py index cde841f..dd6772b 100644 --- a/froide_govplan/views.py +++ b/froide_govplan/views.py @@ -39,10 +39,6 @@ class GovPlanSectionDetailView(GovernmentMixin, DetailView): return context -class GovPlanSectionDetailOGView(GovPlanSectionDetailView): - template_name = "froide_govplan/section_og.html" - - class GovPlanDetailView(GovernmentMixin, DetailView): slug_url_kwarg = "plan" template_name = "froide_govplan/detail.html" @@ -68,10 +64,6 @@ class GovPlanDetailView(GovernmentMixin, DetailView): return context -class GovPlanDetailOGView(GovPlanDetailView): - template_name = "froide_govplan/plan_og.html" - - class GovPlanProposeUpdateView(GovernmentMixin, LoginRequiredMixin, UpdateView): slug_url_kwarg = "plan" form_class = GovernmentPlanUpdateProposalForm