Skip to content
This repository has been archived by the owner on Jun 4, 2024. It is now read-only.

Commit

Permalink
Filled about page, changed footer look, moved links from menu to footer
Browse files Browse the repository at this point in the history 
Closes #4
  • Loading branch information
@rubenvanerk
rubenvanerk committed Jun 16, 2020
1 parent c5fb036 commit acc221b
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 20 deletions.
2 changes: 1 addition & 1 deletion lifesaving_rankings/static/src/sass/main.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ body:not(.loading) #content {

#content {
padding-top: 2em;
padding-bottom: 8em;
padding-bottom: 12em;
display: none;
}

Expand Down
71 changes: 70 additions & 1 deletion lifesaving_rankings/templates/lifesaving_rankings/about.html
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,79 @@
{% extends "lifesaving_rankings/base.html" %}
{% load django_bootstrap_breadcrumbs %}

{% block head_title %}
About
{% endblock %}

{% block breadcrumbs %}

{% breadcrumb "Home" "/" %}
{% breadcrumb "About" "about" %}

{% render_breadcrumbs "lifesaving_rankings/breadcrumb_template.html" %}

{% endblock %}

{% block content %}

<h1 class="ui header">About LifesavingRankings.com</h1>
<h1 class="ui header centered">About LifesavingRankings.com</h1>

<div class="ui centered grid">
<div class="ten wide column">
<p>
LifesavingRankings.com contains the latest rankings based on the times recorded in all major
international and national competitions for individual pool lifesaving competitions.<br>
LifesavingRankings.com is a project initiated and created by Ruben van Erk,
a web-developer and <a href="{% url 'athlete-overview' 'ruben-van-erk' %}">competitive lifesaver</a> from
The Netherlands.<br>
This website is open-source. Any help is appreciated.
Source code is available at <a href="https://github.com/rubenvanerk/lifesavingrankings" target="_blank">Github</a>.
</p>
<p>
LifesavingRankings.com is, and will always be free to use.
If you want to support what I'm doing, you can
<a href="https://www.buymeacoffee.com/RubenvanErk" target="_blank">buy me a coffee</a>!
</p>

<h2 class="ui header">About importing results</h2>
<p>
Results are imported from various sources with the use of <a
href="https://github.com/rubenvanerk/competition-parser" target="_blank">a program</a> created by
LifesavingRankings.com.
Most of these are in PDF format, which makes importing complicated due to the vast amount of different
formats.
Errors are easily made using this error-prone method.<br>
Please report missing competitions or any mistakes you may find to results@lifesavingrankings.com.
</p>
<p>
A common problem when importing results is duplicated athletes.
An athlete's name cannot be matched when it's spelled slightly different. When this happens, a new
profile is created.
You can easily report these duplicated profiles by searching for an athlete,
selecting the duplicates and hit the button at the top of the results: '<em>Report selected athletes as
duplicates</em>'.
</p>

{# <h2 class="ui header">About points</h2>#}
{# <p>#}
{# Points allows for comparison between different events and genders.#}
{# The points system is based on the world record from the previous year.#}
{# This world record will equal to 1000 points.#}
{# Every yea#}
{# </p>#}

<h2 class="ui header">Disclaimer</h2>
<p>
If you require any more information or have any questions about our site's disclaimer,
please feel free to contact us by email at ruben@lifesavingrankings.com
</p>
<p>
All the information on this website - wwww.lifesavingrankings.com - is published in good faith and for
general information purpose only. LifesavingRankings.com does not make any warranties about the
completeness, reliability and accuracy of this information. Any action you take upon the information you
find on this website (LifesavingRankings.com), is strictly at your own risk. LifesavingRankings.com will
not be liable for any losses and/or damages in connection with the use of our website.
</p>
</div>
</div>
{% endblock %}
29 changes: 12 additions & 17 deletions lifesaving_rankings/templates/lifesaving_rankings/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,7 @@
<a href="{% url 'competition-list' %}" class="item {% active 'competition-list' %}">Competitions</a>
<a href="{% url 'event-overview' %}" class="item {% active 'event-overview' %}">Events</a>
<a href="{% url 'public-group-list' %}" class="item {% active 'analysis' %}">Analysis</a>
<a href="{% url 'changelog' %}" class="{% active 'changelog' %} item">Changelog</a>
<a href="http://shop.lifesavingrankings.com" target="_blank" class="item">
Shop
<sup><i class="external alternate icon"></i></sup>
</a>
<a href="{% url 'about' %}" class="{% active 'about' %} item">About</a>

{% if request.user.is_staff %}
<a href="{% url 'merge-request-list' %}" class="item {% active 'merge-request-list' %}">Merge</a>
Expand Down Expand Up @@ -159,10 +155,7 @@
<a href="{% url 'competition-list' %}" class="item {% active 'competition-list' %}">Competitions</a>
<a href="{% url 'event-overview' %}" class="item {% active 'event-overview' %}">Events</a>
<a href="{% url 'public-group-list' %}" class="item {% active 'analysis' %}">Analysis</a>
<a href="{% url 'changelog' %}" class="item">Changelog</a>
<a href="http://shop.lifesavingrankings.com" target="_blank" class="item">
Shop <sup><i class="external alternate icon"></i></sup>
</a>
<a href="{% url 'about' %}" class="{% active 'about' %} item">About</a>

{% if request.user.is_staff %}
<a href="{% url 'merge-request-list' %}" class="item {% active 'merge-request-list' %}">Merge</a>
Expand Down Expand Up @@ -239,14 +232,16 @@ <h1><span class="de-emphasis">Lifesaving</span> Rankings</h1>
</div>

<footer id="footer" class="ui inverted center aligned grid">
<span class="item facebook">
<a href="https://www.facebook.com/LifesavingRankings/" target="_blank"><i
class="big facebook link icon"></i></a>
</span>
<span class="item">
Created by <a href="https://www.rubenvanerk.nl" target="_blank">Ruben van Erk</a><br>
Email: <a href="mailto:ruben@lifesavingrankings.com">ruben@lifesavingrankings.com</a>
</span>
<div class="ui horizontal inverted divider">
LifesavingRankings.com is created by <br>Ruben van Erk
</div>

<div class="ui horizontal inverted divided link list">
<a class="item" href="mailto:ruben@lifesavingrankings.com">ruben@lifesavingrankings.com</a>
<a class="item" href="https://www.facebook.com/LifesavingRankings/" target="_blank">Facebook</a>
<a class="item" href="https://shop.lifesavingrankings.com/">Shop</a>
<a class="item" href="{% url 'changelog' %}">Changelog</a>
</div>
</footer>

</div>
Expand Down
1 change: 1 addition & 0 deletions lifesaving_rankings/templates/lifesaving_rankings/changelog.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ <h1 class="ui header">Changelog</h1>
<h3 class="ui header">Added</h3>
<ul>
<li>Event top pages now have an option to show all times per athlete instead of just their PRs</li>
<li>New about page</li>
</ul>
<div id="2020.06.15" class="ui horizontal version divider">2020.06.15</div>
<h3 class="ui header">Fixed</h3>
Expand Down
2 changes: 1 addition & 1 deletion lifesaving_rankings/urls.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
urlpatterns = [
path('', rankings_views.FrontPageRecords.as_view(), name='home'),

path('about/', views.about),
path('about/', views.about, name='about'),
path('changelog/', views.changelog, name='changelog'),
path('ultimate-lifesaver/', views.ultimate_lifesaver),

Expand Down

0 comments on commit acc221b

Please sign in to comment.