diff --git a/rowers/templates/analysis.html b/rowers/templates/analysis.html index a4454ad7..121e38ef 100644 --- a/rowers/templates/analysis.html +++ b/rowers/templates/analysis.html @@ -131,7 +131,7 @@

  • Power Progress

    {% if user|is_planmember %} - + {% else %} {% endif %} diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html index 9acadbac..8b375e0f 100644 --- a/rowers/templates/frontpage.html +++ b/rowers/templates/frontpage.html @@ -7,29 +7,158 @@ {% block main %} {% load tz %} +
      +
    • +

      +

      Free Data and Analysis.

      +

      For Rowers. By Rowers.

      +

      +
      • + {% if user.is_anonymous %} +
    • +  : +
      • +
    • +  : +
      • +
    • + +

      SIGN UP FREE

      +       +
      • +
    • +   +
      • +
    • +   +
      • +
    • +   +
      • +
    • +   +
      • +
    • +
      {% csrf_token %} + +

      Sign In

       + {{ form.as_p }} + +
      +
      • +
    • +   +
      • +
    • +   +
      • + {% endif %} +
    • +

      There is no shortage of training advice for rowers.

      + +

      The best research has found that what works best for one + rower might not work for another. So, what can you do?

      + +

      The best way to improve racing performance is to assess where + you are, set objectives, make a plan, track progress, + and adjust based on the results you are getting. +

      +

      WHAT WE OFFER

      +
      • +
    • +   +
      • +
    • +

      LOG

      +
      + Analyze +
      +

      + Easily upload data from the most popular devices and apps. Maintain + a consistent log for all your rowing (indoor and on the water). +

      +
      • +
    • +

      ANALYZE

      +
      + Analyze +
      +

      + Analyze your workouts with a consistent set of tools +

      +
      • +
    • +

      COMPARE

      +
      + Analyze +
      +

      + Compare your results between workouts and with other rowers in your team +

      +
      • +
    • +   +
      • +
    • +  : +
      • +
    • +  : +
      • +
    • + +

      VIEW ALL

      +       +
      • +
    • +   +
      • +
    • +   +
      • +
    • +
      + horizontal line +
      +
      • +
    • +

      + + Follow @rowsandall +

      +
      • +
    +

    Local Time: {% now "jS F Y H:i" %}

    -

    - - Follow @rowsandall -

    -

    - Compatible with: - Strava icon - SportTracks icon - C2 icon - NK icon - CrewNerd icon - RiM icon - RowPro icon - ErgStick icon - BoatCoach icon - PainSled icon - CoxMate icon - RitmoTime icon -

    + + + +

    + Compatible with: + Strava icon + SportTracks icon + C2 icon + NK icon + CrewNerd icon + RiM icon + RowPro icon + ErgStick icon + BoatCoach icon + PainSled icon + CoxMate icon + RitmoTime icon +

    {% endblock %} diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html index d8dcadb1..cfcfa152 100644 --- a/rowers/templates/menu_analytics.html +++ b/rowers/templates/menu_analytics.html @@ -23,7 +23,7 @@
  • - +  Power Progress
    • diff --git a/rowsandall_app/views.py b/rowsandall_app/views.py index 4bcc1b91..d7276175 100644 --- a/rowsandall_app/views.py +++ b/rowsandall_app/views.py @@ -1,12 +1,19 @@ from django.shortcuts import render, redirect, render_to_response from django.template import RequestContext from django.conf import settings +from rowers.forms import LoginForm from rowingdata import main as rmain def rootview(request): magicsentence = rmain() - return render(request, 'frontpage.html', {'versionstring': magicsentence}) + loginform = LoginForm() + return render(request, + 'frontpage.html', + { + 'versionstring': magicsentence, + 'form':loginform, + }) diff --git a/static/css/frontstyles.css b/static/css/frontstyles.css index db29a0a3..f41aaf4c 100644 --- a/static/css/frontstyles.css +++ b/static/css/frontstyles.css @@ -3,6 +3,7 @@ .wrapper { max-width: 1400px; width: 100%; + color: white; font: 1.2em Helvetica, arial, sans-serif; } @@ -19,7 +20,7 @@ a { text-decoration: none; - color: #1c75bc; + color: white; } nav ul { @@ -351,20 +352,22 @@ .main-head { grid-area: header; - background-color: rgba(255,255,255,0.7); + background-color: rgba(0,0,0,0.6); } .main-user { grid-area: user; - background-color: rgba(255,255,255,0.7); + background-color: rgba(0,0,0,0.6); } .content { grid-area: content; padding: 1.2em 1.2em 1.2em 1.2em; font-size: 1.3rem; + color: white; + background-color: rgba(0,0,0,0.3) } .content h1 { @@ -372,6 +375,10 @@ font-weight: normal; } +.content label { + color: white; +} + .content h2 { font-size 1.2em; font-weight: normal; @@ -386,14 +393,16 @@ font-style: italic; } + + .main-nav { grid-area: nav; - background: #1c75bc; + background-color: rgba(28,117,188,0.6); } .side-nav { grid-area: side-nav; - background: #1c75bc; + background-color: rgba(0,0,0,0.6); } .side { @@ -440,7 +449,7 @@ } .main-footer { grid-area: footer; - background-color: rgba(255,255,255,0.6); + background-color: rgba(0,0,0,0.5); padding: 1.2em 1.2em 1.2em 1.2em; } @@ -477,7 +486,7 @@ } .main-content li.grid_3 { - grid-column-end: span 4; + grid-column-end: span 1; } @@ -489,14 +498,18 @@ .main-content li.grid_4 { grid-column-end: span 1; } +.main-content li.grid_5 { + grid-column-end: span 1; +} +/** .main-content li img { display: block; width: 100%; height: auto; padding: 5px; } - +**/ @media (min-height: 600px) { @@ -563,7 +576,7 @@ .main-content { display: grid; - grid-template-columns: repeat(2,1fr); + grid-template-columns: repeat(3,1fr); grid-gap: 10px; } @@ -572,11 +585,14 @@ } .main-content li.grid_3 { - grid-column-end: span 2; + grid-column-end: span 3; } .main-content li.grid_4 { - grid-column-end: span 2; + grid-column-end: span 3; + } + .main-content li.grid_5 { + grid-column-end: span 3; } } @@ -602,7 +618,7 @@ .main-content { display: grid; - grid-template-columns: repeat(4,1fr); + grid-template-columns: repeat(5,1fr); grid-gap: 10px; } @@ -618,6 +634,10 @@ grid-column-end: span 4; } + .main-content li.grid_5 { + grid-column-end: span 5; + } + } @media print { diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css index 0a324392..358440c6 100644 --- a/static/css/rowsandall2.css +++ b/static/css/rowsandall2.css @@ -276,6 +276,18 @@ th.rotate > div > span { margin: 2px; } +.whiteborder { + border: solid 1px white; +} + +.frontitem { + background-color: rgba(255,255,255,0.5); + border: solid 1px wite; + padding: 5px; + margin: 5px; + color: black; +} + .vignet { border-radius: 50%; display: block; @@ -701,6 +713,7 @@ th.rotate > div > span { -webkit-border-radius: 2em; -moz-border-radius: 2em; border-radius: 2em; + border: solid 1px white; } .medium { font-size: 1.2em; diff --git a/static/img/analyze.png b/static/img/analyze.png new file mode 100644 index 00000000..8aec50ab Binary files /dev/null and b/static/img/analyze.png differ diff --git a/static/img/compare.png b/static/img/compare.png new file mode 100644 index 00000000..154a7fec Binary files /dev/null and b/static/img/compare.png differ diff --git a/static/img/horizontal_line.png b/static/img/horizontal_line.png new file mode 100644 index 00000000..3c1dc549 Binary files /dev/null and b/static/img/horizontal_line.png differ diff --git a/static/img/log.png b/static/img/log.png new file mode 100644 index 00000000..71251c17 Binary files /dev/null and b/static/img/log.png differ diff --git a/templates/newbasefront.html b/templates/newbasefront.html index a97497c6..34d0c3d1 100644 --- a/templates/newbasefront.html +++ b/templates/newbasefront.html @@ -136,8 +136,8 @@ min-width: 1024px; padding: 0; margin: 0; - width: 100%; - height: auto; + width: auto; + height: 100%; }