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

trial bug fixed

Browse Source
This commit is contained in:
Sander Roosendaal
2018-11-02 18:48:43 +01:00
parent 49ca7e3797
commit e0ec5d62dd
10 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/menu_analytics.html
View File

@@ -1,6 +1,6 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
<h1>Analysis</h1> <h1><a href="/rowers/analysis">Analysis</a></h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li class="has-children" id="fitness"> <li class="has-children" id="fitness">
<input type="checkbox" name="group-fitness" id="group-fitness" checked> <input type="checkbox" name="group-fitness" id="group-fitness" checked>

2
rowers/templates/menu_help.html
View File

@@ -1,4 +1,4 @@
<h1>Help</h1> <h1><a href="/rowers/help">Help</a></h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li id="gettingstarted"> <li id="gettingstarted">
<a href="/rowers/help"> <a href="/rowers/help">

2
rowers/templates/menu_plan.html
View File

@@ -1,6 +1,6 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
<h1>Plan</h1> <h1><a href="/rowers/sessions">Plan</a></h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li class="has-children" id="plans"> <li class="has-children" id="plans">
<input type="checkbox" name="group-plans" id="group-plans"> <input type="checkbox" name="group-plans" id="group-plans">

2
rowers/templates/menu_profile.html
View File

@@ -1,6 +1,6 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
<h1>Profile</h1> <h1><a href="/rowers/me/edit">Profile</a></h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li id="manage-prefs"> <li id="manage-prefs">
<a href="/rowers/me/preferences/"> <a href="/rowers/me/preferences/">

2
rowers/templates/menu_racing.html
View File

@@ -1,4 +1,4 @@
<h1>Racing</h1> <h1><a href="/rowers/virtualevents">Racing</a></h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li id="races-list"> <li id="races-list">
<a href="/rowers/virtualevents"> <a href="/rowers/virtualevents">

2
rowers/templates/menu_teams.html
View File

@@ -1,6 +1,6 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
<h1>Teams</h1> <h1><a href="/rowers/me/teams">Teams</a></h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li id="manage"> <li id="manage">

2
rowers/templates/menu_workout.html
View File

@@ -1,5 +1,5 @@
{% load rowerfilters %} {% load rowerfilters %}
<h1>Workout</h1> <h1><a href="/rowers/workout/{{ workout.id }}/">Workout</a></h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li class="has-children" id="workout"> <li class="has-children" id="workout">
<input type="checkbox" name="group-workout" id="group-workout" checked> <input type="checkbox" name="group-workout" id="group-workout" checked>

2
rowers/templates/menu_workouts.html
View File

@@ -1,6 +1,6 @@
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
<h1>Workouts</h1> <h1><a href="/rowers/list-workouts">Workouts</a></h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li id="workouts-list"> <li id="workouts-list">
<a href="/rowers/list-workouts"><i class="fas fa-clipboard-list fa-fw"></i>&nbsp;Workouts List</a> <a href="/rowers/list-workouts"><i class="fas fa-clipboard-list fa-fw"></i>&nbsp;Workouts List</a>

4
rowers/utils.py
View File

@@ -385,7 +385,9 @@ def isprorower(r):
result = False result = False
result = r.rowerplan in ['pro','coach','plan'] result = r.rowerplan in ['pro','coach','plan']
if not result and r.protrialexpires: if not result and r.protrialexpires:
result = r.rowerplan is 'basic' and r.protrialexpires >= datetime.date.today() result = r.rowerplan == 'basic' and r.protrialexpires >= datetime.date.today()
print r.rowerplan,r.protrialexpires,datetime.date.today(),result
print r.protrialexpires >= datetime.date.today()
return result return result

8
static/css/styles2.css
View File

@@ -79,6 +79,14 @@
padding: 15px; padding: 15px;
} }
aside h1 a {
font-weight: bold;
text-align: left;
font-size: 1.0em;
color: #dddddd;
}
aside ul label, aside ul label,
aside ul a { aside ul a {
padding-left: 15px; padding-left: 15px;