From 1742cb4e48c62c072ecb47f0a318c3b7564d737f Mon Sep 17 00:00:00 2001 From: tdunn891 Date: Thu, 26 Mar 2020 21:27:07 +0000 Subject: [PATCH 1/8] Clean up comments --- accounts/templates/index.html | 6 +- accounts/templates/profile.html | 50 +++---------- accounts/templates/user_list.html | 119 ++++++++++++++++++++---------- 3 files changed, 98 insertions(+), 77 deletions(-) diff --git a/accounts/templates/index.html b/accounts/templates/index.html index 370baa9..f670855 100644 --- a/accounts/templates/index.html +++ b/accounts/templates/index.html @@ -32,6 +32,9 @@

Issue and Feature tracking done right


Logged in as: {{ user.username }}

My Account

+ {% if user.is_authenticated and not user.profile.is_pro_user %} +

Go PRO

+ {% endif %} {% endif %} @@ -93,7 +96,8 @@
Nice

-

verified_user See Our Customers

+

verified_user See Our + Customers


diff --git a/accounts/templates/profile.html b/accounts/templates/profile.html index e376ede..031f13f 100644 --- a/accounts/templates/profile.html +++ b/accounts/templates/profile.html @@ -1,10 +1,12 @@ {% extends 'base.html' %} -{% block title %}{{ user }}'s Profile{% endblock %} -{% block page_heading %} account_circle My Account{% endblock %} +{% block title %}TrackIt | Account{% endblock %} +{% block page_heading %}account_circle Account +
+{% endblock %} +{% block container-class %}profile-container{% endblock %} {% block content %}
-

account_circle

Add Avatar

@@ -25,7 +27,10 @@ Email - {{ user.email }} Update + + {{ user.email }} + + Member Since @@ -40,45 +45,12 @@ {% if user.profile.is_pro_user %} PRO {% else %} - Basic + Basic Go PRO + {% endif %}
-
-
-

Plans

-
-
-
-
-
-
- {% if user.profile.is_pro_user %} -
BASIC
-

Max Tickets/Month: 10/month

- {% else %} -
BASIC Current
-

Max Tickets/Month: 10/month

-

Tickets Remaining This Month: placeholder

- {% endif %} -
-
-
-
- {% if user.profile.is_pro_user %} -
PRO Current Plan
-

Max Tickets/Month: Unlimited

-

Kanban View: Available

- {% else %} -
PRO
- Unlock Kanban View

-

9.90 EUR / month

-

Go PRO

- {% endif %} -
-
-
{% endblock %} diff --git a/accounts/templates/user_list.html b/accounts/templates/user_list.html index 73141a3..aebd0b1 100644 --- a/accounts/templates/user_list.html +++ b/accounts/templates/user_list.html @@ -1,50 +1,95 @@ {% extends 'base.html' %} -{% block title %}User List{% endblock %} -{% block page_heading %}people User List{% endblock %} +{% block title %}Trackit | Team{% endblock %} +{% block page_heading %}people Users ({{ users.count }}) +
+{% endblock %} {% block head %} - {% endblock %} +{% block container-class %}user-list-container{% endblock %} {% block content %} -
-
- - - - - - - - - - - - - - {% for user in users %} - - - - - - - - - - {% endfor %} - -
IDUserFirst NameLast NameRoleSuperUserEmail
{{ user.id }}{{ user.username }}{{ user.first_name }}{{ user.last_name }}placeholder{{ user.is_superuser }}{{ user.email }}
+ + + + +
+ + + +
{% endblock %} {% block scripts %} - + - {% endblock %} From fea4ae6675ff12f60bb873727bd3c8f58a4e58e8 Mon Sep 17 00:00:00 2001 From: tdunn891 Date: Thu, 26 Mar 2020 21:29:19 +0000 Subject: [PATCH 2/8] Improve styling of Add/view ticket, dashboard & kanban --- static/css/style.css | 32 +- tickets/templates/add_ticket.html | 56 +++- tickets/templates/dashboard.html | 11 +- tickets/templates/kanban.html | 252 +++++++++------ tickets/templates/view_ticket.html | 488 ++++++++++++++++++----------- 5 files changed, 531 insertions(+), 308 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index ba426cb..c3c0b0a 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -24,7 +24,7 @@ html { } .kanban-container { - max-width: 1400px; + max-width: 1600px; } .user-list-container, @@ -36,6 +36,10 @@ html { max-width: 1700px; } +#hide-cancelled-checkbox { + font-size: 15px; +} + /* Pie Chart and Row Chart labels */ .pie-label-group text, g .row { @@ -61,28 +65,34 @@ footer { padding-bottom: 32px; } +/* Update Status Dropdown */ +.dropdown-toggle { + opacity: 0.7; +} + .kanban-col { - margin: 0px; - padding: 0px; + margin: 3px; + padding: 3px; } .kanban-col .jumbotron { padding: 6px; } -.kanban-todo { - background-color: white; +.kanban-new .card { + background-color: lightblue; } -.kanban-resolved { - background-color: white; + +.kanban-in-progress .card { + background-color: lightgoldenrodyellow; } -.kanban-in-progress { - background-color: white; +.kanban-resolved .card { + background-color: #c3e6cb; } -.kanban-cancelled { - background-color: white; +.kanban-cancelled .card { + background-color: lightgrey; } /* From https://github.com/masagameplay/light-bootstrap-colors/blob/master/lightBSColors.css */ diff --git a/tickets/templates/add_ticket.html b/tickets/templates/add_ticket.html index 388297e..9b63463 100644 --- a/tickets/templates/add_ticket.html +++ b/tickets/templates/add_ticket.html @@ -1,29 +1,59 @@ {% extends "base.html" %} {% load static from staticfiles %} -{% load bootstrap_tags %} -{% block title %} -Add Ticket -{% endblock %} +{% load crispy_forms_tags %} +{% block title %}TrackIt | Add Ticket{% endblock %} {% block head %} {% endblock %} {% block page_heading %} -

Add Ticket

+add Add Ticket
{% endblock %} +{% block container-class %}add-ticket-container{% endblock %} {% block content %} -
-
-
- {% csrf_token %} - {{ form | as_bootstrap }} - -
- Cancel +
+
+
+
+ {% csrf_token %} +
+
+ {{ form.summary | as_crispy_field }} +
+
+ {{ form.description | as_crispy_field }} +
+
+ {{ form.ticket_type | as_crispy_field }} +
+
+ {{ form.priority | as_crispy_field }} +
+
+ {{ form.status | as_crispy_field }} +
+
+
+
+ {{ form.tags | as_crispy_field }} +
+
+
+
+ {{ form.screenshot | as_crispy_field }} +
+
+
+ + Cancel +
+
{% endblock %} {% block scripts %} + {% endblock %} diff --git a/tickets/templates/dashboard.html b/tickets/templates/dashboard.html index fe81840..8d7e616 100644 --- a/tickets/templates/dashboard.html +++ b/tickets/templates/dashboard.html @@ -33,6 +33,12 @@