Skip to content

Commit a696038

Browse files
tdunn891tdunn891
committed
Changed div containers to container fluid in base.html
1 parent f1f4025 commit a696038

File tree

1 file changed

+80
-50
lines changed

1 file changed

+80
-50
lines changed

‎templates/base.html‎

Lines changed: 80 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -5,93 +5,123 @@
55
<head>
66
<meta charset="UTF-8">
77
<meta name="viewport" content="width=device-width, initial-scale=1.0">
8+
<title>{% block title %}{% endblock %}</title>
9+
<!-- Bootstrap.css -->
810
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
911
integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
10-
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
1112
<!-- Material Icons -->
1213
<link href="https://fonts.googleapis.com/icon?family=Material+Icons|Material+Icons+Outlined" rel="stylesheet">
13-
<!-- Roboto -->
14-
<link href="https://fonts.googleapis.com/css?family=Roboto&display=swap" rel="stylesheet">
15-
<!-- Open Sans -->
16-
<link href="https://fonts.googleapis.com/css?family=Open+Sans&display=swap" rel="stylesheet">
17-
<link rel="stylesheet" href="{% static 'css/style.css' %}" />
14+
<!-- jQuery -->
15+
<script src="https://code.jquery.com/jquery-3.4.1.min.js"
16+
integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
17+
<!-- popper.js -->
18+
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"
19+
integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"
20+
crossorigin="anonymous"></script>
21+
<!-- Bootstrap.js -->
22+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"
23+
integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
24+
crossorigin="anonymous"></script>
25+
<!-- Favicon -->
26+
<!-- <link rel="icon"
27+
type="image/png"
28+
href="/somewhere/myicon.png" /> -->
1829
{% block head %}
1930
{% endblock %}
20-
<title>{% block title %}{% endblock %}</title>
31+
<!-- style.css -->
32+
<link rel="stylesheet" href="{% static 'css/style.css' %}" />
2133
</head>
2234

2335
<body>
24-
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
25-
<a class="navbar-brand" href="{% url 'tickets' %}"><i class="material-icons align-top">track_changes</i>
26-
TrackIt</a>
36+
<nav class="navbar navbar-expand-lg bg-light">
37+
<a class="navbar-brand" href="{% url 'index' %}">
38+
<i class="material-icons align-top">track_changes</i> <b>TrackIt</b>
39+
</a>
40+
<span class="navbar-text">Focus on what matters</span>
2741
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavAltMarkup"
2842
aria-controls="navbarNavAltMarkup" aria-expanded="false" aria-label="Toggle navigation">
2943
<span class="navbar-toggler-icon"></span>
3044
</button>
3145
<div class="collapse navbar-collapse justify-content-end" id="navbarNavAltMarkup">
3246
<div class="navbar-nav">
3347
{% if user.is_authenticated %}
34-
<a class="nav-item nav-link active" href="{% url 'tickets' %}">Tickets <i
48+
<a class="nav-item nav-link active" data-toggle="tooltip" href="{% url 'tickets' %}" title="Tickets"><i
3549
class="material-icons-outlined align-bottom">confirmation_number</i><span
36-
class="sr-only">(current)</span></a>
37-
<!-- <a class="nav-item nav-link" href="{% url 'add_ticket' %}">Raise Ticket <i
38-
class="material-icons align-bottom">add</i></a> -->
39-
<a class="nav-item nav-link" href="{% url 'dashboard' %}">Dashboard <i
50+
class="sr-only">(current)</span>
51+
</a>
52+
<a class="nav-item nav-link" data-toggle="tooltip" title="Dashboard" href="{% url 'dashboard' %}"><i
4053
class="material-icons-outlined align-bottom">assessment</i>
4154
</a>
42-
<a class="nav-item nav-link" href="{% url 'kanban' %}">Kanban <i
55+
<a class="nav-item nav-link" data-toggle="tooltip" title="Kanban" href="{% url 'kanban' %}"><i
4356
class="material-icons-outlined align-bottom">view_week</i>
4457
</a>
45-
<a class="nav-item nav-link" href="{% url 'user_list' %}">Team <i
46-
class="material-icons-outlined align-bottom">people</i></a>
47-
<a class="nav-item nav-link" href="{% url 'profile' %}">Profile: {{ user }}</a>
48-
<a class="nav-item nav-link" href="{% url 'logout' %}">Logout <i
58+
<a class="nav-item nav-link" data-toggle="tooltip" title="Team" href="{% url 'user_list' %}"><i
59+
class="material-icons-outlined align-bottom">people</i>
60+
</a>
61+
<a class="nav-item nav-link" data-toggle="tooltip" title="Account" href="{% url 'profile' %}"><i
62+
class="material-icons align-top">
63+
account_circle</i> {{ user }}
64+
</a>
65+
{% if not user.profile.is_pro_user %}
66+
<a href="{% url 'checkout' %}" class="btn btn-outline-primary nav-item nav-link">Go PRO</a>
67+
{% endif %}
68+
<a class="nav-item nav-link" data-toggle="tooltip" title="Logout" href="{% url 'logout' %}"><i
4969
class="material-icons-outlined align-bottom">exit_to_app</i></a>
5070
{% else %}
51-
<a class="nav-item nav-link" href="{% url 'login' %}">Log In</a>
52-
<a class="nav-item nav-link" href="{% url 'registration' %}">Register</a>
71+
<!-- User not authenticated -->
72+
<a class="nav-item nav-link" href="{% url 'login' %}">
73+
<i class="material-icons align-middle">input</i>
74+
Log In
75+
</a>
76+
<a class="nav-item nav-link btn btn-primary" href="{% url 'registration' %}">
77+
<i class="material-icons align-middle">person_add</i>Create Free Account
78+
</a>
5379
{% endif %}
5480
</div>
5581
</div>
5682
</nav>
57-
<div class="container">
83+
84+
<div class="container-fluid {% block container-class %}{% endblock %}">
85+
<div class="row">
86+
<div class="col">
87+
{% if messages %}
88+
{% for message in messages %}
89+
<div class="alert {{ message.tags }} alert-dismissible fade show" role="alert">
90+
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
91+
<span aria-hidden="true">&times;</span>
92+
</button>
93+
{{ message }}
94+
</div>
95+
{% endfor %}
96+
{% endif %}
97+
</div>
98+
</div>
5899
<div class="row">
59100
<div class="col col-12">
60101
<br>
61-
<h2>{% block page_heading %}{% endblock %}</h2>
62-
<hr>
102+
<h3>{% block page_heading %}{% endblock %}</h3>
63103
</div>
64104
</div>
65105
{% block content %}
66106
{% endblock %}
67107
</div>
68108
<!-- footer -->
69-
<hr>
70-
<footer class="container-fluid" style="height: 120px;">
71-
<div class="row">
72-
<div class="col col-12 text-center">
73-
<p>TrackIt</p>
74-
<!-- <p>Developed by Thomas Dunn</p> -->
109+
<div class="container-fluid bg-light">
110+
<footer style="min-height: 140px;">
111+
<hr>
112+
<div class="row">
113+
<div class="col-12 text-center">
114+
<p><a href="mailto:[email protected]"><i class="material-icons-outlined align-top">
115+
email
116+
</i> Contact Developer
117+
</a>
118+
</p>
119+
</div>
75120
</div>
76-
</div>
77-
</footer>
78-
<!-- jQuery -->
79-
<script src="https://code.jquery.com/jquery-3.4.1.min.js"
80-
integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
81-
<!-- popper.js -->
82-
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js"
83-
integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49"
84-
crossorigin="anonymous"></script>
85-
<!-- bootstrap -->
86-
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js"
87-
integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy"
88-
crossorigin="anonymous"></script>
89-
<!-- initialize tooltips -->
90-
<script>
91-
$(function () {
92-
$('[data-toggle="tooltip"]').tooltip()
93-
})
94-
</script>
121+
</footer>
122+
</div>
123+
<!-- base.js -->
124+
<script src="{% static 'js/base.js' %}"></script>
95125
{% block scripts %}
96126
{% endblock %}
97127
</body>

0 commit comments

Comments
 (0)