sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

race to challenge rename

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-19 08:03:30 +02:00
parent 4d260ab8e6
commit c062d8c0da
10 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rowers/templates/indoorvirtualeventcreate.html
View File

@@ -2,19 +2,19 @@
{% load staticfiles %}
{% load rowerfilters %}
{% block title %}New Virtual Race{% endblock %}
{% block title %}New Virtual Challenge{% endblock %}
{% block main %}
<h1>New Indoor Virtual Race</h1>
<h1>New Indoor Virtual Challenge</h1>
<ul class="main-content">
<li class="grid_4">
<p>With this form, you can create a new virtual race. After you submit
the form, the race is created and will be visible to all users. From
that moment, only the site admin can delete the race
(admin@rowsandall.com). You can still edit the race until
the start of the race window.
<p>With this form, you can create a new virtual challenge. After you submit
the form, the challenge is created and will be visible to all users. From
that moment, only the site admin can delete the challenge
(admin@rowsandall.com). You can still edit the challenge until
the start of the challenge window.
</p>
</li>
@@ -45,9 +45,9 @@
<p>If your event has a registration closure deadline, participants
have to enter (and can withdraw) before the registration closure time.</p>
<p>Participants can submit results until the evaluation closure time.</p>
<p>Until one hour after evaluation closure time, the race organizer
<p>Until one hour after evaluation closure time, the challenge organizer
can review and reject submitted results ("disqualification"). If
you as the race organizer intend to use this functionality, it
you as the challenge organizer intend to use this functionality, it
is strongly recommended that you fill out a contact email or phone
number.
</p>

12
rowers/templates/menu_racing.html
View File

@@ -2,17 +2,17 @@
<ul class="cd-accordion-menu animated">
<li id="races-list">
<a href="/rowers/virtualevents/">
<i class="fas fa-flag-checkered fa-fw"></i>&nbsp;Races
<i class="fas fa-flag-checkered fa-fw"></i>&nbsp;Challenges
</a>
</li>
<li id="races-new">
<a href="/rowers/virtualevent/create/">
<i class="far fa-flag fa-fw"></i>&nbsp;New Race
<i class="far fa-flag fa-fw"></i>&nbsp;New Challenge
</a>
</li>
<li id="indoor-new">
<a href="/rowers/virtualevent/createindoor/">
<i class="far fa-flag fa-fw"></i>&nbsp;New Indoor Race
<i class="far fa-flag fa-fw"></i>&nbsp;New Indoor Challenge
</a>
</li>
{% if race %}
@@ -52,7 +52,7 @@
</li>
<li>
<a href="/rowers/workout/upload/">
<i class="fas fa-file-upload fa-fw"></i>&nbsp;Upload your race result
<i class="fas fa-file-upload fa-fw"></i>&nbsp;Upload your Challenge result
</a>
</li>
<li>
@@ -78,10 +78,10 @@
{% if button == 'editbutton' %}
<li>
{% if race.sessiontype == 'race' %}
<a href="/rowers/virtualevent/{{ race.id }}/edit/"><i class="fas fa-pencil-alt fa-fw"></i>&nbsp;Edit Race
<a href="/rowers/virtualevent/{{ race.id }}/edit/"><i class="fas fa-pencil-alt fa-fw"></i>&nbsp;Edit Challenge
</a>
{% else %}
<a href="/rowers/virtualevent/{{ race.id }}/editindoor/"><i class="fas fa-pencil-alt fa-fw"></i>&nbsp;Edit Race
<a href="/rowers/virtualevent/{{ race.id }}/editindoor/"><i class="fas fa-pencil-alt fa-fw"></i>&nbsp;Edit Challenge
</a>
{% endif %}
</li>

2
rowers/templates/racelist.html
View File

@@ -28,7 +28,7 @@
{% if race.sessiontype == 'race' %}
<td>{{ race.course.country }}</td>
{% else %}
<td>Worldwide Indoor Race</td>
<td>Worldwide Indoor Challenge</td>
{% endif %}
<td><a href="/rowers/courses/{{ race.course.id }}">{{ race.course.name }}</a></td>
<td>{{ race.sessionvalue }}</td>

62
rowers/templates/virtualevent.html
View File

@@ -9,14 +9,14 @@
{% leaflet_css %}
{% endblock %}
{% block title %}Rowsandall Virtual Race{% endblock %}
{% block title %}Rowsandall Virtual Challenge{% endblock %}
{% block scripts %}
{% include "monitorjobs.html" %}
{% endblock %}
{% block og_title %}{{ race.name }}{% endblock %}
{% block description %}Virtual Rowing Race {{ race.name }}{% endblock %}
{% block description %}Virtual Rowing Challenge {{ race.name }}{% endblock %}
{% if racelogo %}
{% block og_image %}
@@ -87,7 +87,7 @@
{% localtime off %}
<div id="raceinfo">
<p>
<h2>Event Information</h2>
<h2>Challenge Information</h2>
</p>
<p>
<table class="listtable shortpadded" width="100%">
@@ -101,7 +101,7 @@
<th>Indoor Race</th><td>To be rowed on a Concept2 ergometer</td>
</tr>
<tr>
<th>Event Time Zone</th><td>{{ race.timezone }}</td>
<th>Challenge Time Zone</th><td>{{ race.timezone }}</td>
</tr>
{% endif %}
<tr>
@@ -155,7 +155,7 @@
<div id="registerbuttons">
{% if request.user.is_anonymous %}
<p>
Registered users of rowsandall.com can participate in this event. Participation is free, unless specified differently in the race comment above.
Registered users of rowsandall.com can participate in this challenge. Participation is free, unless specified differently in the race comment above.
{% if race.sessiontype == 'race' %}
<a href="/rowers/virtualevent/{{ race.id }}/register"><h3>Register</h3></a>
{% else %}
@@ -164,11 +164,11 @@
</p>
{% else %}
<p>
See race rules below. Participation to this race is free,
unless specified differently in the race comment above.
See challenge rules below. Participation to this challenge is free,
unless specified differently in the challenge comment above.
</p>
<p>
Note. On this page, all times are local times in the time zone of the event.
Note. On this page, all times are local times in the time zone of the challenge.
</p>
<p>
{% for button in buttons %}
@@ -188,12 +188,12 @@
<a href="/rowers/virtualevent/{{ race.id }}/submit">Submit Workout</a>
</td>
<td>
Submit a workout that is already on the site as your race result
Submit a workout that is already on the site as your challenge result
</td>
</tr>
<tr>
<td>
<a href="/rowers/workout/upload/{{ race.id }}/">Upload your race result</a>
<a href="/rowers/workout/upload/{{ race.id }}/">Upload your challenge result</a>
</td>
<td>
Upload a new workout to the site and submit it as a result. You
@@ -203,7 +203,7 @@
{% if race.sessiontype == 'indoorrace' %}
<tr>
<td>
<a href="/rowers/workout/addmanual/{{ race.id }}">Enter your race result manually</a>
<a href="/rowers/workout/addmanual/{{ race.id }}">Enter your challenge result manually</a>
</td>
<td>
If you don't have a data file, enter the results
@@ -234,10 +234,10 @@
{% if button == 'editbutton' %}
<p>
{% if race.sessiontype == 'race' %}
<a href="/rowers/virtualevent/{{ race.id }}/edit">Edit Race
<a href="/rowers/virtualevent/{{ race.id }}/edit">Edit challenge
</a>
{% else %}
<a href="/rowers/virtualevent/{{ race.id }}/editindoor">Edit Race
<a href="/rowers/virtualevent/{{ race.id }}/editindoor">Edit challenge
</a>
{% endif %}
</p>
@@ -434,11 +434,11 @@
{% else %}
{% if record.emailnotifications %}
<a href="/rowers/indoorraceregistration/togglenotification/{{ race.id }}">
Unsubscribe from race notifications by email
Unsubscribe from challenge notifications by email
</a>
{% else %}
<a href="/rowers/indoorraceregistration/togglenotification/{{ race.id }}">
Subscribe to race notifications by email
Subscribe to challenge notifications by email
</a>
{% endif %}
{% endif %}
@@ -465,21 +465,21 @@
<h2>Rules</h2>
</p>
<p>
Virtual races are intended as an informal way to add a
Virtual challenges are intended as an informal way to add a
competitive element to training and as a quick way to set
up and manage small regattas.
up and manage for example race intensity practices.
</p>
{% if race.sessiontype == 'race' %}
<p>
On the water races are rowed on the course shown.
On the water challenges are rowed on the course shown.
You cannot submit results rowed
on other bodies of water.
</p>
{% else %}
<p>
Indoor races are open for all, wherever you live.
Indoor challenges are open for all, wherever you live.
However, be aware of the
time zone for the race window.
time zone for the challenge window.
</p>
{% endif %}
<p>
@@ -487,12 +487,12 @@
register to take part in this event. Please note the registration
deadline. You must register before this deadline.
You can always withdraw from participating before the registration
deadline or the start of the race window, whichever is earlier.
deadline or the start of the challenge window, whichever is earlier.
</p>
<p>
After the start of the race window and before the submission deadline,
you can submit results by linking the race to one of your uploaded
workouts. The workout start time must be within the race window.
After the start of the challenge window and before the submission deadline,
you can submit results by linking the challenge to one of your uploaded
workouts. The workout start time must be within the challenge window.
{% if race.sessiontype == 'race' %}
Your course must pass through the blue polygons on the course
map (in the right order), for your result to be valid.
@@ -503,12 +503,12 @@
are shown.
</p>
<p>
Race results are stored permanently and are not deleted when
Challenge results are stored permanently and are not deleted when
you delete the respective workout or remove your account.
By registering, you agree with this and the race rules.
By registering, you agree with this and the challenge rules.
</p>
<p>
If you use a manually added workout for your indoor race result,
If you use a manually added workout for your indoor challenge result,
please attach a screenshot of the ergometer display for verification.
</p>
<p>
@@ -519,14 +519,14 @@
correctly in your user settings.
</p>
<p>
Virtual races are intended as an informal way to add a
competitive element to training. Virtual races are not
Virtual challenges are intended as an informal way to add a
competitive element to training. Virtual challenges are not
refereed or staffed to provide for participants safety.
Individual participants are entirely responsible for their
safety while participating in a virtual race.
safety while participating in a virtual challenge.
</p>
<p>
Until the evaluation closure time, the race organizer can
Until the evaluation closure time, the challenge organizer can
review and reject entries. If you are disqualified in this
way, you will receive an email with the reason.
</p>

20
rowers/templates/virtualeventcreate.html
View File

@@ -2,19 +2,19 @@
{% load staticfiles %}
{% load rowerfilters %}
{% block title %}New Virtual Race{% endblock %}
{% block title %}New Virtual Challenge{% endblock %}
{% block main %}
<h1>New Virtual Race</h1>
<h1>New Virtual Challenge</h1>
<ul class="main-content">
<li class="grid_4">
<p>With this form, you can create a new virtual race. After you submit
the form, the race is created and will be visible to all users. From
that moment, only the site admin can delete the race
(admin@rowsandall.com). You can still edit the race until
the start of the race window.
<p>With this form, you can create a new virtual challenge. After you submit
the form, the challenge is created and will be visible to all users. From
that moment, only the site admin can delete the challenge
(admin@rowsandall.com). You can still edit the challenge until
the start of the challenge window.
</p>
</li>
@@ -37,15 +37,15 @@
</form>
</li>
<li class="grid_1">
<p>All times are local times in the race course time zone</p>
<p>All times are local times in the challenge course time zone</p>
<p>Adding a contact phone number and email is not mandatory, but we
strongly recommend it.</p>
<p>If your event has a registration closure deadline, participants
have to enter (and can withdraw) before the registration closure time.</p>
<p>Participants can submit results until the evaluation closure time.</p>
<p>Until one hour after evaluation closure time, the race organizer
<p>Until one hour after evaluation closure time, the challenge organizer
can review and reject submitted results ("disqualification"). If
you as the race organizer intend to use this functionality, it
you as the challenge organizer intend to use this functionality, it
is strongly recommended that you fill out a contact email or phone
number.
</p>

14
rowers/templates/virtualevents.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %}
{% load rowerfilters %}
{% block title %}Rowsandall Virtual Racing{% endblock %}
{% block title %}Rowsandall Virtual Challenges{% endblock %}
{% block scripts %}
<script type='text/javascript'
@@ -15,7 +15,7 @@
var frm = $("#raceform");
var data = new FormData(frm[0]);
$.ajax({
url: "/rowers/virtualevents/",
type: "POST",
@@ -24,17 +24,17 @@
data: data,
success: function(data) {
$('#racelist').html(data)
}
});
};
$(document).ready(function() {
var csrftoken = jQuery("[name=csrfmiddlewaretoken]").val();
console.log("CSRF token",csrftoken);
function csrfSafeMethod(method) {
// these HTTP methods do not require CSRF protection
return (/^(GET|HEAD|OPTIONS|TRACE)$/.test(method));
@@ -69,7 +69,7 @@
</form>
</p>
<li class="grid_4">
<p>Click on the event name or on the Details button to see the event
<p>Click on the challenge name or on the Details button to see the challenge
details (and manage your participation and results). Click on the
course name to see the course details.
</p>