archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Projects Releases Wiki Activity

Blog: Fix showing wrong single post

Browse Source 
Also center comments and other minor tweaks
This commit is contained in:
Pablo Vazquez
2018-09-16 02:03:25 +02:00
parent 40f6ebd99c
commit 0f1088702d
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/templates/nodes/custom/blog/_macros.pug
View File

@@ -48,10 +48,7 @@ include ../../../../../../pillar/src/templates/mixins/components
hr.my-4 hr.my-4
.mx-auto #comments-embed.d-flex.justify-content-center.mx-auto
#comments-embed
.comments-list-loading
i.pi-spin
| {% endmacro %} | {% endmacro %}
//- ******************************************************* -// //- ******************************************************* -//
@@ -81,7 +78,7 @@ a.card.asset.card-image-fade.pr-0.mx-0.mb-4(
//- ******************************************************* -// //- ******************************************************* -//
| {% macro render_blog_index(project, posts, can_create_blog_posts, api, more_posts_available, posts_meta, pages=None) %} | {% macro render_blog_index(current_post, project, posts, can_create_blog_posts, api, more_posts_available, posts_meta, pages=None) %}
| {% if can_create_blog_posts %} | {% if can_create_blog_posts %}
+nav-secondary +nav-secondary
+nav-secondary-link(href="{{url_for('nodes.posts_create', project_id=project._id)}}") +nav-secondary-link(href="{{url_for('nodes.posts_create', project_id=project._id)}}")
@@ -91,18 +88,28 @@ a.card.asset.card-image-fade.pr-0.mx-0.mb-4(
| {% endif %} | {% endif %}
| {% if posts %} | {% if posts %}
| {{ render_blog_post(posts[0], project=project, pages=pages) }} | {{ render_blog_post(current_post, project=project, pages=pages) }}
.container .container
h5.text-muted.text-center.py-3 More from {{ project.name }} blog .pt-4.text-center
h5
| {% if more_posts_available %}
a.text-muted.py-3.d-block(href="{{ project.blog_archive_url }}")
| More from {{ project.name }} blog
| {% else %}
| More from {{ project.name }} blog
| {% endif %}
+card-deck(class="px-2 justify-content-center") +card-deck(class="px-2 justify-content-center")
| {% for node in posts[1:] %} | {% for node in posts %}
| {# Skip listing the current post #}
| {% if node._id != current_post._id %}
| {{ render_blog_list_item(node) }} | {{ render_blog_list_item(node) }}
| {% endif %}
| {% endfor %} | {% endfor %}
| {% if more_posts_available %} | {% if more_posts_available %}
.blog-archive-navigation a.d-block.pb-4(href="{{ project.blog_archive_url }}")
a(href="{{ project.blog_archive_url }}")
| {{posts_meta.total - posts|length}} more blog posts over here | {{posts_meta.total - posts|length}} more blog posts over here
i.pi-angle-right i.pi-angle-right
| {% endif %} | {% endif %}