Search: use proper navigation

Also remove failing projectBrowseTypeList js
This commit is contained in:
Pablo Vazquez 2018-09-19 18:22:27 +02:00
parent 6cb85b06dc
commit 7ace5f4292
2 changed files with 21 additions and 10 deletions

View File

@ -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(){

View File

@ -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 %}