Skip to content

Commit fea4ae6

Browse files
tdunn891tdunn891
committed
Improve styling of Add/view ticket, dashboard & kanban
1 parent 1742cb4 commit fea4ae6

File tree

5 files changed

+531
-308
lines changed

5 files changed

+531
-308
lines changed

‎static/css/style.css‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ html {
2424
}
2525

2626
.kanban-container {
27-
max-width: 1400px;
27+
max-width: 1600px;
2828
}
2929

3030
.user-list-container,
@@ -36,6 +36,10 @@ html {
3636
max-width: 1700px;
3737
}
3838

39+
#hide-cancelled-checkbox {
40+
font-size: 15px;
41+
}
42+
3943
/* Pie Chart and Row Chart labels */
4044
.pie-label-group text,
4145
g .row {
@@ -61,28 +65,34 @@ footer {
6165
padding-bottom: 32px;
6266
}
6367

68+
/* Update Status Dropdown */
69+
.dropdown-toggle {
70+
opacity: 0.7;
71+
}
72+
6473
.kanban-col {
65-
margin: 0px;
66-
padding: 0px;
74+
margin: 3px;
75+
padding: 3px;
6776
}
6877

6978
.kanban-col .jumbotron {
7079
padding: 6px;
7180
}
7281

73-
.kanban-todo {
74-
background-color: white;
82+
.kanban-new .card {
83+
background-color: lightblue;
7584
}
76-
.kanban-resolved {
77-
background-color: white;
85+
86+
.kanban-in-progress .card {
87+
background-color: lightgoldenrodyellow;
7888
}
7989

80-
.kanban-in-progress {
81-
background-color: white;
90+
.kanban-resolved .card {
91+
background-color: #c3e6cb;
8292
}
8393

84-
.kanban-cancelled {
85-
background-color: white;
94+
.kanban-cancelled .card {
95+
background-color: lightgrey;
8696
}
8797

8898
/* From https://github.com/masagameplay/light-bootstrap-colors/blob/master/lightBSColors.css */

‎tickets/templates/add_ticket.html‎

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,59 @@
11
{% extends "base.html" %}
22
{% load static from staticfiles %}
3-
{% load bootstrap_tags %}
4-
{% block title %}
5-
Add Ticket
6-
{% endblock %}
3+
{% load crispy_forms_tags %}
4+
{% block title %}TrackIt | Add Ticket{% endblock %}
75
{% block head %}
86
<link rel="stylesheet" href="{% static 'css/bootstrap-tagsinput.css' %}">
97
{% endblock %}
108
{% block page_heading %}
11-
<h2>Add Ticket</h2>
9+
<i class="material-icons">add</i> Add Ticket
1210
<hr>
1311
{% endblock %}
12+
{% block container-class %}add-ticket-container{% endblock %}
1413
{% block content %}
15-
<div class="row">
16-
<div class="col col-8">
17-
<form method="post" enctype="multipart/form-data">
18-
{% csrf_token %}
19-
{{ form | as_bootstrap }}
20-
<button class="btn btn-primary" type="submit">Submit</button>
21-
</form>
22-
<a class="btn" href="{% url 'tickets' %}">Cancel</a>
14+
<div class="jumbotron mx-auto" style="max-width: 1400px;">
15+
<div class="row">
16+
<div class="col-12">
17+
<form method="post" enctype="multipart/form-data">
18+
{% csrf_token %}
19+
<div class="row">
20+
<div class="col-md-12 col-lg-6">
21+
{{ form.summary | as_crispy_field }}
22+
</div>
23+
<div class="col-12">
24+
{{ form.description | as_crispy_field }}
25+
</div>
26+
<div class="col-sm-12 col-md-4 col-lg-3">
27+
{{ form.ticket_type | as_crispy_field }}
28+
</div>
29+
<div class="col-sm-12 col-md-4 col-lg-3">
30+
{{ form.priority | as_crispy_field }}
31+
</div>
32+
<div class="col-sm-12 col-md-4 col-lg-3">
33+
{{ form.status | as_crispy_field }}
34+
</div>
35+
</div>
36+
<div class="row">
37+
<div class="col col-md-8 col-lg-6">
38+
{{ form.tags | as_crispy_field }}
39+
</div>
40+
</div>
41+
<div class="row">
42+
<div class="col">
43+
{{ form.screenshot | as_crispy_field }}
44+
</div>
45+
</div>
46+
<hr>
47+
<button class="btn btn-primary" type="submit" style="min-width: 180px;"><span
48+
class="material-icons align-bottom">send</span> Submit</button>
49+
<a class="" href="{% url 'tickets' %}">Cancel</a>
50+
</form>
51+
</div>
2352
</div>
2453
</div>
2554
{% endblock %}
2655

2756
{% block scripts %}
57+
<!-- Bootstrap tags input js -->
2858
<script type="text/javascript" src="{% static 'js/bootstrap-tagsinput.js' %}"></script>
2959
{% endblock %}

‎tickets/templates/dashboard.html‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@
3333
<!-- Tickets Pane -->
3434
<div class="tab-pane fade show active" id="nav-tickets" role="tabpanel" aria-labelledby="nav-tickets-tab">
3535
<br>
36+
<div class="row">
37+
<div class="col-12">
38+
<div id="submitted-by-dropdown"></div>
39+
<br>
40+
</div>
41+
</div>
3642
<div class="row">
3743
<div class="col col-md-8">
3844
<div class="jumbotron text-center">
@@ -71,8 +77,7 @@ <h5 class="lead">In-Demand Tickets</h5>
7177
</div>
7278
</div>
7379
</div>
74-
<hr>
75-
<div class="row">
80+
<!-- <div class="row">
7681
<div class="col-12">
7782
<div class="jumbotron text-center">
7883
<h5 class="lead">Age vs Priority Scatter</h5>
@@ -87,7 +92,7 @@ <h5 class="lead">Average Days to Resolve</h5>
8792
<div id="average-days-to-resolve"></div>
8893
</div>
8994
</div>
90-
</div>
95+
</div> -->
9196
</div>
9297
<!-- placeholder Pane -->
9398
<div class="tab-pane fade show" id="nav-ph" role="tabpanel" aria-labelledby="nav-ph-tab">

0 commit comments

Comments
 (0)