Skip to content

Commit bf17c74

Browse files
tdunn891tdunn891
committed
Minor element changes to templates to conform with W3C standards
1 parent 1c30fdd commit bf17c74

File tree

9 files changed

+69
-53
lines changed

9 files changed

+69
-53
lines changed

‎accounts/templates/user_list.html‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
{% extends 'base.html' %}
2-
{% block title %}Trackit | Team{% endblock %}
3-
{% block page_heading %}<i class="material-icons heading-icon align-bottom">people</i> Users ({{ users.count }})
4-
<hr>
5-
{% endblock %}
62
{% block head %}
73
<link rel="stylesheet" type="text/css"
8-
href="https://cdn.datatables.net/v/bs4/jszip-2.5.0/dt-1.10.20/b-1.6.1/b-html5-1.6.1/cr-1.5.2/r-2.2.3/sp-1.0.1/sl-1.3.1/datatables.min.css" />
4+
href="https://cdn.datatables.net/v/bs4/jszip-2.5.0/dt-1.10.20/b-1.6.1/b-html5-1.6.1/cr-1.5.2/r-2.2.3/sp-1.0.1/sl-1.3.1/datatables.min.css">
5+
{% endblock %}
6+
{% block title %}Trackit | Team{% endblock %}
7+
{% block page_heading %}
8+
<h3>
9+
<i class="material-icons heading-icon align-bottom">people</i> Users ({{ users.count }})
10+
</h3>
11+
<hr>
912
{% endblock %}
1013
{% block container-class %}user-list-container{% endblock %}
1114
{% block content %}
@@ -97,7 +100,7 @@
97100
<tr>
98101
<td class="align-middle">
99102
{% if staff_member.profile.image %}
100-
<img src="{{ staff_member.profile.image.url }}" id="profile-image" alt="Profile Image"
103+
<img src="{{ staff_member.profile.image.url }}" alt="Profile Image"
101104
class="rounded-circle ticket-view-profile-image d-none d-sm-inline-block">
102105
{% else %}
103106
<i class="material-icons align-middle rounded-circle ticket-view-profile-default">
@@ -133,6 +136,6 @@
133136
{% endblock %}
134137
{% block scripts %}
135138
<!-- DataTables.js -->
136-
<script type="text/javascript"
139+
<script
137140
src="https://cdn.datatables.net/v/bs4/jszip-2.5.0/dt-1.10.20/b-1.6.1/b-html5-1.6.1/cr-1.5.2/r-2.2.3/sp-1.0.1/sl-1.3.1/datatables.min.js"></script>
138141
{% endblock %}

‎checkout/templates/checkout.html‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,21 @@
44
{% block title %}TrackIt | Checkout | Go PRO{% endblock %}
55
{% block head %}
66
<!-- Stripe JS -->
7-
<script type="text/javascript" src="https://js.stripe.com/v2/"></script>
8-
<script type="text/javascript">
7+
<script src="https://js.stripe.com/v2/"></script>
8+
<script>
99
//<![CDATA[
1010
Stripe.publishableKey = '{{ publishable }}';
1111
//]]>
1212
</script>
1313
<!-- Stripe JS -->
14-
<script type="text/javascript" src="{% static 'js/stripe.js' %}"></script>
14+
<script src="{% static 'js/stripe.js' %}"></script>
1515
{% endblock head %}
16-
{% block page_heading %}<span class="material-icons heading-icon">
17-
shopping_cart
18-
</span> Checkout<br>
19-
<hr>{% endblock %}
16+
{% block page_heading %}
17+
<h3>
18+
<span class="material-icons heading-icon">shopping_cart</span> Checkout
19+
</h3>
20+
<hr>
21+
{% endblock %}
2022
{% block container-class %}checkout-container{% endblock %}
2123
{% block content %}
2224
<div class="jumbotron mx-auto" id="checkout-jumbotron">
@@ -37,7 +39,7 @@ <h3>Go PRO</h3>
3739
</ul>
3840
<br>
3941
<p class="lead"><b>Total Due: 9.90 EUR (Single Payment)</b></p>
40-
<form role="form" method="post" id="payment-form" action="{% url 'checkout' %}" enctype="multipart/form-data">
42+
<form method="post" id="payment-form" action="{% url 'checkout' %}" enctype="multipart/form-data">
4143
{% csrf_token %}
4244
<div class="row">
4345
<div id="credit-card-errors">
@@ -92,17 +94,19 @@ <h3>Go PRO</h3>
9294
</div>
9395
<div class="col-6 col-lg-2">
9496
{{ payment_form.cvv | as_crispy_field }}
97+
{{ payment_form.stripe_id | as_crispy_field }}
9598
</div>
9699
</div>
97100
<hr>
98-
{{ payment_form.stripe_id | as_crispy_field }}
99-
<div class="col-md-12">
100-
<input class=" btn btn-primary" id="submit_payment_btn" name="commit" type="submit"
101-
value="Submit Payment">
102-
<a href="{% url 'tickets' %}" class="float-right">Cancel</a>
101+
<div class="row">
102+
<div class="col-md-12">
103+
<input class=" btn btn-primary" id="submit_payment_btn" name="commit" type="submit"
104+
value="Submit Payment">
105+
<a href="{% url 'tickets' %}" class="float-right">Cancel</a>
106+
</div>
103107
</div>
108+
</form>
104109
</div>
105-
</form>
106110
</div>
107111
</div>
108112
{% endblock %}

‎templates/base.html‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
1111
integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
1212
<!-- Material Icons -->
13-
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Material+Icons+Outlined" rel="stylesheet">
13+
<link href="https://fonts.googleapis.com/icon?family=Material+Icons%7CMaterial+Icons+Outlined" rel="stylesheet">
1414
<!-- jQuery -->
1515
<script src="https://code.jquery.com/jquery-3.4.1.min.js"
1616
integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
@@ -23,11 +23,11 @@
2323
integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
2424
crossorigin="anonymous"></script>
2525
<!-- Favicon -->
26-
<link rel="icon" type="image/png" href="{% static 'images/target_favicon.png' %}" />
26+
<link rel="icon" type="image/png" href="{% static 'images/target_favicon.png' %}">
2727
{% block head %}
2828
{% endblock %}
2929
<!-- style.css -->
30-
<link rel="stylesheet" href="{% static 'css/style.css' %}" />
30+
<link rel="stylesheet" href="{% static 'css/style.css' %}">
3131
</head>
3232

3333
<body>
@@ -72,7 +72,7 @@
7272
href="{% url 'profile' %}">
7373
{% if user.profile.image %}
7474
<img src="{{ user.profile.image.url }}" alt="My Profile Picture" id="account-profile-thumbnail"
75-
class="rounded-circle align-middle" width="38px">
75+
class="rounded-circle align-middle">
7676
{% else %}
7777
<i class="material-icons align-middle">account_circle</i>
7878
{% endif %}
@@ -93,7 +93,7 @@
9393
<!-- User not authenticated -->
9494
<a class="nav-item nav-link" href="{% url 'login' %}" id="login-nav-item">
9595
<i class="material-icons align-middle">input</i>
96-
Log In
96+
<span id="login-nav-text">Log In</span>
9797
</a>
9898
<a class="nav-item nav-link btn btn-primary" href="{% url 'registration' %}" id="register-nav-item">
9999
<i class="material-icons align-middle">person_add</i>Create Free Account
@@ -121,7 +121,7 @@
121121
<div class="row">
122122
<div class="col col-12">
123123
<br>
124-
<h3>{% block page_heading %}{% endblock %}</h3>
124+
{% block page_heading %}{% endblock %}
125125
</div>
126126
</div>
127127
{% block content %}
@@ -135,13 +135,12 @@ <h3>{% block page_heading %}{% endblock %}</h3>
135135
<div class="row">
136136
<div class="col-12 text-center">
137137
<p><a href="mailto:[email protected]">
138-
<i class="material-icons-outlined align-top">
139-
email </i> Contact Developer
138+
<i class="material-icons-outlined align-top">email</i> Contact Developer
140139
</a>
141140
</p>
142141
<p>
143142
<a href="https://github.com/tdunn891/milestone-3" target="_blank">
144-
<img src="{% static 'images/github-32.png' %}" id="github-logo" alt="GitHub Logo" />
143+
<img src="{% static 'images/github-32.png' %}" id="github-logo" alt="GitHub Logo">
145144
</a>
146145
</p>
147146
</div>

‎tickets/templates/add_ticket.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
<link rel="stylesheet" href="{% static 'css/bootstrap-tagsinput.css' %}">
77
{% endblock %}
88
{% block page_heading %}
9-
<i class="material-icons">add</i> Add Ticket
9+
<h3>
10+
<i class="material-icons">add</i> Add Ticket
11+
</h3>
1012
<hr>
1113
{% endblock %}
1214
{% block container-class %}add-ticket-container{% endblock %}

‎tickets/templates/dashboard.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,15 @@
77
<script src="https://d3js.org/d3-time-format.v2.min.js"></script>
88
<!-- dc.min.css -->
99
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/dc/3.1.9/dc.min.css"
10-
integrity="sha256-uq/xxnkXyjSgp47vyRtSvBEwWuxTFbtxbKwOxkmWIJM=" crossorigin="anonymous" />
10+
integrity="sha256-uq/xxnkXyjSgp47vyRtSvBEwWuxTFbtxbKwOxkmWIJM=" crossorigin="anonymous">
1111
{% endblock %}
1212
{% block container-class %}dashboard-container{% endblock %}
1313
{% block title %}TrackIt | Dashboard{% endblock %}
1414
{% block page_heading %}
15-
<i class="material-icons-outlined align-bottom heading-icon">assessment</i> Dashboard
1615
<div id="filtered-count" class="float-right"></div>
16+
<h3>
17+
<i class="material-icons-outlined align-bottom heading-icon">assessment</i> Dashboard
18+
</h3>
1719
<hr>
1820
{% endblock %}
1921
{% block content %}

‎tickets/templates/edit_ticket.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
<link rel="stylesheet" href="{% static 'css/bootstrap-tagsinput.css' %}">
77
{% endblock %}
88
{% block page_heading %}
9-
<i class="material-icons">edit</i> Edit Ticket | {{ ticket.id }}
9+
<h3>
10+
<i class="material-icons">edit</i> Edit Ticket | {{ ticket.id }}
11+
</h3>
1012
<hr>
1113
{% endblock %}
1214
{% block container-class %}edit-ticket-container{% endblock %}

‎tickets/templates/kanban.html‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
{% block title %}TrackIt | Kanban{% endblock %}
44
{% block container-class %}kanban-container{% endblock %}
55
{% block page_heading %}
6-
<i class="material-icons-outlined heading-icon align-bottom">view_week</i> Kanban ({{ tickets|length }})
7-
86
<div class="form-check float-right" id="hide-cancelled-checkbox">
97
<br>
108
<input type="checkbox" class="form-check-input" id="cancelled-checkbox" checked>
@@ -14,9 +12,12 @@
1412
</i> Hide Cancelled ({{ cancelled_tickets|length}})
1513
</label>
1614
</div>
17-
<hr>
15+
<h3>
16+
<i class="material-icons-outlined heading-icon align-bottom">view_week</i> Kanban ({{ tickets|length }})
17+
</h3>
1818
{% endblock %}
1919
{% block content %}
20+
<hr>
2021
<div class="row">
2122
<!-- 'New' Column -->
2223
<div class="col-md-4 kanban-col">

‎tickets/templates/tickets.html‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@
33
{% block head %}
44
<!-- DataTables.net css -->
55
<link rel="stylesheet" type="text/css"
6-
href="https://cdn.datatables.net/v/bs4/jszip-2.5.0/dt-1.10.20/b-1.6.1/b-html5-1.6.1/cr-1.5.2/r-2.2.3/sp-1.0.1/sl-1.3.1/datatables.min.css" />
6+
href="https://cdn.datatables.net/v/bs4/jszip-2.5.0/dt-1.10.20/b-1.6.1/b-html5-1.6.1/cr-1.5.2/r-2.2.3/sp-1.0.1/sl-1.3.1/datatables.min.css">
77
{% endblock %}
88
{% block page_heading %}
9-
<i class="material-icons-outlined align-bottom heading-icon">confirmation_number</i> Tickets ({{ tickets.count }})
10-
<a class="btn btn-primary float-right" href="{% url 'add_ticket' %}"><span class="d-none d-md-inline-block">Raise
11-
Ticket</span>
12-
<i class="material-icons align-bottom">add</i>
13-
</a>
14-
<hr>
9+
<h3>
10+
<i class="material-icons-outlined align-bottom heading-icon">confirmation_number</i> Tickets ({{ tickets.count }})
11+
<a class="btn btn-primary float-right" href="{% url 'add_ticket' %}">
12+
<span class="d-none d-md-inline-block">Raise Ticket</span>
13+
<i class="material-icons align-bottom">add</i>
14+
</a>
15+
</h3>
1516
{% endblock %}
1617
{% block container-class %}tickets-container{% endblock %}
1718
{% block content %}
19+
<hr>
1820
<div class="row">
1921
<div class="col-12" id="tickets-table-col">
2022
<a href="{% url 'tickets' %}" class="btn btn-light btn-sm float-right">Reset</a>
@@ -59,13 +61,11 @@
5961
<td>{{ ticket.submitted_by }}</td>
6062
<td>{{ ticket.assigned_to }}</td>
6163
{% if ticket.priority == "Low" %}
62-
<td><span class="badge badge-light">{{ ticket.priority }}</span></td>
64+
<td><span class="badge badge-light"><span class="d-none">1</span> {{ ticket.priority }}</span></td>
6365
{% elif ticket.priority == "Medium" %}
64-
<td><span class="badge badge-warning">{{ ticket.priority }}</span></td>
65-
{% elif ticket.priority == "High" %}
66-
<td><span class="badge badge-danger">{{ ticket.priority }}</span></td>
67-
{% else %}
68-
<td><span class="badge badge-light">{{ ticket.priority }}</span></td>
66+
<td><span class="badge badge-warning"><span class="d-none">2</span> {{ ticket.priority }}</span></td>
67+
{% else %}
68+
<td><span class="badge badge-danger"><span class="d-none">3</span> {{ ticket.priority }}</span></td>
6969
{% endif %}
7070
<!-- Ticket Status Icon -->
7171
{% if ticket.status == "New" %}
@@ -111,8 +111,8 @@
111111
{% endblock %}
112112
{% block scripts %}
113113
<!-- VFS Fonts js -->
114-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
114+
<script src="https://cdnjs.cloudflare.com/ajax/libs/pdfmake/0.1.36/vfs_fonts.js"></script>
115115
<!-- DataTables js -->
116-
<script type="text/javascript"
116+
<script
117117
src="https://cdn.datatables.net/v/bs4/jszip-2.5.0/dt-1.10.20/b-1.6.1/b-html5-1.6.1/cr-1.5.2/r-2.2.3/sp-1.0.1/sl-1.3.1/datatables.min.js"></script>
118118
{% endblock %}

‎tickets/templates/view_ticket.html‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
{% load bootstrap_tags %}
33
{% block title %}TrackIt | View Ticket | {{ ticket.id }}{% endblock %}
44
{% block container-class %}view-ticket-container{% endblock %}
5-
{% block page_heading %}<i class="material-icons">pageview</i> View Ticket | {{ticket.id}}
5+
{% block page_heading %}
6+
<h3>
7+
<i class="material-icons">pageview</i> View Ticket | {{ticket.id}}
8+
</h3>
69
<hr>
710
{% endblock %}
811
{% block content %}

0 commit comments

Comments
 (0)