diff --git a/src/templates/_macros/_navigation.pug b/src/templates/_macros/_navigation.pug index d4aa12f..98dc2b0 100644 --- a/src/templates/_macros/_navigation.pug +++ b/src/templates/_macros/_navigation.pug @@ -3,8 +3,14 @@ include ../../../../pillar/src/templates/mixins/components | {% macro navigation_homepage(title) %} +nav-secondary() +nav-secondary-link( - href="{{ url_for('cloud.open_projects') }}") - span Films + href="{{ url_for('main.main_blog') }}", + class="{% if title == 'blog' %}active{% endif %}") + span Blog + + +nav-secondary-link( + href="{{ url_for('cloud.open_projects') }}", + class="{% if title == 'open-projects' %}active{% endif %}") + span Open Projects +nav-secondary-link( href="{{ url_for('cloud.courses') }}") @@ -31,6 +37,13 @@ include ../../../../pillar/src/templates/mixins/components | {% macro navigation_collection(title) %} +nav-secondary | {% if title in ['courses', 'workshops', 'production'] %} + li + .nav-link.pointer-events-none.px-0 + span Learn + + li.px-1 + i.pi-angle-right + +nav-secondary-link( class="{% if title == 'courses' %}active{% endif %}", href="{{ url_for('cloud.courses') }}") @@ -82,3 +95,23 @@ include ../../../../pillar/src/templates/mixins/components i.pi-blender.pr-2 span Blender Sync | {% endmacro %} + +| {% macro navigation_services(title) %} ++nav-secondary() + li + a.nav-link.active.px-0(href="{{ url_for('cloud.services') }}") + span Services + + li.px-1 + i.pi-angle-right + + +nav-secondary-link( + href="/attract") + i.pi-attract.pr-2 + span Attract + + +nav-secondary-link( + href="/flamenco") + i.pi-flamenco.pr-2 + span Flamenco +| {% endmacro %} diff --git a/src/templates/projects_index_collection.pug b/src/templates/projects_index_collection.pug index d475278..37664d8 100644 --- a/src/templates/projects_index_collection.pug +++ b/src/templates/projects_index_collection.pug @@ -1,5 +1,5 @@ | {% extends 'layout.html' %} -| {% from '_macros/_navigation.html' import navigation_collection %} +| {% from '_macros/_navigation.html' import navigation_collection, navigation_homepage %} include ../../../pillar/src/templates/mixins/components @@ -42,7 +42,11 @@ meta(name="twitter:image", content="{{ page_header_image }}") | {% endblock %} | {% block navigation_tabs %} +| {% if title == 'open-projects' %} +| {{ navigation_homepage(title) }} +| {% else %} | {{ navigation_collection(title) }} +| {% endif %} | {% endblock navigation_tabs %} | {% block body %} @@ -51,17 +55,19 @@ meta(name="twitter:image", content="{{ page_header_image }}") | {# Specify the URL of projects in production. These are hidden from the listing below. #} | {% set projects_in_production = ['spring'] %} - var jumbotron_title = 'SPRING'; -- var jumbotron_lead = 'A poetic short film about a mountain spirit and her wise little dog. Check it out.'; +- var jumbotron_lead = 'A poetic short film about a mountain spirit and her wise little dog.'; +jumbotron( jumbotron_title, jumbotron_lead, "{{ url_for('static', filename='assets/img/backgrounds/background_spring_01.jpg')}}")( class="jumbotron-overlay") - .d-block - a.btn.btn-primary.mt-4.px-4( - href="{{ url_for('projects.view', project_url='spring') }}") Browse the Project - a.btn.btn-link-light.mt-4( + .d-block.mt-4 + a.btn.btn-primary.px-5( + href="{{ url_for('projects.view', project_url='spring') }}") + | Browse the Project + + a.btn.btn-link-light.px-4( style="color: white", href="{{ url_for('main.project_blog', project_url='spring') }}") | Read the Blog diff --git a/src/templates/services.pug b/src/templates/services.pug index f0f10f9..26abe75 100644 --- a/src/templates/services.pug +++ b/src/templates/services.pug @@ -1,5 +1,5 @@ | {% extends 'layout.html' %} -| {% from '_macros/_navigation.html' import navigation_homepage %} +| {% from '_macros/_navigation.html' import navigation_services %} | {% block page_title %}Services{% endblock %} | {% set title = 'services' %} @@ -18,7 +18,7 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba | {% endblock %} | {% block navigation_tabs %} -| {{ navigation_homepage(title) }} +| {{ navigation_services(title) }} | {% endblock navigation_tabs %} | {% block page_overlay %}