moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' into feature/delete-user

Browse source
This commit is contained in:
PCoder 2019-05-05 13:52:06 +02:00
commit b629ad5105
4 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog
View file

@ -1,3 +1,7 @@
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 2.5.3: 2019-04-20
* #6561: [bills] Show mutiple line items in the invoice details (MR!697) * #6561: [bills] Show mutiple line items in the invoice details (MR!697)
* #6561: [bills] Link line item to a Stripe Plan (MR!697) * #6561: [bills] Link line item to a Stripe Plan (MR!697)

8
cms_templates/djangocms_blog/post_list.html
View file

@ -6,14 +6,6 @@
{% block content_blog %} {% block content_blog %}
<section class="blog-list"> <section class="blog-list">
{% block blog_title %} {% block blog_title %}
<header>
<h2>
{% if author %}{% trans "Articles by" %} {{ author.get_full_name }}
{% elif archive_date %}{% trans "Archive" %} &ndash; {% if month %}{{ archive_date|date:'F' }} {% endif %}{{ year }}
{% elif tagged_entries %}{% trans "Tag" %} &ndash; {{ tagged_entries|capfirst }}
{% elif category %}{% trans "Category" %} &ndash; {{ category }}{% endif %}
</h2>
</header>
{% endblock %} {% endblock %}
{% for post in post_list %} {% for post in post_list %}
{% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %} {% include "djangocms_blog/includes/blog_item.html" with post=post image="true" TRUNCWORDS_COUNT=TRUNCWORDS_COUNT %}

4
ungleich/templates/cms/ungleichch/_header_base.html
View file

@ -28,9 +28,9 @@
{% endif %} {% endif %}
<h1> {% page_attribute 'page_title' %} </h1> <h1>{% if request.GET.page_title %}{{request.GET.page_title}}{% else %}{% page_attribute 'page_title' %}{% endif %}</h1>
<hr class="small"> <hr class="small">
<span class="subheading"> {% page_attribute 'meta_description' %}</span> <span class="subheading">{% if request.GET.page_subtitle %}{{request.GET.page_subtitle}}{% else %}{% page_attribute 'meta_description' %}{% endif %}</span>
</div> </div>
</div> </div>
</div> </div>

2
ungleich/templates/cms/ungleichch/base_ungleich.html
View file

@ -9,7 +9,7 @@
<meta name="author" content="ungleich glarus ag"> <meta name="author" content="ungleich glarus ag">
<title> <title>
{% block title %} {% block title %}
{% page_attribute "page_title" %} {% if request.GET.page_title %}{{request.GET.page_title}}{% else %}{% page_attribute "page_title" %}{% endif %}
{% endblock %} {% endblock %}
</title> </title>
{% addtoblock "external-css" %} {% addtoblock "external-css" %}