SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit ca9e4804 authored by Jorran de Wit's avatar Jorran de Wit
Browse files

UX improcements

parent f15ee7c2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
scipost/static/scipost/assets/js/scripts.js
+ 4
− 3
View file @ ca9e4804
...@@ -40,7 +40,8 @@ $(function(){ ...@@ -40,7 +40,8 @@ $(function(){
window.history.replaceState({}, null, '?tab=' + tab_name); window.history.replaceState({}, null, '?tab=' + tab_name);
}); });
// $('footer').each(function () { // Auto-submit hook for general form elements
var $spy = $('body').scrollspy({ target: '.footer' }) $("form .auto-submit input").on('change', function(){
// }) $(this).parents('form').submit()
})
}); });
scipost/templates/scipost/search.html deleted 100644 → 0
+ 0
− 172
View file @ f15ee7c2
{% extends 'scipost/base.html' %}
{% block pagetitle %}: list{% endblock pagetitle %}
{% block content %}
<div class="row">
<div class="col-12">
<h1>Search results: <span class="text-muted">{{ search_term|default:'' }}</span></h1>
<h1>Search results{% if search_term %}: <small><i>{{ search_term }}</i></small>{% endif %}</h1>
{% if not publication_search_list and not commentary_search_list and not submission_search_list and not thesislink_search_list and not comment_search_link and not comment_search_list %}
<p>Your search query did not return any result.</p>
{% endif %}
</div>
</div>
{% if publication_search_list %}
<hr>
<div class="row">
<div class="col-12">
<h2 class="highlight">Publications ({{publication_search_list|length}})</h2>
</div>
</div>
<div class="row">
<div class="col-12">
{% for publication in publication_search_list %}
<div class="card card-publication">
{% include 'journals/_publication_card_content.html' with publication=publication %}
</div>
{% endfor %}
</div>
</div>
<div class="row">
<div class="col-12">
<div class="pagination">
<span class="step-links">
{% if publication_search_list.has_previous %}
<a href="?publication_search_list_page={{ publication_search_list.previous_page_number }}">previous</a>
{% endif %}
<span class="current">
Page {{ publication_search_list.number }} of {{ publication_search_list.paginator.num_pages }}.
</span>
{% if publication_search_list.has_next %}
<a href="?publication_search_list_page={{ publication_search_list.next_page_number }}">next</a>
{% endif %}
</span>
</div>
</div>
</div>
{% endif %}
{% if commentary_search_list %}
<hr>
<div class="row">
<div class="col-12">
<h2 class="highlight">Commentaries ({{commentary_search_list|length}})</h2>
</div>
</div>
<div class="row">
<div class="col-12">
<ul class="list-group list-group-flush">
{% for commentary in commentary_search_list %}
<li class="list-group-item">
{% include 'commentaries/_commentary_card_content.html' with commentary=commentary %}
</li>
{% endfor %}
</ul>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="pagination">
<span class="step-links">
{% if commentary_search_list.has_previous %}
<a href="?commentary_search_list_page={{ commentary_search_list.previous_page_number }}">previous</a>
{% endif %}
<span class="current">
Page {{ commentary_search_list.number }} of {{ commentary_search_list.paginator.num_pages }}.
</span>
{% if commentary_search_list.has_next %}
<a href="?commentary_search_list_page={{ commentary_search_list.next_page_number }}">next</a>
{% endif %}
</span>
</div>
</div>
</div>
{% endif %}
{% if submission_search_list %}
<hr>
<div class="row">
<div class="col-12">
<h2 class="highlight">Submissions ({{submission_search_list|length}})</h2>
</div>
</div>
<div class="row">
<div class="col-12">
<ul class="list-group list-group-flush">
{% for submission in submission_search_list %}
<li class="list-group-item">
{% include 'submissions/_submission_card_content.html' with submission=submission %}
</li>
{% endfor %}
</ul>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="pagination">
<span class="step-links">
{% if submission_search_list.has_previous %}
<a href="?submission_search_list_page={{ submission_search_list.previous_page_number }}">previous</a>
{% endif %}
<span class="current">
Page {{ submission_search_list.number }} of {{ submission_search_list.paginator.num_pages }}
</span>
{% if submission_search_list.has_next %}
<a href="?submission_search_list_page={{ submission_search_list.next_page_number }}">next</a>
{% endif %}
</span>
</div>
</div>
</div>
{% endif %}
{% if thesislink_search_list %}
<hr>
<div class="row">
<div class="col-12">
<h2 class="highlight">Theses ({{thesislink_search_list|length}})</h2>
</div>
</div>
<div class="row">
<div class="col-12">
<ul class="list-group list-group-flush">
{% for thesislink in thesislink_search_list %}
<li class="list-group-item">
{% include 'theses/_thesislink_card_content.html' with thesislink=thesislink %}
</li>
{% endfor %}
</ul>
</div>
</div>
{% endif %}
{% if comment_search_list %}
<hr>
<div class="row">
<div class="col-12">
<h2 class="highlight">Comments ({{comment_search_list|length}})</h2>
</div>
</div>
<div class="row">
<div class="col-12">
<ul class="list-group list-group-flush">
{% for comment in comment_search_list %}
<li class="list-group-item">
{% include 'comments/_comment_card_extended_content.html' with comment=comment %}
</li>
{% endfor %}
</ul>
</div>
</div>
{% endif %}
{% endblock content %}
scipost/templates/scipost/search2.html deleted 100644 → 0
+ 0
− 182
View file @ f15ee7c2
{% extends 'scipost/base.html' %}
{% load bootstrap %}
{% block pagetitle %}: list{% endblock pagetitle %}
{% block content %}
<h1>Search results</h1>
<form method="get" class="my-2">
<div class="form-group row">
<div class="col-md-5 col-lg-3 mb-2 mb-md-0 pr-md-1">
<input class="form-control" id="{{form.q.auto_id}}" maxlength="100" name="{{form.q.name}}" type="text" value="{{form.q.value}}" required="required">
</div>
<div class="col-md-7 col-lg-9 pl-md-1">
<input class="btn btn-primary" type="submit" value="Search">
</div>
</div>
</form>
{% if not publication_search_list and not commentary_search_list and not submission_search_list and not thesislink_search_list and not comment_search_link and not comment_search_list %}
<p>Your search query did not return any result.</p>
{% endif %}
{% if publication_search_list %}
<hr>
<div class="row">
<div class="col-12">
<h2 class="highlight">Publications ({{publication_search_list|length}})</h2>
</div>
</div>
<div class="row">
<div class="col-12">
{% for publication in publication_search_list %}
<div class="card card-publication">
{% include 'journals/_publication_card_content.html' with publication=publication %}
</div>
{% endfor %}
</div>
</div>
<div class="row">
<div class="col-12">
<div class="pagination">
<span class="step-links">
{% if publication_search_list.has_previous %}
<a href="?publication_search_list_page={{ publication_search_list.previous_page_number }}">previous</a>
{% endif %}
<span class="current">
Page {{ publication_search_list.number }} of {{ publication_search_list.paginator.num_pages }}.
</span>
{% if publication_search_list.has_next %}
<a href="?publication_search_list_page={{ publication_search_list.next_page_number }}">next</a>
{% endif %}
</span>
</div>
</div>
</div>
{% endif %}
{% if commentary_search_list %}
<hr>
<div class="row">
<div class="col-12">
<h2 class="highlight">Commentaries ({{commentary_search_list|length}})</h2>
</div>
</div>
<div class="row">
<div class="col-12">
<ul class="list-group list-group-flush">
{% for commentary in commentary_search_list %}
<li class="list-group-item">
{% include 'commentaries/_commentary_card_content.html' with commentary=commentary %}
</li>
{% endfor %}
</ul>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="pagination">
<span class="step-links">
{% if commentary_search_list.has_previous %}
<a href="?commentary_search_list_page={{ commentary_search_list.previous_page_number }}">previous</a>
{% endif %}
<span class="current">
Page {{ commentary_search_list.number }} of {{ commentary_search_list.paginator.num_pages }}.
</span>
{% if commentary_search_list.has_next %}
<a href="?commentary_search_list_page={{ commentary_search_list.next_page_number }}">next</a>
{% endif %}
</span>
</div>
</div>
</div>
{% endif %}
{% if submission_search_list %}
<hr>
<div class="row">
<div class="col-12">
<h2 class="highlight">Submissions ({{submission_search_list|length}})</h2>
</div>
</div>
<div class="row">
<div class="col-12">
<ul class="list-group list-group-flush">
{% for submission in submission_search_list %}
<li class="list-group-item">
{% include 'submissions/_submission_card_content.html' with submission=submission %}
</li>
{% endfor %}
</ul>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="pagination">
<span class="step-links">
{% if submission_search_list.has_previous %}
<a href="?submission_search_list_page={{ submission_search_list.previous_page_number }}">previous</a>
{% endif %}
<span class="current">
Page {{ submission_search_list.number }} of {{ submission_search_list.paginator.num_pages }}
</span>
{% if submission_search_list.has_next %}
<a href="?submission_search_list_page={{ submission_search_list.next_page_number }}">next</a>
{% endif %}
</span>
</div>
</div>
</div>
{% endif %}
{% if thesislink_search_list %}
<hr>
<div class="row">
<div class="col-12">
<h2 class="highlight">Theses ({{thesislink_search_list|length}})</h2>
</div>
</div>
<div class="row">
<div class="col-12">
<ul class="list-group list-group-flush">
{% for thesislink in thesislink_search_list %}
<li class="list-group-item">
{% include 'theses/_thesislink_card_content.html' with thesislink=thesislink %}
</li>
{% endfor %}
</ul>
</div>
</div>
{% endif %}
{% if comment_search_list %}
<hr>
<div class="row">
<div class="col-12">
<h2 class="highlight">Comments ({{comment_search_list|length}})</h2>
</div>
</div>
<div class="row">
<div class="col-12">
<ul class="list-group list-group-flush">
{% for comment in comment_search_list %}
<li class="list-group-item">
{% include 'comments/_comment_card_extended_content.html' with comment=comment %}
</li>
{% endfor %}
</ul>
</div>
</div>
{% endif %}
{% endblock content %}
templates/search/search.html
+ 6
− 16
View file @ ca9e4804
...@@ -14,14 +14,14 @@ ...@@ -14,14 +14,14 @@
<form method="get"> <form method="get">
<div class="form-group"> <div class="form-group">
<label for="{{form.q.auto_id}}">{{form.q.label}}</label> <label for="{{form.q.auto_id}}">{{form.q.label}}</label>
<input type="text" name="{{form.q.name}}" class="form-control form-control-lg" id="{{form.q.auto_id}}" aria-describedby="search_help" placeholder="Search term" value="{{form.q.value}}" required="required"> <input type="text" name="{{form.q.name}}" class="form-control form-control-lg" id="{{form.q.auto_id}}" aria-describedby="search_help" placeholder="Search term" value="{{form.q.value|default:''}}" required="required">
<small id="search_help" class="form-text text-muted">{{form.q.help_text}}</small> <small id="search_help" class="form-text text-muted">{{form.q.help_text}}</small>
</div> </div>
<div class="form-group"> <div class="form-group">
<label>Type</label> <label>Type</label>
</div> </div>
<div class="form-group checkboxes"> <div class="form-group checkboxes auto-submit">
{% for field in form.models %} {% for field in form.models %}
<input type="checkbox" name="{{field.name}}" id="{{field.id_for_label}}" value="{{field.choice_value|stringformat:'s'}}" {% if field.choice_value in form.models.value %}checked="checked"{% endif %}> <input type="checkbox" name="{{field.name}}" id="{{field.id_for_label}}" value="{{field.choice_value|stringformat:'s'}}" {% if field.choice_value in form.models.value %}checked="checked"{% endif %}>
<label class="btn btn-info" for="{{field.id_for_label}}"> <label class="btn btn-info" for="{{field.id_for_label}}">
...@@ -31,28 +31,15 @@ ...@@ -31,28 +31,15 @@
{% endfor %} {% endfor %}
</div> </div>
{# {% comment %}#}
{# DISABLED DATE SEARCH: DOES NOT WORK OK #}
<label>Date from</label> <label>Date from</label>
<div class="form-row"> <div class="form-row">
{# <div class="form-group col-md-6">#}
{{form.start}} {{form.start}}
{# </div>#}
{# <div class="form-group col-md-6">#}
{# {{form.start_2}}#}
{# </div>#}
</div> </div>
<label>Date until</label> <label>Date until</label>
<div class="form-row"> <div class="form-row">
{# <div class="form-group col-md-6">#}
{{form.end}} {{form.end}}
{# </div>#}
{# <div class="form-group col-md-6">#}
{# {{form.end_2}}#}
{# </div>#}
</div> </div>
{# {% endcomment %}#}
<div class="form-group"> <div class="form-group">
{# <input type="reset" class="btn btn-danger" value="Reset">#} {# <input type="reset" class="btn btn-danger" value="Reset">#}
...@@ -61,9 +48,10 @@ ...@@ -61,9 +48,10 @@
</form> </form>
</div> </div>
<div class="col-md-8"> <div class="col-md-8">
<h1 class="my-3 mt-md-0">Search results{% if results_count and query %} ({{results_count}} found){% endif %}</h1>
{# without this logic, an request without GET parameters would return *all* objects indexed by Haystack #}
{% if query %} {% if query %}
<h1 class="my-3 mt-md-0">Search results{% if results_count %} ({{results_count}} found){% endif %}</h1>
<ul class="list-group list-group-flush"> <ul class="list-group list-group-flush">
{% for result in object_list %} {% for result in object_list %}
<li class="list-group-item{% if result.content_type == 'journals.publication' %} border-0{% endif %}"> <li class="list-group-item{% if result.content_type == 'journals.publication' %} border-0{% endif %}">
...@@ -101,6 +89,8 @@ ...@@ -101,6 +89,8 @@
</p> </p>
{% endif %} {% endif %}
</ul> </ul>
{% else %}
<p>Your search query did not return any result.</p>
{% endif %} {% endif %}
</div> </div>
</div> </div>
......
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

SciPost Code Repository