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

Merge branch 'release/v4.12'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-10-06 09:57:28 +02:00
parent 3a7b94bb1b 9b4ed44c49
commit 69b234d3e7
21 changed files with 37 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/400.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}Change Workout {% endblock %} {% block title %}Rowsandall - Bad Request {% endblock %}
{% block content %} {% block content %}

2
rowers/templates/403.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}Change Workout {% endblock %} {% block title %}Rowsandall - forbidden {% endblock %}
{% block content %} {% block content %}

2
rowers/templates/404.html
View File

@@ -1,7 +1,7 @@
{% extends "basenofilters.html" %} {% extends "basenofilters.html" %}
{% load staticfiles %} {% load staticfiles %}
{% block title %}Change Workout {% endblock %} {% block title %}Rowsandall - not found {% endblock %}
{% block content %} {% block content %}

2
rowers/templates/500.html
View File

@@ -1,7 +1,7 @@
{% extends "basenofilters.html" %} {% extends "basenofilters.html" %}
{% load staticfiles %} {% load staticfiles %}
{% block title %}Change Workout {% endblock %} {% block title %}Rowsandall - error {% endblock %}
{% block content %} {% block content %}

2
rowers/templates/about_us.html
View File

@@ -1,6 +1,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}About us{% endblock title %} {% block title %}Rowsandall - About us{% endblock title %}
{% block content %} {% block content %}
<div class="grid_6 alpha"> <div class="grid_6 alpha">

4
rowers/templates/advancededit.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}Advanced Features {% endblock %} {% block title %}{{ workout.name }}Advanced {% endblock %}
{% block content %} {% block content %}
<div id="workouts" class="grid_6 alpha"> <div id="workouts" class="grid_6 alpha">
@@ -13,7 +13,7 @@
</p> </p>
{% endif %} {% endif %}
<h1>Advanced Workout Editor</h1> <h1>{{ workout.name }} - Advanced</h1>
{% if user.rower.rowerplan == 'basic' %} {% if user.rower.rowerplan == 'basic' %}
<p>This is a preview of the page with advanced functionality for Pro users. <p>This is a preview of the page with advanced functionality for Pro users.
See See

4
rowers/templates/advancedotw.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}Advanced Features {% endblock %} {% block title %}{{ workout.name }}Advanced {% endblock %}
{% block content %} {% block content %}
<div id="workouts" class="grid_6 alpha"> <div id="workouts" class="grid_6 alpha">
@@ -13,7 +13,7 @@
</p> </p>
{% endif %} {% endif %}
<h1>Advanced OTW features</h1> <h1>{{ workout.name }} - Advanced OTW</h1>
{% if user.rower.rowerplan == 'basic' %} {% if user.rower.rowerplan == 'basic' %}
<p>This is a preview of the page with advanced functionality for Pro users. <p>This is a preview of the page with advanced functionality for Pro users.
See <a href="/rowers/promembership">the page about Pro membership</a> for more information and to sign up for Pro Membership</a> See <a href="/rowers/promembership">the page about Pro membership</a> for more information and to sign up for Pro Membership</a>

2
rowers/templates/analysis.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}Analysis {% endblock %} {% block title %}Rowsandall - Analysis {% endblock %}
{% block content %} {% block content %}

4
rowers/templates/basebase.html
View File

@@ -8,7 +8,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html lang="en"> <html lang="en">
<head> <head>
{% block headtext %}{% endblock %}
<script src="/static/cookielaw/js/cookielaw.js"></script> <script src="/static/cookielaw/js/cookielaw.js"></script>
{% analytical_head_top %} {% analytical_head_top %}
{% if GOOGLE_ANALYTICS_PROPERTY_ID %} {% if GOOGLE_ANALYTICS_PROPERTY_ID %}
@@ -27,7 +27,7 @@
<link rel="icon" sizes="16x16" href="/static/img/favicon-16x16.png" type="image/png"/> <link rel="icon" sizes="16x16" href="/static/img/favicon-16x16.png" type="image/png"/>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="initial-scale=0.67"> <meta name="viewport" content="initial-scale=0.67">
<title>Rowsandall</title> <title>{% block title %}Rowsandall{% endblock %}</title>
<link rel="stylesheet" href="/static/css/reset.css" /> <link rel="stylesheet" href="/static/css/reset.css" />
<link rel="stylesheet" href="/static/css/text.css" /> <link rel="stylesheet" href="/static/css/text.css" />
<link rel="stylesheet" href="/static/css/960_12_col.css" /> <link rel="stylesheet" href="/static/css/960_12_col.css" />

2
rowers/templates/biginteractive1.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}View Workout {% endblock %} {% block title %}Rowsandall {% endblock %}
{% block content %} {% block content %}

2
rowers/templates/boxplot.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}View Comparison {% endblock %} {% block title %}Rowsandall Box Plot {% endblock %}
{% block content %} {% block content %}

2
rowers/templates/brochure.html
View File

@@ -1,6 +1,6 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block title %}Brochure{% endblock title %} {% block title %}Rowsandall Brochure{% endblock title %}
{% block meta %} {% block meta %}
<style> <style>
#container { overflow: auto; -webkit-overflow-scrolling: touch; height: 500px; } #container { overflow: auto; -webkit-overflow-scrolling: touch; height: 500px; }

2
rowers/templates/cum_flex.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}View Workout {% endblock %} {% block title %}Rowsandall {% endblock %}
{% block content %} {% block content %}

2
rowers/templates/frontpage.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}Change Workout {% endblock %} {% block title %}Rowsandall Rowing Data{% endblock %}
{% block content %} {% block content %}

2
rowers/templates/histo.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}View Workout {% endblock %} {% block title %}Rowsandall Histogram {% endblock %}
{% block content %} {% block content %}
<script src="https://code.jquery.com/jquery-1.9.1.min.js"></script> <script src="https://code.jquery.com/jquery-1.9.1.min.js"></script>

2
rowers/templates/list_graphs.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}Graphs{% endblock %} {% block title %}Rowsandall Recent Graphs{% endblock %}
{% block content %} {% block content %}
<h1>Recent Graphs</h1> <h1>Recent Graphs</h1>

2
rowers/templates/list_workouts.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}Workouts{% endblock %} {% block title %}Rowsandall Workouts List{% endblock %}
{% block content %} {% block content %}

2
rowers/templates/map_view.html
View File

@@ -2,7 +2,7 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}View Workout {% endblock %} {% block title %}{{ workout.name }} {% endblock %}
{% block content %} {% block content %}

4
rowers/templates/workout_form.html
View File

@@ -4,7 +4,9 @@
{% load tz %} {% load tz %}
{% get_current_timezone as TIME_ZONE %} {% get_current_timezone as TIME_ZONE %}
{% block title %}Change Workout {% endblock %} {% block title %}{{ workout.name }}{% endblock %}
{% block description %}{{ workout.name }}
{{ workout.date }} - {{ workout.distance }}m - {{ workout.duration |durationprint:"%H:%M:%S.%f" }}{% endblock %}
{% block content %} {% block content %}
<div id="workouts" class="grid_6 alpha"> <div id="workouts" class="grid_6 alpha">

11
rowers/templates/workout_view.html
View File

@@ -2,8 +2,17 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}View Workout {% endblock %} {% block title %}{{ workout.name }} {% endblock %}
{% block description %}{{ workout.name }}
{{ workout.date }} - {{ workout.distance }}m - {{ workout.duration |durationprint:"%H:%M:%S.%f" }}{% endblock %}
{% for graph in graphs1 %}
{% block image_src %}
{% for graph in graphs1 %}
<link rel="image_src" href="/{{ graph.filename }}" />
{% endfor %}
{% endblock %}
{% endfor %}
{% block content %} {% block content %}
<div id="workouts" class="grid_6 alpha"> <div id="workouts" class="grid_6 alpha">

4
templates/basebase.html
View File

@@ -23,7 +23,9 @@
<link rel="icon" sizes="16x16" href="/static/img/favicon-16x16.png" type="image/png"/> <link rel="icon" sizes="16x16" href="/static/img/favicon-16x16.png" type="image/png"/>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="initial-scale=0.67"> <meta name="viewport" content="initial-scale=0.67">
<title>Rowsandall</title> <title>{% block title %}Rowsandall Rowing Data Analytics{% endblock %}</title>
<meta name="description" content="{% block description %}Free Data and Analysis. For Rowers. By Rowers. {% endblock %}"/>
{% block image_src %}<link rel="image_src" href="static/img/logo7.png" />{% endblock %}
<link rel="stylesheet" href="/static/css/reset.css" /> <link rel="stylesheet" href="/static/css/reset.css" />
<link rel="stylesheet" href="/static/css/text.css" /> <link rel="stylesheet" href="/static/css/text.css" />
<link rel="stylesheet" href="/static/css/960_12_col.css" /> <link rel="stylesheet" href="/static/css/960_12_col.css" />