diff --git a/rowers/templates/legal.html b/rowers/templates/legal.html index c61932eb..83d8ca9b 100644 --- a/rowers/templates/legal.html +++ b/rowers/templates/legal.html @@ -1,22 +1,21 @@ - {% extends "base.html" %} - {% block title %}About us{% endblock title %} - {% block content %} +{% extends "newbase.html" %} +{% block title %}Legal{% endblock title %} +{% block main %} -
-

Terms and Conditions

-

Credit

+

Terms and Conditions

+

Credit

This document was created using a Contractology template available at http://www.freenetlaw.com..

-

Introduction

+

Introduction

These terms and conditions govern your use of this website; by using this website, you accept these terms and conditions in full. If you disagree with these terms and conditions or any part of these terms and conditions, you must not use this website.

This website uses cookies. By using this website and agreeing to these terms and conditions, you consent to our rowsandall.com’s use of cookies in accordance with the terms of rowsandall.com’s privacy policy.

-

License to use website

+

License to use website

Unless otherwise stated, rowsandall.com and/or its licensors own the intellectual property rights in the website and material on the website. Subject to the license below, all these intellectual property rights are reserved.

@@ -33,7 +32,7 @@

-

Acceptable use

+

Acceptable use

You must not use this website in any way that causes, or may cause, damage to the website or impairment of the availability or accessibility of the website; or in any way which is unlawful, illegal, fraudulent or harmful, or in connection with any unlawful, illegal, fraudulent or harmful purpose or activity.

@@ -44,7 +43,7 @@

You must not use this website to transmit or send unsolicited commercial communications.

-

Restricted access

+

Restricted access

Access to certain areas of this website is restricted. rowsandall.com reserves the right to restrict access to areas of this website, or indeed this entire website, at rowsandall.com’s discretion.

@@ -52,7 +51,7 @@

rowsandall.com may disable your user ID and password in rowsandall.com’s sole discretion without notice or explanation.

-

User content

+

User content

In these terms and conditions, your user content means material (including without limitation text, images, audio material, video material and audio-visual material) that you submit to this website, for whatever purpose.

@@ -66,7 +65,7 @@

Notwithstanding rowsandall.com’s rights under these terms and conditions in relation to user content, rowsandall.com does not undertake to monitor the submission of such content to, or the publication of such content on, this website.

-

No warranties

+

No warranties

This website is provided as is without any representations or warranties, express or implied. rowsandall.com makes no representations or warranties in relation to this website or the information and materials provided on this website.

@@ -79,7 +78,7 @@

Nothing on this website constitutes, or is meant to constitute, advice of any kind. If you require advice in relation to any legal, financial or medica] matter you should consult an appropriate professional.

-

Limitations of liability

+

Limitations of liability

rowsandall.com will not be liable to you (whether under the law of contact, the law of torts or otherwise) in relation to the contents of, or use of, or otherwise in connection with, this website: @@ -90,7 +89,7 @@

These limitations of liability apply even if rowsandall.com has been expressly advised of the potential loss.

-

Exceptions

+

Exceptions

Nothing in this website disclaimer will exclude or limit any warranty implied by law that it would be unlawful to exclude or limit; and nothing in this website disclaimer will exclude or limit rowsandall.com’s liability in respect of any: @@ -100,61 +99,59 @@

  • matter which it would be illegal or unlawful for rowsandall.com to exclude or limit, or to attempt or purport to exclude or limit, its liability.

    -

    Reasonableness

    +

    Reasonableness

    By using this website, you agree that the exclusions and limitations of liability set out in this website disclaimer are reasonable.

    If you do not think they are reasonable, you must not use this website.

    -

    Other parties

    +

    Other parties

    You agree that the limitations of warranties and liability set out in this website disclaimer will protect rowsandall.com’s officers, employees, agents, subsidiaries, successors, assigns and sub-contractors as well as rowsandall.com.

    -

    Unenforceable provisions

    +

    Unenforceable provisions

    If any provision of this website disclaimer is, or is found to be, unenforceable under applicable law, that will not affect the enforceability of the other provisions of this website disclaimer.

    -

    Indemnity

    +

    Indemnity

    You hereby indemnify rowsandall.com and undertake to keep rowsandall.com indemnified against any losses, damages, costs, liabilities and expenses (including without limitation legal expenses and any amounts paid by rowsandall.com to a third party in settlement of a claim or dispute on the advice of rowsandall.com’s legal advisers) incurred or suffered by rowsandall.com arising out of any breach by you of any provision of these terms and conditions, or arising out of any claim that you have breached any provision of these terms and conditions.

    -

    Breaches of these terms and conditions

    +

    Breaches of these terms and conditions

    Without prejudice to rowsandall.com’s other rights under these terms and conditions, if you breach these terms and conditions in any way, rowsandall.com may take such action as rowsandall.com deems appropriate to deal with the breach, including suspending your access to the website, prohibiting you from accessing the website, blocking computers using your IP address from accessing the website, contacting your internet service provider to request that they block your access to the website and/or bringing court proceedings against you.

    -

    Variation

    +

    Variation

    rowsandall.com may revise these terms and conditions from time-to-time. Revised terms and conditions will apply to the use of this website from the date of the publication of the revised terms and conditions on this website. Please check this page regularly to ensure you are familiar with the current version.

    -

    Assignment

    +

    Assignment

    rowsandall.com may transfer, sub-contract or otherwise deal with rowsandall.com’s rights and/or obligations under these terms and conditions without notifying you or obtaining your consent.

    You may not transfer, sub-contract or otherwise deal with your rights and/or obligations under these terms and conditions.

    -

    Severability

    +

    Severability

    If a provision of these terms and conditions is determined by any court or other competent authority to be unlawful and/or unenforceable, the other provisions will continue in effect. If any unlawful and/or unenforceable provision would be lawful or enforceable if part of it were deleted, that part will be deemed to be deleted, and the rest of the provision will continue in effect.

    -

    Entire agreement

    +

    Entire agreement

    These terms and conditions constitute the entire agreement between you and rowsandall.com in relation to your use of this website, and supersede all previous agreements in respect of your use of this website.

    -

    Law and jurisdiction

    +

    Law and jurisdiction

    These terms and conditions will be governed by and construed in accordance with Czech Law and any disputes relating to these terms and conditions will be subject to the exclusive jurisdiction of the courts of The Czech Republic.

    -

    rowsandall.com’s details

    +

    rowsandall.com’s details

    The rowsandall.com site is owned by Rowsandall s.r.o., Nové sady 988/2, Staré Brno, 602 00 Brno, Czech Republic (company identification number 070 48 572)

    You can contact rowsandall.com by using the email contact form.

    -
    • -

    Privacy Policy

    {% include "privacypolicy.html" %} @@ -162,5 +159,10 @@ -
    - {% endblock content %} + +{% endblock main %} + +{% block sidebar %} +{% include 'menu_help.html' %} +{% endblock %} + diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html index 519b5856..7c3557c6 100644 --- a/rowers/templates/menu_analytics.html +++ b/rowers/templates/menu_analytics.html @@ -63,7 +63,7 @@
  • - +  Laboratory
    • diff --git a/rowers/templates/promembership.html b/rowers/templates/promembership.html index c3422175..201d3044 100644 --- a/rowers/templates/promembership.html +++ b/rowers/templates/promembership.html @@ -1,211 +1,245 @@ - {% extends "base.html" %} - {% block title %}Rowsandall Pro Membership{% endblock title %} - {% block content %} +{% extends "newbase.html" %} +{% block title %}Rowsandall Pro Membership{% endblock title %} +{% block main %} {% load rowerfilters %} -
    -

    Pro Membership

    +

    Paid Membership Plans

    -

    Donations are welcome to keep this web site going. To help cover the hosting - costs, I have created several paid plans offering advanced functionality. - Once I process your - donation, I will give you access to some special features on this - website.

    +
    - -
    - {% if user.rower.rowerplan == 'basic' and user.rower.protrialexpires|date_dif == 1 %} -

    Free Trial

    -

    - You qualify for a 14 day free trial. No credit card needed. - Try out Pro or Self-Coach membership for two weeks. Click the button below to - sign up for the trial. After your trial period expires, you will be - automatically reset to the Basic plan, unless you upgrade to Pro. -

    -

    Yes, I want to try Pro membership for 14 days for free. No strings attached.

    -
     
    -

    Yes, I want to try Self-Coach membership for 14 days for free. No strings attached.

    -{% endif %} - -

    Recurring Payment

    -

    You need a Paypal account for this

    -

    -

    - - - - - -
    Plans
    Your User Name
    - - - -
    -

    - -

    One Year Subscription

    -

    Only a credit card needed. Will not automatically renew

    - -

    -

    - - - - - -
    Plans
    Your User Name
    - - - -
    -

    - - -

    Payment Processing

    -

    After you do the payment, we will manually change your membership to - "Pro". Depending on our availability, this may take some time - (typically one working day). Don't hesitate to contact us - if you have any questions at this stage.

    - -

    If, for any reason, you are not happy with your Pro membership, please let me know through the contact form. I will contact you as soon as possible to discuss how we can make things better.

    - -
    +

    Rowsandall.com's Training Planning functionality + is part of the paid "Self-Coach" and "Coach" plans.

    + +

    On the "Self-Coach" plan, you can plan your own sessions.

    + +

    On the "Coach" plan, you can establish teams, see workouts done by + athletes on your team, and plan individual and group sessions for your + athletes. +

    + +

    If you would like to find a coach who helps you plan your training + through rowsandall.com, contact me throught the contact form.

    + + {% if user.rower.rowerplan == 'basic' and user.rower.protrialexpires|date_dif == 1 %} +

    Free Trial

    +

    + You qualify for a 14 day free trial. No credit card needed. + Try out Pro or Self-Coach membership for two weeks. Click the button below to + sign up for the trial. After your trial period expires, you will be + automatically reset to the Basic plan, unless you upgrade to Pro. +

    +

    Yes, I want to try Pro membership for 14 days for free. No strings attached.

    +

    Yes, I want to try Self-Coach membership for 14 days for free. No strings attached.

    + {% endif %} + +
  • +

    Click on the PayPal button to pay for your Pro membership. Before you pay, please register for the free Basic membership and add your user name to the form. + Your payment will be valid for one year. + You will be taken to the secure PayPal payment site. +

    +

    Recurring Payment

    +

    You need a Paypal account for this. This is plan will automatically renew each year.

    +

    +

    + + + + + + + + + + + + + + + +
    + Plans +
    + +
    + Your User Name +
    + +
    + + + +
    +

    +

    One Year Subscription

    +

    Only a credit card needed. Will not automatically renew

    + +

    +

    + + + + + +
    Plans
    Your User Name
    + + + +
    +

    +

    Payment Processing

    +

    After you do the payment, we will manually change your membership to + "Pro". Depending on our availability, this may take some time + (typically one working day). Don't hesitate to contact us + if you have any questions at this stage.

    + +

    If, for any reason, you are not happy with your Pro membership, please let me know through the contact form. I will contact you as soon as possible to discuss how we can make things better.

    + +
    • + - {% endblock content %} +{% endblock %} + +{% block sidebar %} +{% include 'menu_help.html' %} +{% endblock %} + diff --git a/rowers/templates/registerthankyou.html b/rowers/templates/registerthankyou.html index 73ae6509..1c0914b1 100644 --- a/rowers/templates/registerthankyou.html +++ b/rowers/templates/registerthankyou.html @@ -1,27 +1,18 @@ - {% extends "base.html" %} - {% block title %}Contact Us - Thank You{% endblock title %} - {% block content %} -

    Thank you.

    -

    Thank you for registering. You can now login using the credential you provided. You can also view some of the videos below to get you started.

    +{% extends "newbase.html" %} +{% block title %}Contact Us - Thank You{% endblock title %} +{% block main %} +

    Thank you for registering

    +

    Thank you for registering. You can now login using the credentials you provided.

    Return home

    -

    Basic Navigation

    - - -

    Upload Page

    - - -

    Integration with Strava, SportTracks or Concept2 logbook

    - -

    - -

    - -

    - -

    - {% endblock content %} +{% endblock main %} + + +{% block sidebar %} +{% include 'menu_help.html' %} +{% endblock %} + diff --git a/rowers/templates/registration_form.html b/rowers/templates/registration_form.html index 0e337e78..bd75d942 100644 --- a/rowers/templates/registration_form.html +++ b/rowers/templates/registration_form.html @@ -1,45 +1,50 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} {% block title %}Contact Us{% endblock title %} {% block meta %} {% endblock %} - {% block content %} -
    - - {% if form.errors %} -

    - Please correct the error{{ form.errors|pluralize }} below. -

    - {% endif %} - -
    - {% csrf_token %} - - {{ form.as_table }} +{% block main %} +

    New User Registration

    +
    + {{ form.as_table }}
    -
    - Terms of Service -
    - -
    - -
    -
    -

    To use rowsandall, you need to register and agree with the Terms of Service.

    -

    Registration is free.

    - -

    Some of our advanced services only work if you give us your - (approximate) birth date, sex and weight category, with 72.5 kg the - bounday between heavies and lighties for men, and 59 kg for women. -

    - -

    Also, we are restricting access to the site to 16 years and older - because of EU data protection regulations.

    - -
    - {% endblock content %} + + + +
  • + +

    To use rowsandall, you need to register and agree with the Terms of Service.

    +

    Registration is free.

    + +

    Some of our advanced services only work if you give us your + (approximate) birth date, sex and weight category, with 72.5 kg the + bounday between heavies and lighties for men, and 59 kg for women. +

    + +

    Also, we are restricting access to the site to 16 years and older + because of EU data protection regulations.

    +
    • + + +{% endblock main %} + +{% block sidebar %} +{% include 'menu_help.html' %} +{% endblock %} diff --git a/rowers/urls.py b/rowers/urls.py index 688f0242..d163c11a 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -391,13 +391,15 @@ urlpatterns = [ url(r'^developers', TemplateView.as_view(template_name='developers.html'),name='about'), # url(r'^compatibility', TemplateView.as_view(template_name='compatibility.html'),name='about'), # url(r'^videos', TemplateView.as_view(template_name='videos.html'),name='videos'), + url(r'^analysis/user/(?P\d+)', views.analysis_view,name='analysis'), + url(r'^laboratory/user/(?P\d+)', views.laboratory_view,name='laboratory'), url(r'^analysis', views.analysis_view,name='analysis'), - url(r'^laboratory', TemplateView.as_view(template_name='laboratory.html'),name='laboratory'), + url(r'^laboratory', views.laboratory_view,name='laboratory'), url(r'^promembership', TemplateView.as_view(template_name='promembership.html'),name='promembership'), url(r'^starttrial$',views.start_trial_view), url(r'^startplantrial$',views.start_plantrial_view), - url(r'^planmembership', TemplateView.as_view(template_name='planmembership.html'),name='planmembership'), - url(r'^paypaltest', TemplateView.as_view(template_name='paypaltest.html'),name='paypaltest'), +# url(r'^planmembership', TemplateView.as_view(template_name='planmembership.html'),name='planmembership'), + # url(r'^paypaltest', TemplateView.as_view(template_name='paypaltest.html'),name='paypaltest'), url(r'^legal', TemplateView.as_view(template_name='legal.html'),name='legal'), url(r'^register$',views.rower_register_view), url(r'^register/thankyou/$', TemplateView.as_view(template_name='registerthankyou.html'), name='registerthankyou'), diff --git a/rowers/views.py b/rowers/views.py index c7bf1f74..6692cd82 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -1032,6 +1032,17 @@ def analysis_view(request): } ) +# Shows laboratory page +def laboratory_view(request): + r = getrequestrower(request) + return render(request, + "laboratory.html", + { + 'active':'nav-analysis', + 'rower':r, + } + ) + # Shows email form and sends it if submitted def sendmail(request): if request.method == 'POST': diff --git a/static/css/styles2.css b/static/css/styles2.css index 5dd4dcad..32bb9c12 100644 --- a/static/css/styles2.css +++ b/static/css/styles2.css @@ -564,4 +564,8 @@ aside .cd-accordion-menu.animated label::before { float: left !important; padding: 0 !important; } - + +.paypalpix { + width: auto !important; + max-width: 1px; +} diff --git a/templates/newbase.html b/templates/newbase.html index a8ef01cc..0967858d 100644 --- a/templates/newbase.html +++ b/templates/newbase.html @@ -199,12 +199,12 @@ @@ -219,13 +219,14 @@
      {% if user.rower.protrialexpires and user.rower.protrialexpires|is_future_date %} - {% if user.rower.plantrialexpires %} + {% if user.rower.plantrialexpires and user.rower.rowerplan != 'plan' %}

    • {{ user.rower.protrialexpires|date_dif|ddays }} days left of your Self-Coach trial - Would you like to upgrade now?

      • {% else %} + {% if user.rower.rowerplan == 'basic' %}

    • {{ user.rower.protrialexpires|date_dif|ddays }} days left of your Pro trial - Would you like to upgrade now? @@ -233,6 +234,7 @@

      • {% endif %} {% endif %} + {% endif %} {% if user.rower.emailbounced %}