From 3afa969206914ad9bc4a6b1a73d03adab09608a5 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 4 May 2019 09:40:09 +0200 Subject: [PATCH 1/6] Set the title and header via GET params --- ungleich/templates/cms/ungleichch/_header_base.html | 4 ++-- ungleich/templates/cms/ungleichch/base_ungleich.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ungleich/templates/cms/ungleichch/_header_base.html b/ungleich/templates/cms/ungleichch/_header_base.html index d32f72e6..3a27a503 100644 --- a/ungleich/templates/cms/ungleichch/_header_base.html +++ b/ungleich/templates/cms/ungleichch/_header_base.html @@ -28,9 +28,9 @@ {% endif %} -

{% page_attribute 'page_title' %}

+

{% if request.GET.page_title %}{{request.GET.page_title}}{% else %}{% page_attribute 'page_title' %}{% endif %}

- {% page_attribute 'meta_description' %} + {% if request.GET.page_subtitle %}{{request.GET.page_subtitle}}{% else %}{% page_attribute 'meta_description' %}{% endif %} diff --git a/ungleich/templates/cms/ungleichch/base_ungleich.html b/ungleich/templates/cms/ungleichch/base_ungleich.html index 25fdbdc6..513b8d1e 100644 --- a/ungleich/templates/cms/ungleichch/base_ungleich.html +++ b/ungleich/templates/cms/ungleichch/base_ungleich.html @@ -9,7 +9,7 @@ {% block title %} - {% page_attribute "page_title" %} + {% if request.GET.page_title %}{{request.GET.page_title}}{% else %}{% page_attribute "page_title" %}{% endif %} {% endblock %} {% addtoblock "external-css" %} From 532b7dee9e14e162ab7075eb35f0fc085857f4e5 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 4 May 2019 12:49:06 +0200 Subject: [PATCH 2/6] Update Changelog for 2.5.4 --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index 8642c09a..f1360d68 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2.5.4: 2019-05-04 + * #6124: [blog] Allow setting title, subtitle of the blog page by passing GET params (MR!698) 2.5.3: 2019-04-20 * #6561: [bills] Show mutiple line items in the invoice details (MR!697) * #6561: [bills] Link line item to a Stripe Plan (MR!697) From 167ce9e4c124555cc7281f909c1b371006107a68 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 4 May 2019 13:20:13 +0200 Subject: [PATCH 3/6] Use the modified djangocms_blog module to remove Category - blah ... --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fe70299b..3283e566 100644 --- a/requirements.txt +++ b/requirements.txt @@ -50,7 +50,7 @@ django-templatetag-sugar==1.0 django-treebeard==4.0.1 djangocms-admin-style==1.1.1 djangocms-apphook-setup==0.1.2 -djangocms-blog==0.9.0 +git+https://code.ungleich.ch/ungleich-public/djangocms_blog.git#egg=djangocms_blog djangocms-file==1.0 djangocms-flash==0.3.0 djangocms-googlemap==0.4.0 From 87ef84e98196af0f7730a020b29b85a023befbd7 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 4 May 2019 14:13:11 +0200 Subject: [PATCH 4/6] Update Changelog for 2.5.5 --- Changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Changelog b/Changelog index f1360d68..819299e3 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,5 @@ +2.5.5: 2019-05-04 + * [blog] Use modified djangocms_blog module to not show "Category - ... " (MR!699) 2.5.4: 2019-05-04 * #6124: [blog] Allow setting title, subtitle of the blog page by passing GET params (MR!698) 2.5.3: 2019-04-20 From 498418c669f7df92750c85d5e91df62f27af7800 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sat, 4 May 2019 14:35:52 +0200 Subject: [PATCH 5/6] Remove header block that causes the blog title to appear --- cms_templates/djangocms_blog/post_list.html | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cms_templates/djangocms_blog/post_list.html b/cms_templates/djangocms_blog/post_list.html index eb1ce71b..90712e16 100644 --- a/cms_templates/djangocms_blog/post_list.html +++ b/cms_templates/djangocms_blog/post_list.html @@ -6,14 +6,6 @@ {% block content_blog %}
{% block blog_title %} -
-

- {% if author %}{% trans "Articles by" %} {{ author.get_full_name }} - {% elif archive_date %}{% trans "Archive" %} – {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }} - {% elif tagged_entries %}{% trans "Tag" %} – {{ tagged_entries|capfirst }} - {% elif category %}{% trans "Category" %} – {{ category }}{% endif %} -

-
{% endblock %} {% for post in post_list %} {% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} From 829261af88e6c0ac67a653fd3fbabb0ef47d5fe9 Mon Sep 17 00:00:00 2001 From: PCoder Date: Sun, 5 May 2019 13:42:09 +0200 Subject: [PATCH 6/6] Revert back djangocms-blog version to 0.9.0 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3283e566..fe70299b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -50,7 +50,7 @@ django-templatetag-sugar==1.0 django-treebeard==4.0.1 djangocms-admin-style==1.1.1 djangocms-apphook-setup==0.1.2 -git+https://code.ungleich.ch/ungleich-public/djangocms_blog.git#egg=djangocms_blog +djangocms-blog==0.9.0 djangocms-file==1.0 djangocms-flash==0.3.0 djangocms-googlemap==0.4.0