Commit 0b843195 authored by felix.herrmann's avatar felix.herrmann
Browse files

fix(search): set dataset search as default; place dataset index on top

parent 8ad13dc7
......@@ -9,14 +9,14 @@
</div>
<div class="collapse show" id="collapse-{{ filtertype }}-filter">
<div class="list-group search-filter smallskip">
{# user_index #}
<input type="radio" value="user_index" aria-label="{% trans 'Users' %}" {% if filter_applied == 'user_index' %} checked{% else %}ic-get-from="{% url 'ddusers:search' %}{{ search_params|add_url_search_params }}" ic-push-url="true" ic-include=".search-middle" ic-target="#content"{% endif %} id="search-filter-user_index" />
<label class="list-group-item" for="search-filter-user_index">{% trans 'Users' %}</label>
{# dataset_index #}
<input type="radio" value="dataset_index" aria-label="{% trans 'Datasets' %}" {% if filter_applied == 'dataset_index' %} checked{% else %}ic-get-from="{% url 'dddatasets:search' %}{{ search_params|add_url_search_params }}" ic-push-url="true" ic-include=".search-middle" ic-target="#content"{% endif %} id="search-filter-dataset_index" />
<label class="list-group-item" for="search-filter-dataset_index">{% trans 'Datasets' %}</label>
{# user_index #}
<input type="radio" value="user_index" aria-label="{% trans 'Users' %}" {% if filter_applied == 'user_index' %} checked{% else %}ic-get-from="{% url 'ddusers:search' %}{{ search_params|add_url_search_params }}" ic-push-url="true" ic-include=".search-middle" ic-target="#content"{% endif %} id="search-filter-user_index" />
<label class="list-group-item" for="search-filter-user_index">{% trans 'Users' %}</label>
{# help_index #}
<input type="radio" value="help_index" aria-label="{% trans 'Help' %}" {% if filter_applied == 'help_index' %} checked{% else %}ic-get-from="{% url 'core:help_search' %}" ic-push-url="true" ic-include=".search-middle" ic-target="#content"{% endif %} id="search-filter-help_index" />
<label class="list-group-item" for="search-filter-help_index">{% trans 'Help' %}</label>
......
......@@ -26,9 +26,8 @@
</li>
</ul>
<form action="{% url 'ddusers:search' %}" method="post" class="w-25 mx-auto">
<form action="{% url 'dddatasets:search' %}" method="get" class="w-25 mx-auto">
<div class="input-group ">
{% csrf_token %}
<input class="form-control" id="search-field" class="search-data" type="text" placeholder="{% trans "Search" %}" name="q" aria-label="Search">
<div class="input-group-append">
<button class="input-group-text" type="submit"><span class="i-search-md"></span></button>
......
......@@ -11,7 +11,7 @@
<div class="input-group w-25 mx-auto">
<input class="form-control search-top search-ui" type="text" {% if query %}value="{{ query }}" {% else %}placeholder="Search"{% endif %} name="q" aria-label="Search">
<div class="input-group-append">
<button class="input-group-text search-button-top" type="button" ic-include=".search-data" ic-push-url="true" ic-push-params="q,countries,categories" ic-get-from="{% url 'ddusers:search' %}" ic-target="#content"><span class="i-search-md"></span></button>
<button class="input-group-text search-button-top" type="button" ic-include=".search-data" ic-push-url="true" ic-push-params="q,countries,categories" ic-get-from="{% url 'dddatasets:search' %}" ic-target="#content"><span class="i-search-md"></span></button>
</div>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment