From f1d67894dc87966c2128be953e080a7e520375fe Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Thu, 20 Sep 2018 12:05:46 +0200 Subject: [PATCH] Rename secondary_navigation to navigation_project --- src/templates/nodes/custom/blog/index.pug | 5 ++--- src/templates/nodes/search.pug | 6 ++---- src/templates/projects/edit_layout.pug | 4 ++-- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/templates/nodes/custom/blog/index.pug b/src/templates/nodes/custom/blog/index.pug index f8fa4543..d0efdb9b 100644 --- a/src/templates/nodes/custom/blog/index.pug +++ b/src/templates/nodes/custom/blog/index.pug @@ -1,7 +1,6 @@ | {% extends 'layout.html' %} | {% import 'nodes/custom/blog/_macros.html' as blogmacros %} -| {% from 'projects/_macros.html' import render_secondary_navigation %} -| {% from '_macros/_navigation.html' import navigation_homepage %} +| {% from '_macros/_navigation.html' import navigation_homepage, navigation_project %} | {% set title = 'blog' %} @@ -11,7 +10,7 @@ | {% if project.url == 'blender-cloud' %} | {{ navigation_homepage(title) }} | {% else %} -| {{ render_secondary_navigation(project, navigation_links, title) }} +| {{ navigation_project(project, navigation_links, title) }} | {% endif %} | {% endblock navigation_tabs %} diff --git a/src/templates/nodes/search.pug b/src/templates/nodes/search.pug index 1ee1dfc2..9f29bbf8 100644 --- a/src/templates/nodes/search.pug +++ b/src/templates/nodes/search.pug @@ -1,19 +1,17 @@ | {% extends 'layout.html' %} | {% from '_macros/_asset_list_item.html' import asset_list_item %} -| {% from 'projects/_macros.html' import render_secondary_navigation %} -| {% from '_macros/_navigation.html' import navigation_homepage %} +| {% from '_macros/_navigation.html' import navigation_homepage, navigation_project %} include ../mixins/components | {% if project %} | {% set title = 'search-project' %} -| {{ render_secondary_navigation(project, navigation_links, title) }} | {% else %} | {% set title = 'search' %} | {% endif %} | {% block navigation_tabs %} | {% if project %} -| {{ render_secondary_navigation(project, navigation_links, title) }} +| {{ navigation_project(project, navigation_links, title) }} | {% else %} | {{ navigation_homepage(title) }} | {% endif %} diff --git a/src/templates/projects/edit_layout.pug b/src/templates/projects/edit_layout.pug index d789cf85..ae76d9c4 100644 --- a/src/templates/projects/edit_layout.pug +++ b/src/templates/projects/edit_layout.pug @@ -1,12 +1,12 @@ | {% extends 'layout.html' %} -| {% from 'projects/_macros.html' import render_secondary_navigation %} +| {% from '_macros/_navigation.html' import navigation_project %} include ../mixins/components | {% block page_title %}Edit {{ project.name }}{% endblock %} | {% block navigation_tabs %} -| {{ render_secondary_navigation(project, navigation_links, title) }} +| {{ navigation_project(project, navigation_links, title) }} | {% endblock navigation_tabs %} | {% block body %}