Merge pull request #1276 from bhargav1002/ui/helpdesk-template-enhancements

Enhance helpdesk UI: wrap saved query titles, group toolbar buttons, align filter labels
This commit is contained in:
Christopher Broderick 2025-06-08 15:17:37 +02:00 committed by GitHub
commit b83844d8e5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 26 additions and 24 deletions

View File

@ -4,7 +4,7 @@
<div class="col col-sm-3"> <div class="col col-sm-3">
<label for='id_sort' class="col-form-label">{% trans "Sorting" %}:</label> <label for='id_sort' class="col-form-label">{% trans "Sorting" %}:</label>
</div> </div>
<div class="col col-sm-3"> <div class="col col-sm-3 pt-2">
<select id='id_sort' name='sort' class=""> <select id='id_sort' name='sort' class="">
<option value='created'{% if query_params.sorting == "created"%} selected='selected'{% endif %}> <option value='created'{% if query_params.sorting == "created"%} selected='selected'{% endif %}>
{% trans "Created" %} {% trans "Created" %}
@ -29,7 +29,7 @@
<div class="col col-sm-2"> <div class="col col-sm-2">
<label for='id_sortreverse' class="col-form-label">{% trans "Reverse" %}</label> <label for='id_sortreverse' class="col-form-label">{% trans "Reverse" %}</label>
</div> </div>
<div class="col col-sm-3"> <div class="col col-sm-3 pt-2">
<input type='checkbox' name='sortreverse' id='id_sortreverse'{% if query_params.sortreverse %} checked='checked'{% endif %} /> <input type='checkbox' name='sortreverse' id='id_sortreverse'{% if query_params.sortreverse %} checked='checked'{% endif %} />
</div> </div>
<div class="col col-sm-1"> <div class="col col-sm-1">

View File

@ -23,7 +23,7 @@
<div class="dropdown-menu" aria-labelledby="ticketsDropdown"> <div class="dropdown-menu" aria-labelledby="ticketsDropdown">
{% if user_saved_queries_ %} {% if user_saved_queries_ %}
{% for q in user_saved_queries_ %} {% for q in user_saved_queries_ %}
<a class="dropdown-item small" href="{% url 'helpdesk:list' %}?saved_query={{ q.id }}">{{ q.title }} <a class="dropdown-item small" href="{% url 'helpdesk:list' %}?saved_query={{ q.id }}" style="white-space: normal;">{{ q.title }}
{% if q.shared %} {% if q.shared %}
(Shared{% if user != q.user %} by {{ q.user.get_username }}{% endif %}) (Shared{% if user != q.user %} by {{ q.user.get_username }}{% endif %})
{% endif %} {% endif %}

View File

@ -15,6 +15,7 @@
<h3>{{ ticket.queue.slug }}-{{ ticket.id }}. {{ ticket.title }}</h3> <h3>{{ ticket.queue.slug }}-{{ ticket.id }}. {{ ticket.title }}</h3>
{% blocktrans with ticket.queue as queue %}Queue: {{ queue }}{% endblocktrans %} {% blocktrans with ticket.queue as queue %}Queue: {{ queue }}{% endblocktrans %}
<span class='ticket_toolbar float-right'> <span class='ticket_toolbar float-right'>
<div class="btn-group" style="gap: 8px;">
<a href="{% url 'helpdesk:edit' ticket.id %}" class="btn btn-warning btn-sm ticket-edit"> <a href="{% url 'helpdesk:edit' ticket.id %}" class="btn btn-warning btn-sm ticket-edit">
<i class="fas fa-pencil-alt"></i> {% trans "Edit" %} <i class="fas fa-pencil-alt"></i> {% trans "Edit" %}
</a> </a>
@ -36,6 +37,7 @@
</button> </button>
</form> </form>
{% endif %} {% endif %}
</div>
</span> </span>
</th> </th>
</tr> </tr>