From 92106459a0b91847cc2ebfaaa991ac0902507635 Mon Sep 17 00:00:00 2001
From: Pablo Vazquez <venomgfx@gmail.com>
Date: Thu, 6 Sep 2018 13:03:22 +0200
Subject: [PATCH] Use Navigation Tabs for homepage and index collections

---
 src/templates/homepage.pug                  |  4 ++
 src/templates/layout.pug                    | 16 ++++---
 src/templates/projects_index_collection.pug | 47 +++++++++++++--------
 3 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/src/templates/homepage.pug b/src/templates/homepage.pug
index 50691c7..f8cf9d5 100644
--- a/src/templates/homepage.pug
+++ b/src/templates/homepage.pug
@@ -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 %}")
 | {% endblock %}
 
+| {% block navigation_tabs %}
+| {{ navigation_tabs(title) }}
+| {% endblock navigation_tabs %}
+
 | {% block body %}
 .dashboard-container
 	section.dashboard-main
diff --git a/src/templates/layout.pug b/src/templates/layout.pug
index b03ccf8..d8cb17d 100644
--- a/src/templates/layout.pug
+++ b/src/templates/layout.pug
@@ -76,7 +76,7 @@ html(lang="en")
 				href="{{ url_for('main.homepage') }}",
 				title="Blender Cloud")
 				span.app-logo
-					i.pi-blender-cloud-logo
+					i.pi-blender-cloud
 
 			button.navbar-toggler.text-light(
 				data-target=".navbar-collapse",
@@ -86,12 +86,16 @@ html(lang="en")
 				span.navbar-toggler-icon.d-flex.align-items-center
 					i.pi-menu
 
+			| {% block navigation_tabs %}
+			| {% endblock navigation_tabs %}
+
 			| {% block navigation_search %}
-			.search-input
-				input#cloud-search(
-					type="text",
-					placeholder="Search assets, tutorials...")
-				i.search-icon.pi-search
+			// TODO (pablo) - bring it back asap
+				.search-input
+					input#cloud-search(
+						type="text",
+						placeholder="Search assets, tutorials...")
+					i.search-icon.pi-search
 			| {% endblock navigation_search %}
 
 			.collapse.navbar-collapse
diff --git a/src/templates/projects_index_collection.pug b/src/templates/projects_index_collection.pug
index 9df7eaa..c90acfd 100644
--- a/src/templates/projects_index_collection.pug
+++ b/src/templates/projects_index_collection.pug
@@ -1,4 +1,5 @@
 | {% extends 'layout.html' %}
+
 include mixins/components
 
 | {# Default case is Open Projects #}
@@ -39,26 +40,38 @@ meta(name="twitter:image", content="{{ page_header_image }}")
 | {{ page_title }}
 | {% endblock %}
 
+| {% block navigation_tabs %}
+
+| {% if title in ['courses', 'workshops'] %}
++nav-secondary
+	+nav-secondary-link(
+			class="{% if title == 'workshops' %}active{% endif %}",
+			href="{{ url_for('cloud.workshops') }}")
+		| Workshops
+
+	+nav-secondary-link(
+			class="{% if title == 'courses' %}active{% endif %}",
+			href="{{ url_for('cloud.courses') }}")
+		| Courses
+
+	+nav-secondary-link(
+			class="{% if title == 'gallery' %}active{% endif %}",
+			href="{{ url_for('projects.view', project_url='gallery') }}")
+		| Art Gallery
+| {% endif %}
+
+| {% endblock navigation_tabs %}
+
 | {% block body %}
 
-+jumbotron("{{ page_title }}", "{{ page_header_text }}", "{{ page_header_image }}")
-
 .container.pb-5
-	+nav-secondary("{% if title in ['courses', 'workshops'] %}Training{% else %}Open Projects{% endif %}")
-		+nav-secondary-link(
-				class="{% if title == 'workshops' %}active{% endif %}",
-				href="{{ url_for('cloud.workshops') }}")
-			| Workshops
+	.pt-4
+		h2.text-uppercase.font-weight-bold
+			| {{ page_title }}
+		.lead
+			| {{ page_header_text }}
 
-		+nav-secondary-link(
-				class="{% if title == 'courses' %}active{% endif %}",
-				href="{{ url_for('cloud.courses') }}")
-			| Courses
-
-		+nav-secondary-link(
-				class="{% if title == 'gallery' %}active{% endif %}",
-				href="{{ url_for('projects.view', project_url='gallery') }}")
-			| Art Gallery
+		hr.pb-2
 
 	+card-deck(3)
 		| {% 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 }}')
 			| {% if project.picture_header %}
 			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 }}")
 			| {% endif %}