Skip to content

Commit 97fdc0c

Browse files
authored
Merge pull request #66 from dahorak/add-name-label-signoff-column-to-pending-and-finished-requests
Add Sign Off Name/Label columns to pending and finished requests tables
2 parents 530cf19 + 068a3f0 commit 97fdc0c

File tree

5 files changed

+66
-12
lines changed

5 files changed

+66
-12
lines changed

templates/base.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
{% endif %}
126126
<!-- End display queued requests if there are any -->
127127
<div class="row">
128-
<div class="col-lg-12">
128+
<div class="col-lg-7">
129129
<h3 class="page-header"><i class="fa fa fa-bars"></i>
130130
{% block pageheader_title %}
131131
Page Header Title
@@ -137,6 +137,8 @@ <h3 class="page-header"><i class="fa fa fa-bars"></i>
137137
{% endblock %}
138138
</ol>
139139
</div>
140+
{% block messages_area %}
141+
{% endblock %}
140142
</div>
141143
<!-- page start-->
142144
{% block content %}
@@ -187,4 +189,4 @@ <h3 class="page-header"><i class="fa fa fa-bars"></i>
187189
}
188190
</script>
189191
</body>
190-
</html>
192+
</html>

templates/includes/finished_requests_table.html

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="row">
2-
<div class="col-lg-9 justify-content-center">
2+
<div class="col-lg-12 justify-content-center">
33
<section class="panel">
44
<header class="panel-heading">
55
Finished Requests
@@ -15,6 +15,12 @@
1515
<th style="text-align: center">
1616
<i class="icon_document"></i> Description
1717
</th>
18+
<th style="text-align: center">
19+
<i class="icon_pencil"></i> Name / Label
20+
</th>
21+
<th style="text-align: center">
22+
<i class="icon_pens"></i> Sign Off
23+
</th>
1824
<th style="text-align: center">
1925
<i class="icon_search"></i> Status
2026
</th>
@@ -59,6 +65,24 @@
5965
</a>
6066
</td>
6167
<!-- Row Description End -->
68+
<!-- Row Label Start -->
69+
<td>
70+
{{ finishedqueue.data.name }}
71+
{{ finishedqueue.data.label }}
72+
<!--{{ finishedqueue.data.labels_string }}-->
73+
</td>
74+
<!-- Row Label End -->
75+
<!-- Row Signoff Start -->
76+
<td>
77+
{% if finishedqueue.data.link and finishedqueue.data.link != "None" %}
78+
<a href="{{ finishedqueue.data.link }}">
79+
{{ finishedqueue.data.signoff }}
80+
</a>
81+
{% else %}
82+
{{ finishedqueue.data.signoff }}
83+
{% endif %}
84+
</td>
85+
<!-- Row Signoff End -->
6286
<td>
6387
{{ finishedqueue.status }}
6488
</td>
@@ -96,7 +120,4 @@
96120
<!-- Pagination End -->
97121
</section>
98122
</div>
99-
<div id="messages-area" class="col-lg-3">
100-
101-
</div>
102-
</div>
123+
</div>

templates/includes/pending_requests_table.html

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="row">
2-
<div class="col-lg-9 justify-content-center">
2+
<div class="col-lg-12 justify-content-center">
33
<section class="panel">
44
<header class="panel-heading">
55
Pending Requests All Priorities
@@ -15,6 +15,12 @@
1515
<th style="text-align: center">
1616
<i class="icon_document"></i> Description
1717
</th>
18+
<th style="text-align: center">
19+
<i class="icon_pencil"></i> Name / Label
20+
</th>
21+
<th style="text-align: center">
22+
<i class="icon_pens"></i> Sign Off
23+
</th>
1824
<th style="text-align: center">
1925
<i class="icon_search"></i> Status
2026
</th>
@@ -91,6 +97,24 @@
9197
</a>
9298
</td>
9399
<!-- Row Description End -->
100+
<!-- Row Label Start -->
101+
<td>
102+
{{ rqueue.data.name }}
103+
{{ rqueue.data.label }}
104+
<!--{{ rqueue.data.labels_string }}-->
105+
</td>
106+
<!-- Row Label End -->
107+
<!-- Row Signoff Start -->
108+
<td>
109+
{% if rqueue.data.link and rqueue.data.link != "None" %}
110+
<a href="{{ rqueue.data.link }}">
111+
{{ rqueue.data.signoff }}
112+
</a>
113+
{% else %}
114+
{{ rqueue.data.signoff }}
115+
{% endif %}
116+
</td>
117+
<!-- Row Signoff End -->
94118
<td>
95119
{{ rqueue.status }}
96120
</td>
@@ -115,9 +139,6 @@
115139
</table>
116140
</section>
117141
</div>
118-
<div id="messages-area" class="col-lg-3">
119-
120-
</div>
121142
</div>
122143

123144
<!-- To tell to our users that the page needs to be refreshed, we will run this script -->
@@ -154,4 +175,4 @@
154175
}
155176
}, 10000);
156177
</script>
157-
<!-- To tell to our users that the page needs to be refreshed, we will run this script -->
178+
<!-- To tell to our users that the page needs to be refreshed, we will run this script -->

templates/rqueue/finished_requests.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
Finished Requests
1313
{% endblock %}
1414

15+
{% block messages_area %}
16+
<div id="messages-area" class="col-lg-5">
17+
</div>
18+
{% endblock %}
19+
1520
{% block content %}
1621
{% include 'includes/finished_requests_table.html' %}
1722
{% endblock %}

templates/rqueue/pending_requests.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
Pending Requests
1313
{% endblock %}
1414

15+
{% block messages_area %}
16+
<div id="messages-area" class="col-lg-5">
17+
</div>
18+
{% endblock %}
19+
1520
{% block content %}
1621
{% if pending_requests_amount > 0 %}
1722
{% include 'includes/pending_requests_table.html' %}

0 commit comments

Comments
 (0)