Dropdowns tweaks based on feedback

src/templates/_macros/_navigation.pug

@@ -1,23 +1,55 @@
 include ../../../../pillar/src/templates/mixins/components
 
-| {% macro navigation_tabs(title) %}
+| {% macro navigation_homepage(title) %}
 +nav-secondary()
-	+nav-secondary-link(href="{{ url_for('main.main_blog') }}")
+	+nav-secondary-link(
-		span Blog
+		href="{{ url_for('cloud.open_projects') }}")
+		span Films
 
 	+nav-secondary-link(
-			class="{% if title == 'dashboard' %}active{% endif %}",
+		href="{{ url_for('cloud.courses') }}")
-			href="{{ url_for('projects.index') }}")
+		span Courses
-		span My Projects
 
-	| {% if current_user.has_organizations() %}
 	+nav-secondary-link(
-			class="{% if title == 'organizations' %}active{% endif %}",
+		href="{{ url_for('cloud.workshops') }}")
-			href="{{ url_for('pillar.web.organizations.index') }}")
+		span Workshops
-		span My Organizations
-	| {% endif %}
 
-	+nav-secondary-link(href="{{ url_for('projects.home_project_shared_images')}}",
+	+nav-secondary-link(
-		class="{% if title == 'images' %}active{% endif %}")
+		href="{{ url_for('projects.view', project_url='textures') }}")
-		span Image Sharing
+		span Textures
+
+	+nav-secondary-link(
+		href="{{ url_for('projects.view', project_url='hdri') }}")
+		span HDRI
+
+	+nav-secondary-link(
+		class="{% if title == 'services' %}active{% endif %}",
+		href="{{ url_for('cloud.services') }}")
+		span Services
+| {% endmacro %}
+
+| {% macro navigation_collection(title) %}
++nav-secondary
+	| {% if title in ['courses', 'workshops', 'production'] %}
+	+nav-secondary-link(
+			class="{% if title == 'courses' %}active{% endif %}",
+			href="{{ url_for('cloud.courses') }}")
+		span Courses
+
+	+nav-secondary-link(
+			class="{% if title == 'workshops' %}active{% endif %}",
+			href="{{ url_for('cloud.workshops') }}")
+		span Workshops
+
+	+nav-secondary-link(
+		class="{% if title == 'production' %}active{% endif %}",
+		href="{{ url_for('cloud.production') }}")
+		span.new Production Lessons
+
+	| {% elif title in ['open-projects'] %}
+	+nav-secondary-link(
+			class="{% if title == 'open-projects' %}active{% endif %}",
+			href="{{ url_for('projects.view', project_url='gallery') }}")
+		span Open Projects
+	| {% endif %}
 | {% endmacro %}

src/templates/homepage.pug

@@ -1,5 +1,5 @@
 | {% extends 'layout.html' %}
-| {% from '_macros/_navigation.html' import navigation_tabs %}
+| {% from '_macros/_navigation.html' import navigation_homepage %}
 | {% from '_macros/_asset_list_item.html' import asset_list_item %}
 | {% from 'nodes/custom/blog/_macros.html' import render_blog_post %}
 
@@ -22,7 +22,7 @@ meta(name="twitter:image", content="{% if main_project.picture_header %}{{ main_
 | {% endblock %}
 
 | {% block navigation_tabs %}
-| {{ navigation_tabs(title) }}
+| {{ navigation_homepage(title) }}
 | {% endblock navigation_tabs %}
 
 | {% block body %}

src/templates/layout.pug

@@ -68,19 +68,11 @@ html(lang="en")
 
 		nav.navbar.navbar-expand-md.fixed-top.bg-white
 			+nav-secondary()
-				+nav-secondary-link(
+				button.navbar-toggler(
-					href="{{ url_for('main.homepage') }}",
+					data-target=".sarasa",
-					title="Blender Cloud Homepage",
-					data-toggle="tooltip",
-					data-placement="bottom",
-					class="px-2")
-					i.pi-blender-cloud
-
-				button.navbar-toggler.text-light(
-					data-target=".navbar-collapse",
 					data-toggle="collapse",
 					type="button")
-					span.sr-only Toggle navigation
+					span.sr-only Toggle Navigation
 					span.navbar-toggler-icon.d-flex.align-items-center
 						i.pi-menu
 
@@ -88,7 +80,7 @@ html(lang="en")
 					a.nav-link.dropdown-toggle.px-2(
 					href="{{ url_for('main.homepage') }}"
 					data-toggle="dropdown")
-						span Blender Cloud
+						i.pi-blender-cloud
 						i.pi-angle-down
 
 					| {% include 'menus/_dropdown_main.html' %}

src/templates/menus/_dropdown_main.pug

@@ -8,28 +8,28 @@ ul.dropdown-menu.nav-main
 			data-toggle='dropdown-tab',
 			data-tab-target='home')
 			i.mr-2.pi-home
-			span Home
+			span Blender Cloud
 
 		+nav-secondary-link(
 			href="{{ url_for('cloud.open_projects') }}",
 			data-toggle='dropdown-tab',
 			data-tab-target='films')
 			i.mr-2.pi-film-thick
-			span Films
+			span Open Projects
 
-		+nav-secondary-link(
+		li.nav-item
-			href="{{ url_for('cloud.workshops') }}",
+			.nav-link(
-			data-toggle='dropdown-tab',
+				data-toggle='dropdown-tab',
-			data-tab-target='training')
+				data-tab-target='training')
-			i.mr-2.pi-graduation-cap
+				i.mr-2.pi-graduation-cap
-			span Training
+				span Learn
 
-		+nav-secondary-link(
+		li.nav-item
-			href="/p/textures",
+			.nav-link(
-			data-toggle='dropdown-tab',
+				data-toggle='dropdown-tab',
-			data-tab-target='libraries')
+				data-tab-target='libraries')
-			i.mr-2.pi-file-archive
+				i.mr-2.pi-file-archive
-			span Libraries
+				span Libraries
 
 		+nav-secondary-link(
 			href="{{ url_for('cloud.services') }}",
@@ -42,25 +42,30 @@ ul.dropdown-menu.nav-main
 	.dropdown-menu-tab(data-tab='home')
 		.dropdown-menu-column
 			+nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
-				+nav-secondary-link(href="{{ url_for('projects.index') }}")
+				+nav-secondary-link(
+					href="{{ url_for('main.main_blog') }}")
+					i.pi-newspaper
+					span Blog
+
+				+nav-secondary-link(
+					href="{{ url_for('projects.index') }}")
 					i.pi-star
 					span My Projects
 
-				+nav-secondary-link(href="{{ url_for('projects.index') }}")
-					i.pi-heart
-					span Shared with me
-
 				| {% if current_user.has_organizations() %}
-				+nav-secondary-link(href="{{ url_for('pillar.web.organizations.index') }}")
+				+nav-secondary-link(
-					i.mr-2.pi-users
+					href="{{ url_for('pillar.web.organizations.index') }}")
+					i.pi-users
 					span My Organizations
 				| {% endif %}
 
-				+nav-secondary-link(href="{{ url_for('projects.home_project_shared_images')}}")
+				+nav-secondary-link(
+					href="{{ url_for('projects.home_project_shared_images')}}")
 					i.pi-picture
 					span Image Sharing
 
-				+nav-secondary-link(href="{{ url_for('projects.home_project') }}")
+				+nav-secondary-link(
+					href="{{ url_for('projects.home_project') }}")
 					i.pi-blender
 					span Blender Sync
 
@@ -70,8 +75,8 @@ ul.dropdown-menu.nav-main
 				+nav-secondary-link(
 					href="{{ url_for('cloud.open_projects') }}",
 					class="nav-see-more border-bottom")
-					span
+					span.font-weight-bold
-						| All Open Movies
+						| All Open Projects
 					i.pi-angle-right.pl-2
 
 				+nav-secondary-link(
@@ -92,7 +97,12 @@ ul.dropdown-menu.nav-main
 
 	.dropdown-menu-tab(data-tab='training')
 		.dropdown-menu-column
-			+nav-secondary('Training')(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+			+nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+				li.nav-item
+					.nav-link.border-bottom.pointer-events-none
+						span.font-weight-bold
+							| Learn
+
 				+nav-secondary-link(
 					href="{{ url_for('cloud.courses') }}")
 					i.pi-graduation-cap
@@ -110,20 +120,29 @@ ul.dropdown-menu.nav-main
 
 	.dropdown-menu-tab(data-tab='libraries')
 		.dropdown-menu-column
-			+nav-secondary('Libraries')(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
+			+nav-secondary()(class="nav-secondary-vertical rounded-right border-left overflow-hidden")
-				+nav-secondary-link(href="{{ url_for('projects.view', project_url='textures') }}")
+				li.nav-item
+					.nav-link.border-bottom.pointer-events-none
+						span.font-weight-bold
+							| Libraries
+
+				+nav-secondary-link(
+					href="{{ url_for('projects.view', project_url='textures') }}")
 					i.pi-folder-texture
 					span Textures
 
-				+nav-secondary-link(href="{{ url_for('projects.view', project_url='hdri') }}")
+				+nav-secondary-link(
+					href="{{ url_for('projects.view', project_url='hdri') }}")
 					i.pi-globe
 					span HDRI
 
-				+nav-secondary-link(href="{{ url_for('projects.view', project_url='characters') }}")
+				+nav-secondary-link(
+					href="{{ url_for('projects.view', project_url='characters') }}")
 					i.pi-character
 					span Characters
 
-				+nav-secondary-link(href="{{ url_for('projects.view', project_url='gallery') }}")
+				+nav-secondary-link(
+					href="{{ url_for('projects.view', project_url='gallery') }}")
 					i.pi-picture
 					span Art Gallery
 
@@ -133,22 +152,26 @@ ul.dropdown-menu.nav-main
 				+nav-secondary-link(
 					href="{{ url_for('cloud.services') }}",
 					class="nav-see-more border-bottom")
-					span
+					span.font-weight-bold
 						| All Services
 					i.pi-angle-right.pl-2
 
-				+nav-secondary-link(href="/attract")
+				+nav-secondary-link(
+					href="/attract")
 					i.pi-attract
 					span Attract
 
-				+nav-secondary-link(href="/flamenco")
+				+nav-secondary-link(
+					href="/flamenco")
 					i.pi-attract
 					span Flamenco
 
-				+nav-secondary-link(href="{{ url_for('cloud.services') }}#blender-cloud-add-on")
+				+nav-secondary-link(
+					href="{{ url_for('cloud.services') }}#blender-cloud-add-on")
 					i.pi-blender
 					span Blender Cloud add-on
 
-				+nav-secondary-link(href="{{ url_for('cloud.services') }}#texture-browser")
+				+nav-secondary-link(
+					href="{{ url_for('cloud.services') }}#texture-browser")
 					i.pi-texture
 					span Texture & HDRI Browser

src/templates/production.pug

@@ -1,28 +1,38 @@
 | {% extends 'layout.html' %}
+| {% from '_macros/_navigation.html' import navigation_collection %}
+
 include ../../../pillar/src/templates/mixins/components
 
 mixin group(title, tag)
-	section.py-3.my-3.border-bottom
+	.row
+		section.py-3.my-3.border-bottom.col-12
 
-		h4.title-underline.mb-4= title
+			h4.title-underline.mb-4= title
-		+card-deck(data-asset-tag=tag, class="js-asset-list py-3")
+			+card-deck(data-asset-tag=tag, class="js-asset-list py-3")
 
 | {% block page_title %}Production Lessons{% endblock %}
 | {% set page_header_text = "Tips and tricks by the Open Movie crew." %}
 
+| {% block navigation_tabs %}
+| {{ navigation_collection(title) }}
+| {% endblock navigation_tabs %}
+
 | {% block head %}
 script(src="{{ url_for('static_cloud', filename='assets/js/tagged_assets.min.js') }}")
 
 script.
 	$(function() {
 		$('.js-asset-list').loadTaggedAssets(5, 3);
-	})
+	});
 | {% endblock %}
 | {% block body %}
-+jumbotron('{{ self.page_title() }}', '{{ page_header_text }}', "{{ url_for('static', filename='assets/img/backgrounds/background_agent327_04.jpg')}}")(class="jumbotron-overlay")
++jumbotron(
+	'{{ self.page_title() }}',
+	'{{ page_header_text }}',
+	"{{ url_for('static', filename='assets/img/backgrounds/background_agent327_04.jpg')}}")(
+		class="jumbotron-overlay")
 
 .container
-
 	+group('Modeling', 'modelling')
 	+group('Sculpting', 'sculpting')
 	+group('Animation', 'animation')
@@ -36,6 +46,7 @@ script.
 
 	a.d-block.py-5.text-center.text-muted(
 		href="{{ url_for('main.nodes_search_index') }}")
-		| Search Blender Cloud to find even more awesome content!
+		| Search Blender Cloud to find even more content
+		i.pi-angle-right.pl-1
 
 | {% endblock body%}

src/templates/projects_index_collection.pug

@@ -1,4 +1,6 @@
 | {% extends 'layout.html' %}
+| {% from '_macros/_navigation.html' import navigation_collection %}
+
 include ../../../pillar/src/templates/mixins/components
 
 | {# Default case is Open Projects #}
@@ -40,29 +42,22 @@ meta(name="twitter:image", content="{{ page_header_image }}")
 | {% endblock %}
 
 | {% block navigation_tabs %}
-
+| {{ navigation_collection(title) }}
-| {% if title in ['courses', 'workshops'] %}
-+nav-secondary
-	+nav-secondary-link(
-			class="{% if title == 'workshops' %}active{% endif %}",
-			href="{{ url_for('cloud.workshops') }}")
-		span Workshops
-
-	+nav-secondary-link(
-			class="{% if title == 'courses' %}active{% endif %}",
-			href="{{ url_for('cloud.courses') }}")
-		span Courses
-
-	+nav-secondary-link(
-			class="{% if title == 'gallery' %}active{% endif %}",
-			href="{{ url_for('projects.view', project_url='gallery') }}")
-		span Art Gallery
-| {% endif %}
-
 | {% endblock navigation_tabs %}
 
 | {% block body %}
 
+| {# 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.';
++jumbotron(
+	jumbotron_title,
+	jumbotron_lead,
+	"{{ url_for('static', filename='assets/img/backgrounds/background_agent327_04.jpg')}}",
+	"{{ url_for('projects.view', project_url='spring') }}")(
+		class="jumbotron-overlay")
+
 .container.pb-5
 	.row
 		.col-12
@@ -77,6 +72,7 @@ meta(name="twitter:image", content="{{ page_header_image }}")
 			+card-deck(3)
 				| {% for project in projects %}
 
+				| {% if project.url not in projects_in_production %}
 				| {% if (project.status == 'published') or (project.status == 'pending' and current_user.is_authenticated) and project._id != config.MAIN_PROJECT_ID %}
 				+card(
 					class='js-project-go card-fade cursor-pointer mb-4 mx-0',
@@ -100,6 +96,7 @@ meta(name="twitter:image", content="{{ page_header_image }}")
 							| {{project.summary|safe}}
 						| {% endif %}
 				| {% endif %}
+				| {% endif %}
 				| {% endfor %}
 
 | {% endblock %}

src/templates/services.pug

@@ -1,4 +1,6 @@
 | {% extends 'layout.html' %}
+| {% from '_macros/_navigation.html' import navigation_homepage %}
+
 | {% block page_title %}Services{% endblock %}
 | {% set title = 'services' %}
 include ../../../pillar/src/templates/mixins/components
@@ -15,6 +17,10 @@ meta(property="og:image", content="{{ url_for('static', filename='assets/img/bac
 meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/backgrounds/background_services.jpg')}}")
 | {% endblock %}
 
+| {% block navigation_tabs %}
+| {{ navigation_homepage(title) }}
+| {% endblock navigation_tabs %}
+
 | {% block page_overlay %}
 #page-overlay.video
 	.video-embed