Ticket display fixes: fix cycling of odd/even rows; float edit/delete to right to allow the ticket name to span across two columns.

This commit is contained in:
Ross Poulton 2011-02-02 11:54:30 +00:00
parent 3ef9f7c7aa
commit af3bf1889a
3 changed files with 9 additions and 6 deletions

View File

@ -91,6 +91,11 @@ dt {
border-bottom: solid white 1px; border-bottom: solid white 1px;
} }
.row_tablehead span.ticket_toolbar {
float: right;
text-align: right;
}
.row_tablehead td { .row_tablehead td {
padding-left: 12px; padding-left: 12px;
line-height: 16pt; line-height: 16pt;
@ -261,4 +266,4 @@ span.priority5 {
a.followup-edit { a.followup-edit {
float:right; float:right;
} }

View File

@ -1,5 +1,4 @@
{% extends "helpdesk/public_base.html" %}{% load i18n %} {% extends "helpdesk/public_base.html" %}{% load i18n %}
{% cycle 'row_odd' 'row_even' as rowcolors %}
{% block helpdesk_title %}{% trans "View a Ticket" %}{% endblock %} {% block helpdesk_title %}{% trans "View a Ticket" %}{% endblock %}
{% block helpdesk_body %} {% block helpdesk_body %}
@ -8,7 +7,7 @@
<tr class='row_tablehead'><td colspan='2'>{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}]</td></tr> <tr class='row_tablehead'><td colspan='2'>{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}]</td></tr>
<tr class='row_columnheads'><th colspan='2'>{% blocktrans with ticket.queue as queue_name %}Queue: {{ queue_name }}{% endblocktrans %}</th></tr> <tr class='row_columnheads'><th colspan='2'>{% blocktrans with ticket.queue as queue_name %}Queue: {{ queue_name }}{% endblocktrans %}</th></tr>
<tr class='{% cycle rowcolors %}'> <tr class='{% cycle 'row_odd' 'row_even' as rowcolors %}'>
<th>{% trans "Submitted On" %}</th> <th>{% trans "Submitted On" %}</th>
<td>{{ ticket.created|date:"r" }} ({{ ticket.created|timesince }} ago)</td> <td>{{ ticket.created|date:"r" }} ({{ ticket.created|timesince }} ago)</td>
</tr> </tr>

View File

@ -1,10 +1,9 @@
{% load i18n %} {% load i18n %}
{% cycle 'row_odd' 'row_even' as rowcolors %}
<table width='100%'> <table width='100%'>
<tr class='row_tablehead'><td>{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}]</td><td align='right'><a href='{% url helpdesk_edit ticket.id %}'><img src='{{ MEDIA_URL }}helpdesk/buttons/edit.png' alt='Edit' title='Edit' width='60' height='15' /></a><a href='{% url helpdesk_delete ticket.id %}'><img src='{{ MEDIA_URL }}helpdesk/buttons/delete.png' alt='Delete' title='Delete' width='60' height='15' /></a>{% if ticket.on_hold %}<a href='unhold/'>{% trans "Unhold" %}</a>{% else %}<a href='hold/'>{% trans "Hold" %}</a>{% endif %}</td></tr> <tr class='row_tablehead'><td colspan='2'>{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}] <span class='ticket_toolbar'><a href='{% url helpdesk_edit ticket.id %}'><img src='{{ MEDIA_URL }}helpdesk/buttons/edit.png' alt='Edit' title='Edit' width='60' height='15' /></a><a href='{% url helpdesk_delete ticket.id %}'><img src='{{ MEDIA_URL }}helpdesk/buttons/delete.png' alt='Delete' title='Delete' width='60' height='15' /></a>{% if ticket.on_hold %}<a href='unhold/'>{% trans "Unhold" %}</a>{% else %}<a href='hold/'>{% trans "Hold" %}</a>{% endif %}</span></td></tr>
<tr class='row_columnheads'><th colspan='2'>{% blocktrans with ticket.queue as queue %}Queue: {{ queue }}{% endblocktrans %}</th></tr> <tr class='row_columnheads'><th colspan='2'>{% blocktrans with ticket.queue as queue %}Queue: {{ queue }}{% endblocktrans %}</th></tr>
<tr class='{% cycle rowcolors %}'> <tr class='{% cycle 'row_odd' 'row_even' as rowcolors %}'>
<th>{% trans "Submitted On" %}</th> <th>{% trans "Submitted On" %}</th>
<td>{{ ticket.created|date:"r" }} ({{ ticket.created|timesince }} ago)</td> <td>{{ ticket.created|date:"r" }} ({{ ticket.created|timesince }} ago)</td>
</tr> </tr>