archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Rename secondary_navigation to navigation_project

Browse Source
This commit is contained in:
Pablo Vazquez 2018-09-20 12:05:46 +02:00
parent aef2cf8c2d
commit f1d67894dc
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/templates/nodes/custom/blog/index.pug
View File

@ -1,7 +1,6 @@
| {% extends 'layout.html' %} | {% extends 'layout.html' %}
| {% import 'nodes/custom/blog/_macros.html' as blogmacros %} | {% import 'nodes/custom/blog/_macros.html' as blogmacros %}
| {% from 'projects/_macros.html' import render_secondary_navigation %} | {% from '_macros/_navigation.html' import navigation_homepage, navigation_project %}
| {% from '_macros/_navigation.html' import navigation_homepage %}
| {% set title = 'blog' %} | {% set title = 'blog' %}
@ -11,7 +10,7 @@
| {% if project.url == 'blender-cloud' %} | {% if project.url == 'blender-cloud' %}
| {{ navigation_homepage(title) }} | {{ navigation_homepage(title) }}
| {% else %} | {% else %}
| {{ render_secondary_navigation(project, navigation_links, title) }} | {{ navigation_project(project, navigation_links, title) }}
| {% endif %} | {% endif %}
| {% endblock navigation_tabs %} | {% endblock navigation_tabs %}

6
src/templates/nodes/search.pug
View File

@ -1,19 +1,17 @@
| {% extends 'layout.html' %} | {% extends 'layout.html' %}
| {% from '_macros/_asset_list_item.html' import asset_list_item %} | {% 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, navigation_project %}
| {% from '_macros/_navigation.html' import navigation_homepage %}
include ../mixins/components include ../mixins/components
| {% if project %} | {% if project %}
| {% set title = 'search-project' %} | {% set title = 'search-project' %}
| {{ render_secondary_navigation(project, navigation_links, title) }}
| {% else %} | {% else %}
| {% set title = 'search' %} | {% set title = 'search' %}
| {% endif %} | {% endif %}
| {% block navigation_tabs %} | {% block navigation_tabs %}
| {% if project %} | {% if project %}
| {{ render_secondary_navigation(project, navigation_links, title) }} | {{ navigation_project(project, navigation_links, title) }}
| {% else %} | {% else %}
| {{ navigation_homepage(title) }} | {{ navigation_homepage(title) }}
| {% endif %} | {% endif %}

4
src/templates/projects/edit_layout.pug
View File

@ -1,12 +1,12 @@
| {% extends 'layout.html' %} | {% extends 'layout.html' %}
| {% from 'projects/_macros.html' import render_secondary_navigation %} | {% from '_macros/_navigation.html' import navigation_project %}
include ../mixins/components include ../mixins/components
| {% block page_title %}Edit {{ project.name }}{% endblock %} | {% block page_title %}Edit {{ project.name }}{% endblock %}
| {% block navigation_tabs %} | {% block navigation_tabs %}
| {{ render_secondary_navigation(project, navigation_links, title) }} | {{ navigation_project(project, navigation_links, title) }}
| {% endblock navigation_tabs %} | {% endblock navigation_tabs %}
| {% block body %} | {% block body %}