Commit 10ce81f6 authored by Rachel TORCHET's avatar Rachel TORCHET
Browse files

Merge branch 'master' of gitlab.pasteur.fr:ippidb/ippidb-web

parents ae8d8500 180de1ad
ippidb.pasteur.fr ansible_user=ippidb
hub16.hosting.pasteur.fr ansible_user=ippidb
ippidb.pasteur.fr
hub16.hosting.pasteur.fr
......@@ -230,19 +230,20 @@
onclick="queryUrl.unPage(); queryUrl.modify('page_size','90');">90</a>
</div>
</span>
</div>
<div class="btn-group btn-group-sm ml-1">
<button class="btn btn-secondary dropdown-toggle compounds_sort_btn" type="button"
id="sortMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<span> Sort by </span>
</button>
<div class="dropdown-menu" aria-labelledby="sortMenuButton">
{% for sort_by_value, sort_by_entry in sort_by_options.items %}
<a class="dropdown-item {% if sort_by_value == sort_by %}active{% endif %}" href="#"
onclick="queryUrl.modify('sort_by','{{ sort_by_value }}')">{{ sort_by_entry.name }}
({{ sort_by_entry.order }})</a>
{% endfor %}
</div>
<span class="open_filters_btn dropdown" style="margin-top: 5px; margin-right: 5px; border: none;">
<a class="btn btn-sm btn-secondary dropdown-toggle compounds_sort_btn" href="#" role="button"
id="sortMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"
style="margin-top: 5px; margin-right: 5px; border: none;">
Sort by
</a>
<div class="dropdown-menu" aria-labelledby="sortMenuLink">
{% for sort_by_value, sort_by_entry in sort_by_options.items %}
<a class="dropdown-item {% if sort_by_value == sort_by %}active{% endif %}" href="#"
onclick="queryUrl.modify('sort_by','{{ sort_by_value }}')">{{ sort_by_entry.name }}
({{ sort_by_entry.order }})</a>
{% endfor %}
</div>
</span>
</div>
<span class="compounds_display_btn ml-1 pb-0">
<a class="btn btn-default btn-outline-primary compounds_display_btn {% if display == 'v' %}active{% endif %}"
......
......@@ -40,15 +40,19 @@ def general(request):
def tutorials(request):
return render(request, "tutorials.html")
def credits(request):
return render(request, "credits.html")
def citation(request):
return render(request, "citation.html")
def news(request):
return render(request, "news.html")
@login_required
def adminSession(request):
return render(request, "admin-session.html")
......
Supports Markdown
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