Use Navigation Tabs for homepage and index collections

This commit is contained in:
2018-09-06 13:03:22 +02:00
parent 982047fc3b
commit 92106459a0
3 changed files with 44 additions and 23 deletions

View File

@@ -18,6 +18,10 @@ meta(property="og:image", content="{% if main_project.picture_header %}{{ main_p
meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_project.picture_header.thumbnail('l', api=api) }}{% else %}{{ url_for('static', filename='assets/img/backgrounds/background_agent327_04.jpg')}}{% endif %}") meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_project.picture_header.thumbnail('l', api=api) }}{% else %}{{ url_for('static', filename='assets/img/backgrounds/background_agent327_04.jpg')}}{% endif %}")
| {% endblock %} | {% endblock %}
| {% block navigation_tabs %}
| {{ navigation_tabs(title) }}
| {% endblock navigation_tabs %}
| {% block body %} | {% block body %}
.dashboard-container .dashboard-container
section.dashboard-main section.dashboard-main

View File

@@ -76,7 +76,7 @@ html(lang="en")
href="{{ url_for('main.homepage') }}", href="{{ url_for('main.homepage') }}",
title="Blender Cloud") title="Blender Cloud")
span.app-logo span.app-logo
i.pi-blender-cloud-logo i.pi-blender-cloud
button.navbar-toggler.text-light( button.navbar-toggler.text-light(
data-target=".navbar-collapse", data-target=".navbar-collapse",
@@ -86,7 +86,11 @@ html(lang="en")
span.navbar-toggler-icon.d-flex.align-items-center span.navbar-toggler-icon.d-flex.align-items-center
i.pi-menu i.pi-menu
| {% block navigation_tabs %}
| {% endblock navigation_tabs %}
| {% block navigation_search %} | {% block navigation_search %}
// TODO (pablo) - bring it back asap
.search-input .search-input
input#cloud-search( input#cloud-search(
type="text", type="text",

View File

@@ -1,4 +1,5 @@
| {% extends 'layout.html' %} | {% extends 'layout.html' %}
include mixins/components include mixins/components
| {# Default case is Open Projects #} | {# Default case is Open Projects #}
@@ -39,12 +40,10 @@ meta(name="twitter:image", content="{{ page_header_image }}")
| {{ page_title }} | {{ page_title }}
| {% endblock %} | {% endblock %}
| {% block body %} | {% block navigation_tabs %}
+jumbotron("{{ page_title }}", "{{ page_header_text }}", "{{ page_header_image }}") | {% if title in ['courses', 'workshops'] %}
+nav-secondary
.container.pb-5
+nav-secondary("{% if title in ['courses', 'workshops'] %}Training{% else %}Open Projects{% endif %}")
+nav-secondary-link( +nav-secondary-link(
class="{% if title == 'workshops' %}active{% endif %}", class="{% if title == 'workshops' %}active{% endif %}",
href="{{ url_for('cloud.workshops') }}") href="{{ url_for('cloud.workshops') }}")
@@ -59,6 +58,20 @@ meta(name="twitter:image", content="{{ page_header_image }}")
class="{% if title == 'gallery' %}active{% endif %}", class="{% if title == 'gallery' %}active{% endif %}",
href="{{ url_for('projects.view', project_url='gallery') }}") href="{{ url_for('projects.view', project_url='gallery') }}")
| Art Gallery | Art Gallery
| {% endif %}
| {% endblock navigation_tabs %}
| {% block body %}
.container.pb-5
.pt-4
h2.text-uppercase.font-weight-bold
| {{ page_title }}
.lead
| {{ page_header_text }}
hr.pb-2
+card-deck(3) +card-deck(3)
| {% for project in projects %} | {% for project in projects %}
@@ -67,7 +80,7 @@ meta(name="twitter:image", content="{{ page_header_image }}")
+card(data-url="{{ url_for('projects.view', project_url=project.url) }}", tabindex='{{ loop.index }}') +card(data-url="{{ url_for('projects.view', project_url=project.url) }}", tabindex='{{ loop.index }}')
| {% if project.picture_header %} | {% if project.picture_header %}
a(href="{{ url_for('projects.view', project_url=project.url) }}") a(href="{{ url_for('projects.view', project_url=project.url) }}")
img.card-img-top.rounded-0( img.card-img-top(
src="{{ project.picture_header.thumbnail('l', api=api) }}", alt="{{ project.name }}") src="{{ project.picture_header.thumbnail('l', api=api) }}", alt="{{ project.name }}")
| {% endif %} | {% endif %}