From 7ace5f429226ce6b76a2eb618d59f2eb402fbfec Mon Sep 17 00:00:00 2001
From: Pablo Vazquez <venomgfx@gmail.com>
Date: Wed, 19 Sep 2018 18:22:27 +0200
Subject: [PATCH] Search: use proper navigation

Also remove failing projectBrowseTypeList js
---
 src/templates/nodes/search.pug         | 19 +++++++++++++++++--
 src/templates/projects/edit_layout.pug | 12 ++++--------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/templates/nodes/search.pug b/src/templates/nodes/search.pug
index bf112ae7..1ee1dfc2 100644
--- a/src/templates/nodes/search.pug
+++ b/src/templates/nodes/search.pug
@@ -1,7 +1,24 @@
 | {% extends 'layout.html' %}
 | {% from '_macros/_asset_list_item.html' import asset_list_item %}
+| {% from 'projects/_macros.html' import render_secondary_navigation %}
+| {% from '_macros/_navigation.html' import navigation_homepage %}
 include ../mixins/components
 
+| {% if project %}
+| {% set title = 'search-project' %}
+| {{ render_secondary_navigation(project, navigation_links, title) }}
+| {% else %}
+| {% set title = 'search' %}
+| {% endif %}
+
+| {% block navigation_tabs %}
+| {% if project %}
+| {{ render_secondary_navigation(project, navigation_links, title) }}
+| {% else %}
+| {{ navigation_homepage(title) }}
+| {% endif %}
+| {% endblock navigation_tabs %}
+
 | {% block page_title %}Search{% if project %} {{ project.name }}{% endif %}{% endblock %}
 
 | {% block head %}
@@ -172,8 +189,6 @@ script.
 		$(this).addClass('active');
 	});
 
-	projectBrowseTypeList();
-
 	// Remove focus from search input so that the click event
 	// bound to .search-hit can be fired on the first click.
 	$('#search-list').hover(function(){
diff --git a/src/templates/projects/edit_layout.pug b/src/templates/projects/edit_layout.pug
index a2a63229..d789cf85 100644
--- a/src/templates/projects/edit_layout.pug
+++ b/src/templates/projects/edit_layout.pug
@@ -1,14 +1,12 @@
 | {% extends 'layout.html' %}
+| {% from 'projects/_macros.html' import render_secondary_navigation %}
+
 include ../mixins/components
 
 | {% block page_title %}Edit {{ project.name }}{% endblock %}
 
 | {% block navigation_tabs %}
-+nav-secondary()
-	+nav-secondary-link(
-		class="px-0 font-weight-bold",
-		href="{{url_for('projects.view', project_url=project.url, _external=True)}}")
-		| {{ project.name }}
+| {{ render_secondary_navigation(project, navigation_links, title) }}
 | {% endblock navigation_tabs %}
 
 | {% block body %}
@@ -90,7 +88,5 @@ script.
 
 | {% endblock %}
 
-| {% block footer_navigation %}
-| {% endblock %}
-| {% block footer %}
+| {% block footer_container %}
 | {% endblock %}