Skip to content

Commit

Permalink
Test & Validate all files
Browse files Browse the repository at this point in the history
HTML validated against W3C
CSS validated against W3C Jigsaw
JS validated against JSHint and BeautifyTools
Python validated against PEP8online

Minor corrections on 5 HTML files were required.
  • Loading branch information
TravelTimN committed Jul 29, 2019
1 parent 2196a95 commit 416a5e4
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 26 deletions.
12 changes: 6 additions & 6 deletions project/stats/templates/statistics.html
Original file line number Diff line number Diff line change
Expand Up @@ -49,37 +49,37 @@ <h2 class="text-shadow-2 font-londrina">Top 3 Supporters</h2>
lazyload="on">
{% if forloop.first %}
<!-- if 1st - make GOLD -->
<span class="gold-text bold">
<div class="gold-text bold">
<span class="title upper">GOLD MEDAL</span>
<p>{{ top_user.user.username }}<br>
&euro;{{ top_user.total_donated }} donated
</p>
<span class="secondary-content">
<i class="fas fa-trophy fa-lg fa-fw gold-text"></i>
</span>
</span>
</div>
{% elif forloop.last %}
<!-- elif 3rd - make BRONZE -->
<span class="bronze-text bold">
<div class="bronze-text bold">
<span class="title upper">BRONZE MEDAL</span>
<p>{{ top_user.user.username }}<br>
&euro;{{ top_user.total_donated }} donated
</p>
<span class="secondary-content">
<i class="fas fa-trophy fa-lg fa-fw bronze-text"></i>
</span>
</span>
</div>
{% else %}
<!-- elif 2nd - make SILVER -->
<span class="silver-text bold">
<div class="silver-text bold">
<span class="title upper">SILVER MEDAL</span>
<p>{{ top_user.user.username }}<br>
&euro;{{ top_user.total_donated }} donated
</p>
<span class="secondary-content">
<i class="fas fa-trophy fa-lg fa-fw silver-text"></i>
</span>
</span>
</div>
{% endif %}
</li>
{% endfor %}
Expand Down
4 changes: 2 additions & 2 deletions project/templates/partials/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<div class="col s4 center-align">
{% if user.is_authenticated %}
<a href="{% url 'profile' %}">
<img src="{{ user.profile.image.url }}" width="50px" height="50px" alt="{{ user }}"
<img src="{{ user.profile.image.url }}" width="50" height="50" alt="{{ user }}"
class="circle white" lazyload="on">
</a>
{% else %}
<img src="{% static 'img/user.png' %}" width="50px" height="50px" alt="Guest" class="circle"
<img src="{% static 'img/user.png' %}" width="50" height="50" alt="Guest" class="circle"
lazyload="on">
{% endif %}
</div>
Expand Down
4 changes: 2 additions & 2 deletions project/tickets/templates/partials/ticket_card.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ <h2 class="bold truncate">
</span>
<br>
Author:
<img src="{{ ticket.author.profile.image.url }}" style="vertical-align:middle" width="25px"
height="25px" alt="{{ ticket.author }}" class="circle white" lazyload="on">
<img src="{{ ticket.author.profile.image.url }}" style="vertical-align:middle" width="25"
height="25" alt="{{ ticket.author }}" class="circle white" lazyload="on">
{{ ticket.author.username }}
</small>
</h2>
Expand Down
5 changes: 3 additions & 2 deletions project/tickets/templates/partials/ticket_filter.html
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,9 @@ <h2>Filter</h2>
</legend>
<button type="submit" class="btn blue bold text-shadow-2"
formaction="#filter">Search</button><br><br>
<a href="{% url 'tickets_view_all' %}" class="btn red bold text-shadow-2"
formaction="#filter">Reset</a>
<a href="{% url 'tickets_view_all' %}" class="btn red bold text-shadow-2">
Reset
</a>
</fieldset>
</div>

Expand Down
28 changes: 14 additions & 14 deletions project/tickets/templates/partials/ticket_stats.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<!-- author -->
<div class="col s6">
<img src="{{ ticket.author.profile.image.url }}" width="85px" height="85px"
<img src="{{ ticket.author.profile.image.url }}" width="85" height="85"
alt="{{ ticket.author }}" class="circle white tooltipped"
data-position="bottom" data-tooltip="AUTHOR" lazyload="on">
<br>
Expand All @@ -23,13 +23,13 @@ <h1 class="i-stats {% include './ticket_status_color.html' %}-text">
{% if user.is_superuser %}
<!-- if superuser / admin ... then allow editing of ticket status -->
<a href="{% url 'admin_ticket_status' ticket.id %}?tkt_status=1"
type="submit" class="btn btn-admin red tooltipped" data-position="top"
class="btn btn-admin red tooltipped" data-position="top"
data-tooltip="Open"></a>
<a href="{% url 'admin_ticket_status' ticket.id %}?tkt_status=2"
type="submit" class="btn btn-admin amber tooltipped" data-position="top"
class="btn btn-admin amber tooltipped" data-position="top"
data-tooltip="In Progress"></a>
<a href="{% url 'admin_ticket_status' ticket.id %}?tkt_status=3"
type="submit" class="btn btn-admin green tooltipped" data-position="top"
class="btn btn-admin green tooltipped" data-position="top"
data-tooltip="Closed"></a>
<br><small>edit status</small>
{% else %}
Expand All @@ -53,23 +53,23 @@ <h1 class="i-stats {% include './ticket_status_color.html' %}-text">
<div class="row bold">
<!-- total views -->
<div class="col s6">
<span class="{% include './ticket_status_color.html' %}-text">
<div class="{% include './ticket_status_color.html' %}-text">
<h1 class="i-stats">
<i class="far fa-eye tooltipped" data-position="bottom"
data-tooltip="VIEWS"></i>
</h1>
</span>
</div>
{{ ticket.views }}
</div>

<!-- total upvotes -->
<div class="col s6">
<span class="{% include './ticket_status_color.html' %}-text">
<div class="{% include './ticket_status_color.html' %}-text">
<h1 class="i-stats">
<i class="far fa-thumbs-up tooltipped" data-position="bottom"
data-tooltip="UPVOTES"></i>
</h1>
</span>
</div>
{{ ticket.upvotes }}
{% if user.id in voters %}
<i class="fas fa-check fa-lg green-text tooltipped" data-position="top"
Expand All @@ -81,12 +81,12 @@ <h1 class="i-stats">
<div class="row bold">
<!-- date created -->
<div class="col s6">
<span class="{% include './ticket_status_color.html' %}-text">
<div class="{% include './ticket_status_color.html' %}-text">
<h1 class="i-stats">
<i class="far fa-calendar-plus tooltipped" data-position="bottom"
data-tooltip="DATE CREATED"></i>
</h1>
</span>
</div>
{{ ticket.date_created|naturalday:"d E, Y"|upper }}<br>
<small>{{ ticket.date_created|time:"@H:i (T)" }}</small>
</div>
Expand Down Expand Up @@ -116,23 +116,23 @@ <h1 class="i-stats">
<div class="row bold">
<!-- donations gross total -->
<div class="col s6">
<span class="{% include './ticket_status_color.html' %}-text">
<div class="{% include './ticket_status_color.html' %}-text">
<h1 class="i-stats">
<i class="fas fa-hand-holding-usd tooltipped" data-position="bottom"
data-tooltip="DONATIONS"></i>
</h1>
</span>
</div>
&euro;{{ ticket.total_donations }}
</div>

<!-- donations percentage -->
<div class="col s6">
<span class="{% include './ticket_status_color.html' %}-text">
<div class="{% include './ticket_status_color.html' %}-text">
<h1 class="i-stats">
<i class="fas fa-trophy tooltipped" data-position="bottom"
data-tooltip="GOAL"></i>
</h1>
</span>
</div>
{{ ticket.total_donations }}%
</div>
</div>
Expand Down

0 comments on commit 416a5e4

Please sign in to comment.