From fa050da8e235201617e180b758c38e933bb8c8e7 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Mon, 5 Sep 2016 15:59:22 +0200 Subject: [PATCH] Display Blog on the sidebar, if available --- pillar/web/utils/jstree.py | 5 +++-- src/templates/projects/view.jade | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/pillar/web/utils/jstree.py b/pillar/web/utils/jstree.py index 28d85963..be8828da 100644 --- a/pillar/web/utils/jstree.py +++ b/pillar/web/utils/jstree.py @@ -49,8 +49,9 @@ def jstree_get_children(node_id, project_id=None): if child.node_type not in ['comment', 'post']: if child.properties.status == 'published': children_list.append(jstree_parse_node(child)) - elif child.node_type == 'blog': - children_list.append(jstree_parse_node(child)) + # TODO: Remove this code (blog now accessible from sidebar) + # elif child.node_type == 'blog': + # children_list.append(jstree_parse_node(child)) elif current_user.is_authenticated and child.user == current_user.objectid: children_list.append(jstree_parse_node(child)) except ForbiddenAccess: diff --git a/src/templates/projects/view.jade b/src/templates/projects/view.jade index e070b019..ebfaf906 100644 --- a/src/templates/projects/view.jade +++ b/src/templates/projects/view.jade @@ -58,6 +58,14 @@ link(href="{{ url_for('static_pillar', filename='assets/css/project-main.css', v | {% else %} i.pi-home | {% endif %} + | {% if project.nodes_blog %} + li.tabs-blog( + title="Blog", + data-toggle="tooltip", + data-placement="left") + a(href="{{url_for('main.project_blog', project_url=project.url)}}") + i.pi-newspaper + | {% endif %} li.tabs-browse( title="Browse", data-toggle="tooltip",