Skip to content

Commit 3e68ee1

Browse files
tdunn891tdunn891
committed
Improved commenting of view_tickets, set screenshot modal to large
1 parent 59d4cb5 commit 3e68ee1

File tree

1 file changed

+23
-12
lines changed

1 file changed

+23
-12
lines changed

‎tickets/templates/view_ticket.html‎

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ <h3><i class="material-icons">pageview</i> View Ticket | {{ticket.id}}</h3>
3131
{% endif %}
3232
<div class="row">
3333
<div class="col-12">
34+
<!-- Ticket Summary -->
3435
<h4 class="display-5">{{ ticket.summary}}
3536
{% if ticket.ticket_type == "Bug" %}
3637
<i class="material-icons-outlined align-top" data-toggle="tooltip" title="Bug"
@@ -65,6 +66,7 @@ <h4 class="display-5">{{ ticket.summary}}
6566
<div class="col-12 col-md-7">
6667
<table class="table table-sm">
6768
<tbody>
69+
<!-- Ticket Priority -->
6870
<tr>
6971
<th>Priority:</th>
7072
<td>
@@ -79,6 +81,7 @@ <h4 class="display-5">{{ ticket.summary}}
7981
</span>
8082
</td>
8183
</tr>
84+
<!-- Ticket Status -->
8285
<tr>
8386
<th>Status:</th>
8487
{% if ticket.status == "New" %}
@@ -96,9 +99,11 @@ <h4 class="display-5">{{ ticket.summary}}
9699
data-placement="right">cancel</i><span class="d-none">Cancelled</span></td>
97100
{% endif %}
98101
</tr>
102+
<!-- Ticket Submitter -->
99103
<tr>
100104
<th class="align-middle">Submitter:</th>
101105
<td>
106+
<!-- Dropright menu with Email and Zoom actions -->
102107
<div class="dropright">
103108
<a href="#" class="badge badge-pill badge-info dropdown-toggle"
104109
data-toggle="dropdown" title="Mail to:" data-placement="left">
@@ -129,9 +134,11 @@ <h4 class="display-5">{{ ticket.summary}}
129134
</div>
130135
</td>
131136
</tr>
137+
<!-- Ticket Assignee -->
132138
<tr>
133139
<th class="align-middle">Assignee:</th>
134140
<td>
141+
<!-- Dropright menu with Email and Zoom actions -->
135142
<div class="dropright">
136143
<a href="#" class="badge badge-pill badge-info dropdown-toggle"
137144
data-toggle="dropdown" title="Mail to:" data-placement="left">
@@ -162,13 +169,16 @@ <h4 class="display-5">{{ ticket.summary}}
162169
</div>
163170
</td>
164171
</tr>
172+
<!-- Created Date & Time -->
165173
<tr>
166174
<th>Created:</th>
167175
<td>{{ ticket.created_date|date:"d/m/Y H:i" }}</td>
168176
</tr>
169177
<tr>
170178
<th>Resolved:</th>
171-
{% if ticket.resolved_date == None %}
179+
{% if ticket.status == "Cancelled" %}
180+
<td>N/A</td>
181+
{% elif ticket.resolved_date == None %}
172182
<td></td>
173183
{% else %}
174184
<td>{{ ticket.resolved_date|date:"d/m/Y H:i" }}</td>
@@ -183,29 +193,30 @@ <h4 class="display-5">{{ ticket.summary}}
183193
<td>{{ ticket.days_to_resolve }}</td>
184194
{% endif %}
185195
</tr>
196+
<!-- User-uploaded Screenshot -->
186197
<tr>
187198
<th>Screenshot:</th>
188199
{% if ticket.screenshot %}
189-
<!-- Modal trigger -->
200+
<!-- Modal trigger to open screenshot -->
190201
<td><a href="{{ ticket.screenshot.url }}" data-toggle="modal"
191202
data-target="#screenshotModal">{{ ticket.screenshot }}</a>
192203
</td>
193204
<!-- Screenshot Modal -->
194205
<div class="modal fade" id="screenshotModal" tabindex="-1" role="dialog"
195206
aria-labelledby="exampleModalLabel" aria-hidden="true">
196-
<div class="modal-dialog" role="document">
207+
<div class="modal-dialog modal-lg" role="document">
197208
<div class="modal-content">
198209
<div class="modal-body">
199210
<img data-src="{{ ticket.screenshot.url }}" class="lazyload"
200-
alt="{{ ticket.screenshot }}">
211+
id="modal-screenshot-img" alt="{{ ticket.screenshot }}">
201212
<br>
202213
<br>
203-
<span><b>Ticket: </b>{{ ticket.id }} | {{ ticket.summary }}</span>
204-
<span class="float-right"><b>Filename:</b> <a
205-
href="{{ ticket.screenshot.url }}" target="_blank" rel="noopener"
206-
data-toggle="tooltip" title="Open in New Tab"
214+
<p><b>Ticket: </b>{{ ticket.id }} | {{ ticket.summary }}</p>
215+
<p><b>Filename:</b> <a href="{{ ticket.screenshot.url }}" target="_blank"
216+
rel="noopener" data-toggle="tooltip" title="Open in New Tab"
207217
data-placement="bottom">
208-
{{ ticket.screenshot }}</a></span>
218+
{{ ticket.screenshot }}</a>
219+
</p>
209220
</div>
210221
<div class="modal-footer">
211222
<a href="{{ ticket.screenshot.url }}" class="btn btn-primary"
@@ -218,7 +229,6 @@ <h4 class="display-5">{{ ticket.summary}}
218229
</div>
219230
</div>
220231
</div>
221-
<!-- End modal -->
222232
{% else %}
223233
<td></td>
224234
{% endif %}
@@ -230,7 +240,7 @@ <h4 class="display-5">{{ ticket.summary}}
230240
<!-- If user is Submitter or Staff, User can Edit or Cancel -->
231241
<a class="btn btn-warning" href="{% url 'edit_ticket' ticket.id %}"><i
232242
class="material-icons-outlined align-bottom">edit</i> Edit Ticket</a>
233-
<!-- Status change via dropdown -->
243+
<!-- Status change via dropdown menu -->
234244
<div class="btn-group">
235245
<button class="btn btn-sm" type="button" data-toggle="dropdown" aria-haspopup="true"
236246
aria-expanded="false">
@@ -261,7 +271,7 @@ <h6 class="dropdown-header">Set to:</h6>
261271
</div>
262272
</div>
263273
{% else %}
264-
<!-- User does NOT have access to Edit or Cancel -->
274+
<!-- Message that User does NOT have access to Edit or Cancel -->
265275
<span>Note: Only the Submitter or Staff can Edit this Ticket<br></span>
266276
{% endif %}
267277
</div>
@@ -281,6 +291,7 @@ <h5><i class="material-icons">timeline</i> Recent Activity</h5>
281291
</div>
282292
</div>
283293
<hr>
294+
<!-- Comment section -->
284295
<div class="row">
285296
<div class="col col-12">
286297
<h5><i class="material-icons align-top">insert_comment</i> Comments ({{ comments.count }})</h5>

0 commit comments

Comments
 (0)