From 74e18bb5008c1980a4872445daff72a34bbf3f9e Mon Sep 17 00:00:00 2001
From: Pablo Vazquez <venomgfx@gmail.com>
Date: Wed, 19 Sep 2018 15:39:49 +0200
Subject: [PATCH] Fix navigation

---
 src/templates/_macros/_navigation.pug      | 29 ++++++++++++++++++++++
 src/templates/organizations/index.pug      |  7 +++---
 src/templates/projects/home_index.pug      |  2 ++
 src/templates/projects/home_layout.pug     | 13 ++--------
 src/templates/projects/index_dashboard.pug |  5 ++--
 5 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/src/templates/_macros/_navigation.pug b/src/templates/_macros/_navigation.pug
index 7649e00..6ed4a0b 100644
--- a/src/templates/_macros/_navigation.pug
+++ b/src/templates/_macros/_navigation.pug
@@ -53,3 +53,32 @@ include ../../../../pillar/src/templates/mixins/components
 		span Open Projects
 	| {% endif %}
 | {% endmacro %}
+
+| {% macro navigation_home_project(title) %}
++nav-secondary()
+		+nav-secondary-link(
+			href="{{ url_for('projects.index') }}",
+			class="{% if title == 'dashboard' %}active{% endif %}")
+			i.pi-star
+			span My Projects
+
+		| {% if current_user.has_organizations() %}
+		+nav-secondary-link(
+			href="{{ url_for('pillar.web.organizations.index') }}",
+			class="{% if title == 'organizations' %}active{% endif %}")
+			i.pi-users
+			span My Organizations
+		| {% endif %}
+
+		+nav-secondary-link(
+			href="{{ url_for('projects.home_project_shared_images')}}",
+			class="{% if title == 'images' %}active{% endif %}")
+			i.pi-picture
+			span Image Sharing
+
+		+nav-secondary-link(
+			href="{{ url_for('projects.home_project') }}",
+			class="{% if title == 'blender-sync' %}active{% endif %}")
+			i.pi-blender
+			span Blender Sync
+| {% endmacro %}
diff --git a/src/templates/organizations/index.pug b/src/templates/organizations/index.pug
index 0226603..dadd72d 100644
--- a/src/templates/organizations/index.pug
+++ b/src/templates/organizations/index.pug
@@ -1,5 +1,5 @@
 | {% extends 'layout.html' %}
-| {% from '_macros/_navigation.html' import navigation_tabs %}
+| {% from '_macros/_navigation.html' import navigation_home_project %}
 include ../../../../pillar/src/templates/mixins/components
 
 | {% set title = 'organizations' %}
@@ -16,9 +16,8 @@ meta(property="og:image", content="{{ url_for('static', filename='assets/img/bac
 meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/backgrounds/cloud_services_oti.jpg')}}")
 | {% endblock %}
 
-
 | {% block navigation_tabs %}
-| {{ navigation_tabs(title) }}
+| {{ navigation_home_project(title) }}
 | {% endblock navigation_tabs %}
 
 | {% block body %}
@@ -27,8 +26,8 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
 	+nav-secondary-link(
 		class="create",
 		onclick='createNewOrganization(this)')
+		i.pi-plus.text-success
 		span.text-success
-			i.pi-plus
 			| Create Organization
 	| {% endif %}
 
diff --git a/src/templates/projects/home_index.pug b/src/templates/projects/home_index.pug
index 610ff0d..bd3c919 100644
--- a/src/templates/projects/home_index.pug
+++ b/src/templates/projects/home_index.pug
@@ -1,4 +1,6 @@
 | {% extends 'projects/home_layout.html' %}
+| {% set title = 'blender-sync' %}
+
 | {% set subtab = 'blender_sync' %}
 | {% set learn_more_btn_url = '/blog/introducing-blender-sync' %}
 | {% block currenttab %}
diff --git a/src/templates/projects/home_layout.pug b/src/templates/projects/home_layout.pug
index 9173261..45cb537 100644
--- a/src/templates/projects/home_layout.pug
+++ b/src/templates/projects/home_layout.pug
@@ -1,9 +1,7 @@
 | {% extends 'layout.html' %}
-| {% from '_macros/_navigation.html' import navigation_tabs %}
+| {% from '_macros/_navigation.html' import navigation_home_project %}
 include ../../../../pillar/src/templates/mixins/components
 
-| {% set title = 'home' %}
-
 | {% block og %}
 meta(property="og:type", content="website")
 meta(property="og:url", content="https://cloud.blender.org{{ request.path }}")
@@ -20,20 +18,13 @@ meta(name="twitter:image", content="{{ url_for('static', filename='assets/img/ba
 | {% endblock %}
 
 | {% block navigation_tabs %}
-| {{ navigation_tabs(title) }}
+| {{ navigation_home_project(title) }}
 | {% endblock navigation_tabs %}
 
 | {% block body %}
 .dashboard-container
 
 	section#projects.bg-white
-		+nav-secondary()(id='sub-nav-tabs__list')
-			+nav-secondary-link(id="subtab-blender_sync", data-tab-url="{{ url_for('projects.home_project')}}")
-				span Blender Sync
-
-			+nav-secondary-link(id="subtab-images", data-tab-url="{{ url_for('projects.home_project_shared_images')}}")
-				span Images
-
 		| {% block currenttab %}{% endblock %}
 | {% endblock %}
 
diff --git a/src/templates/projects/index_dashboard.pug b/src/templates/projects/index_dashboard.pug
index 0f4f49c..e259147 100644
--- a/src/templates/projects/index_dashboard.pug
+++ b/src/templates/projects/index_dashboard.pug
@@ -1,5 +1,5 @@
 | {% extends 'layout.html' %}
-| {% from '_macros/_navigation.html' import navigation_tabs %}
+| {% from '_macros/_navigation.html' import navigation_home_project %}
 include ../../../../pillar/src/templates/mixins/components
 
 | {% set title = 'dashboard' %}
@@ -39,10 +39,9 @@ style.
 | {% endblock %}
 
 | {% block navigation_tabs %}
-| {{ navigation_tabs(title) }}
+| {{ navigation_home_project(title) }}
 | {% endblock navigation_tabs %}
 
-
 | {% block body %}
 .dashboard-container
 	section.dashboard-main