Mobile fixes for search

This commit is contained in:
2020-10-06 16:08:31 +01:00
parent acf814e49e
commit 0b751d62df
2 changed files with 5 additions and 5 deletions

View File

@@ -7,7 +7,7 @@
<div class="row"> <div class="row">
<h1 class="col-sm-12 pb-3">R<small class="text-muted">ig</small> I<small class="text-muted">nformation</small class="text-muted"> G<small class="text-muted">athering</small> S<small class="text-muted">ystem</small></h1> <h1 class="col-sm-12 pb-3">R<small class="text-muted">ig</small> I<small class="text-muted">nformation</small class="text-muted"> G<small class="text-muted">athering</small> S<small class="text-muted">ystem</small></h1>
<h4 class="col-sm-12 pb-3">Welcome back {{ user.get_full_name }}, there {%if rig_count == 1 %}is one rig coming up{%else%}are {{ rig_count|apnumber }} rigs coming up.{%endif%}</h4> <h4 class="col-sm-12 pb-3">Welcome back {{ user.get_full_name }}, there {%if rig_count == 1 %}is one rig coming up{%else%}are {{ rig_count|apnumber }} rigs coming up.{%endif%}</h4>
<div class="col-sm"> <div class="col-sm mb-3">
<div class="card"> <div class="card">
<h4 class="card-header">Rigboard</h4> <h4 class="card-header">Rigboard</h4>
<div class="list-group list-group-flush"> <div class="list-group list-group-flush">

View File

@@ -1,10 +1,10 @@
{% if user.is_authenticated %} {% if user.is_authenticated %}
<form id="searchForm" class="form-inline flex-nowrap mx-3" role="form" method="GET" action="{% url 'event_archive' %}"> <form id="searchForm" class="form-inline flex-nowrap mx-md-3" role="form" method="GET" action="{% url 'event_archive' %}">
<div class="input-group input-group-sm flex-nowrap"> <div class="input-group input-group-sm flex-nowrap">
<div class="input-group-prepend"> <div class="input-group-prepend">
<input id="id_search_input" type="search" name="q" class="form-control form-control-sm" placeholder="Search..." value="{{ request.GET.q }}" /> <input id="id_search_input" type="search" name="q" class="form-control form-control-sm" placeholder="Search..." value="{{ request.GET.q }}" />
</div> </div>
<select id="search-options" class="custom-select form-control" style="border-top-right-radius: 0px; border-bottom-right-radius: 0px;"> <select id="search-options" class="custom-select form-control w-25" style="border-top-right-radius: 0px; border-bottom-right-radius: 0px;">
<option selected data-action="{% url 'event_archive' %}" href="#">Events</option> <option selected data-action="{% url 'event_archive' %}" href="#">Events</option>
<option data-action="{% url 'person_list' %}" href="#">People</option> <option data-action="{% url 'person_list' %}" href="#">People</option>
<option data-action="{% url 'organisation_list' %}" href="#">Organisations</option> <option data-action="{% url 'organisation_list' %}" href="#">Organisations</option>
@@ -16,8 +16,8 @@
<option data-action="{% url 'supplier_list' %}" href="#">Suppliers</option> <option data-action="{% url 'supplier_list' %}" href="#">Suppliers</option>
</select> </select>
</div> </div>
<button class="btn btn-info form-control form-control-sm btn-sm" style="border-top-left-radius: 0px;border-bottom-left-radius: 0px;">Search</button> <button class="btn btn-info form-control form-control-sm btn-sm w-25" style="border-top-left-radius: 0px;border-bottom-left-radius: 0px;"><span class="fas fa-search"></span><span class="sr-only"> Search</span></button>
<a href="{% url 'search_help' %}" class="nav-link modal-href btn-sm"><span class="fas fa-question-circle"></span></a> <a href="{% url 'search_help' %}" class="nav-link modal-href btn-sm ml-2"><span class="fas fa-question-circle"></span></a>
</form> </form>
{% endif %} {% endif %}