archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Search: use proper navigation

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

19
src/templates/nodes/search.pug
View File

@@ -1,7 +1,24 @@
| {% extends 'layout.html' %} | {% extends 'layout.html' %}
| {% from '_macros/_asset_list_item.html' import asset_list_item %} | {% 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 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 page_title %}Search{% if project %} {{ project.name }}{% endif %}{% endblock %}
| {% block head %} | {% block head %}
@@ -172,8 +189,6 @@ script.
$(this).addClass('active'); $(this).addClass('active');
}); });
projectBrowseTypeList();
// Remove focus from search input so that the click event // Remove focus from search input so that the click event
// bound to .search-hit can be fired on the first click. // bound to .search-hit can be fired on the first click.
$('#search-list').hover(function(){ $('#search-list').hover(function(){

12
src/templates/projects/edit_layout.pug
View File

@@ -1,14 +1,12 @@
| {% extends 'layout.html' %} | {% extends 'layout.html' %}
| {% from 'projects/_macros.html' import render_secondary_navigation %}
include ../mixins/components include ../mixins/components
| {% block page_title %}Edit {{ project.name }}{% endblock %} | {% block page_title %}Edit {{ project.name }}{% endblock %}
| {% block navigation_tabs %} | {% block navigation_tabs %}
+nav-secondary() | {{ render_secondary_navigation(project, navigation_links, title) }}
+nav-secondary-link(
class="px-0 font-weight-bold",
href="{{url_for('projects.view', project_url=project.url, _external=True)}}")
| {{ project.name }}
| {% endblock navigation_tabs %} | {% endblock navigation_tabs %}
| {% block body %} | {% block body %}
@@ -90,7 +88,5 @@ script.
| {% endblock %} | {% endblock %}
| {% block footer_navigation %} | {% block footer_container %}
| {% endblock %}
| {% block footer %}
| {% endblock %} | {% endblock %}