diff --git a/rowers/templates/c2_list_import.html b/rowers/templates/c2_list_import.html index 1ea5c4eb..69a81cc7 100644 --- a/rowers/templates/c2_list_import.html +++ b/rowers/templates/c2_list_import.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} @@ -6,43 +6,47 @@ {% block content %}

Available on C2 Logbook

- {% if data %} - - - - - - - - - - - - {% for workout in data %} - - {% for key,value in workout.items %} - {% if key == "date" %} - - {% endif %} - {% if key == "type" %} - - {% endif %} - {% if key == "distance" %} - - {% endif %} - {% if key == "time_formatted" %} - - {% endif %} - {% if key == "id" %} - - {% endif %} - {% endfor %} - - - {% endfor %} - -
Distance Duration Date Type Import
{{ value }}{{ value }}{{ value }}m{{ value }}Import
- {% else %} -

No workouts found

- {% endif %} +{% if data %} + + + + + + + + + + + + {% for workout in data %} + + {% for key,value in workout.items %} + {% if key == "date" %} + + {% endif %} + {% if key == "type" %} + + {% endif %} + {% if key == "distance" %} + + {% endif %} + {% if key == "time_formatted" %} + + {% endif %} + {% if key == "id" %} + + {% endif %} + {% endfor %} + + + {% endfor %} + +
Distance Duration Date Type Import
{{ value }}{{ value }}{{ value }}m{{ value }}Import
+{% else %} +

No workouts found

+{% endif %} +{% endblock %} + +{% block sidebar %} +{% include 'menu_workouts.html' %} {% endblock %} diff --git a/rowers/templates/histoall.html b/rowers/templates/histoall.html deleted file mode 100644 index 6b1ee9c6..00000000 --- a/rowers/templates/histoall.html +++ /dev/null @@ -1,54 +0,0 @@ -{% extends "base.html" %} -{% load staticfiles %} -{% load rowerfilters %} - -{% block title %}View Workout {% endblock %} - -{% block content %} - - - - - {{ interactiveplot |safe }} - - - - - -
- - -

Indoor Rower Power Histogram

- -

Summary of the past 12 months for {{ theuser.first_name }} {{ theuser.last_name }}

- -

Direct link for other Pro users: - https://rowsandall.com/rowers/{{ id }}/histo-all -

- -
- {{ the_div|safe }} -
- -
- -{% endblock %} diff --git a/rowers/templates/invitations.html b/rowers/templates/invitations.html deleted file mode 100644 index fc1748c1..00000000 --- a/rowers/templates/invitations.html +++ /dev/null @@ -1,27 +0,0 @@ -{% extends "base.html" %} - -{% block title %}Teams {% endblock %} - -{% block content %} -
-
-

-

Invitations

- - Future invitations page - -

- - -
-
-

-

Manual with Code

-

-
-
- - - - -{% endblock %} diff --git a/rowers/templates/partners.html b/rowers/templates/partners.html index 1bda5975..237a0df7 100644 --- a/rowers/templates/partners.html +++ b/rowers/templates/partners.html @@ -1,12 +1,11 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% block title %}About us{% endblock title %} -{% block content %} +{% block main %} -
-

Are you interested in partnering with Rowsandall.com?

+

Are you interested in partnering with Rowsandall.com?

-

The founding principle for rowsandall.com was, and still is, free data +

The founding principle for rowsandall.com was, and still is, free data and analysis for rowers. Fulfilling that mission means that we try to test and support as many widely used rowing related hardware and software products as possible. Since these products typically have rapid update @@ -58,11 +57,7 @@ at info@rowsandall.com with information about your product/service including any important links or images prior to sending the product.

-
- - -

Examples of possible partnerships

We currently envision a couple of ways in which we can partner with @@ -99,6 +94,9 @@

-
- {% endblock content %} +{% endblock main %} + +{% block sidebar %} +{% include 'menu_help.html' %} +{% endblock %} diff --git a/rowers/templates/plannedsssionsmanage.html b/rowers/templates/plannedsssionsmanage.html deleted file mode 100644 index 8be3f91b..00000000 --- a/rowers/templates/plannedsssionsmanage.html +++ /dev/null @@ -1,48 +0,0 @@ -{% extends "base.html" %} -{% load staticfiles %} -{% load rowerfilters %} - -{% block title %}Planned Sessions{% endblock %} - -{% block content %} -
- {% include "planningbuttons.html" %} -
-
-

Plan for {{ rower.user.first_name }} {{ rower.user.last_name }}

-
-
- -
- - Today - - - This Week - - - This Month - - - Last Week - - - Last Month - -
-
-
-

- Click on session name to view -

-
- - - - -{% endblock %} diff --git a/rowers/templates/registration/logout.html b/rowers/templates/registration/logout.html new file mode 100644 index 00000000..a6140cea --- /dev/null +++ b/rowers/templates/registration/logout.html @@ -0,0 +1,21 @@ +{% extends "newbasefront.html" %} + +{% block main %} + +{% if form.errors %} +

Your username and password didn't match. Please try again.

+{% endif %} + +
    +
  • +

    Thanks for spending some quality time on rowsandall.com today.

    +
    • +
+ +

+ Follow @rowsandall +

+ + +{% endblock %} diff --git a/rowers/templates/underarmour_list_import.html b/rowers/templates/underarmour_list_import.html index 34fb26a3..424f7feb 100644 --- a/rowers/templates/underarmour_list_import.html +++ b/rowers/templates/underarmour_list_import.html @@ -1,37 +1,41 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} {% block title %}Workouts{% endblock %} -{% block content %} +{% block main %}

Available on MapMyFitness (UnderArmour)

- {% if workouts %} - - - - - - - - - - - - {% for workout in workouts %} - - - - - - - - - {% endfor %} - -
Import Date/Time Duration Total Distance Type
-Import{{ workout|ualookup:'starttime' }}{{ workout|ualookup:'duration' }} {{ workout|ualookup:'distance' }} m{{ workout|ualookup:'type' }}
- {% else %} -

No workouts found. We only list workouts with time data series.

- {% endif %} +{% if workouts %} + + + + + + + + + + + + {% for workout in workouts %} + + + + + + + + + {% endfor %} + +
Import Date/Time Duration Total Distance Type
+ Import{{ workout|ualookup:'starttime' }}{{ workout|ualookup:'duration' }} {{ workout|ualookup:'distance' }} m{{ workout|ualookup:'type' }}
+{% else %} +

No workouts found. We only list workouts with time data series.

+{% endif %} +{% endblock %} + +{% block sidebar %} +{% include 'menu_workouts.html' %} {% endblock %} diff --git a/rowers/views.py b/rowers/views.py index f3342eb2..7f654c79 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -211,7 +211,7 @@ def getrequestrower(request,rowerid=0,userid=0,notpermanent=False): userid = int(userid) rowerid = int(rowerid) - + if notpermanent == False: if rowerid == 0 and 'rowerid' in request.session: rowerid = request.session['rowerid'] @@ -1025,6 +1025,7 @@ def rower_register_view(request): {'form':form,}) # Shows analysis page +@login_required() def analysis_view(request,userid=0): r = getrequestrower(request,userid=userid) return render(request, @@ -1036,6 +1037,7 @@ def analysis_view(request,userid=0): ) # Shows laboratory page +@login_required() def laboratory_view(request,userid=0): r = getrequestrower(request,userid=userid) return render(request, diff --git a/static/css/frontstyles.css b/static/css/frontstyles.css index 818d0e76..a3701396 100644 --- a/static/css/frontstyles.css +++ b/static/css/frontstyles.css @@ -352,6 +352,7 @@ .main-head { grid-area: header; background-color: rgba(0,0,0,0.6); + padding: 15px; } @@ -359,6 +360,7 @@ .main-user { grid-area: user; background-color: rgba(0,0,0,0.6); + padding: 15px; } .content {