From 8407750027385fc3a7e89a6c90306d9795fa2d2d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 17 Oct 2018 18:53:55 +0200 Subject: [PATCH] frontpage 1st cut --- rowers/templates/analysis.html | 2 +- rowers/templates/frontpage.html | 169 +++++++++++++++++++++++---- rowers/templates/menu_analytics.html | 2 +- rowsandall_app/views.py | 9 +- static/css/frontstyles.css | 44 +++++-- static/css/rowsandall2.css | 13 +++ static/img/analyze.png | Bin 0 -> 2514 bytes static/img/compare.png | Bin 0 -> 3001 bytes static/img/horizontal_line.png | Bin 0 -> 150 bytes static/img/log.png | Bin 0 -> 2139 bytes templates/newbasefront.html | 4 +- 11 files changed, 206 insertions(+), 37 deletions(-) create mode 100644 static/img/analyze.png create mode 100644 static/img/compare.png create mode 100644 static/img/horizontal_line.png create mode 100644 static/img/log.png 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 0000000000000000000000000000000000000000..8aec50ab55feb9fd88dae8b4a97855ec74f19d40 GIT binary patch literal 2514 zcmV;@2`%=CP)n zja8DQ$m15ZAl2g%6Qajuq$!&H|JzqRF+5bQ-s*>@C&PH_1KSpqONQ}zXc*-qus*^? zww9kefRT66OEt~44~`8uyR2!k9XQ{Ft_L-$MJtk3+>%JZ>j|_)pyL{vm#RJc+2{Bk z!t3%?SFpPW{c_&1{0%o#XV8vmCD;G}010qNS#tmY3ljhU3ljkVnw%H_00;I-L_t(& zfz{h-tX)+V2k_r}R8v7vkg4Uwfk6Qwni#1?%9Nv4XlWu~HKK6}Q$UJx3W)Xt)o6Ph zK%ffh7sN!HHrmo^kt3DK3W;%uG7}R$X@LqP5THSzepvgqudi>o!?}I0|K#Mpch5fi zuK(Wq?7h~1uRWlT$cpL>I0Z*zI;N%1)&(1fT$|G816W^|`Ahw>ZJ_B2v!Z$nPRBgV z#-8cct9a6mMA@++4#r^m{sr8IRaje>`O{6>*$DBhs0MHrF2pSCfoE{5F#Jz=sxI?a z$Ejxz9EcByhMSB1M5En}Wmr*{`PN=-?wNR2R3~F8-j5n9@N3*#m-#C_);$F$h(N0=17lX$5z1QPhEW!a;i!16f|3^3Vbxb_< z!cr{2OZYCnQ#y$UE10gWJUEMF%kzv&)+uQGlSz5NTk=|2^=@sNJCxbw_}E|@i)olF)?P3r{R5{ z@Tg{X@(xV|(j2rwI6^bV8up_S&x&e4L3)4D(~mZ7Xg`n@)jNgVn+5q1J8Q(Do|dd% z;vM+-?m`;sGJgc~aTt~-E<0hgcYLW>vMx>U&u)df%zr0Vo*YX?Dzg*utf-E`C1Rbv zzMls68Q0+!EXa!L-NSG0^p0mmwMK-JhfkDqG7{2|osJ{Yb>nz`L~?Q-!yR>*&mDSi zU|7ME@CPie%Y0FTc8`lh>?pi-gzIfM#Ev8M>vfrbqm6nO<7+snF7vxu-%lA*U_iXv zn^E@6q;ssnM>;6~zBbF1I3G*1qMF$nB|}^AEF6cc>oR}70|T1EL-;rTD7?g_xCm$9 zy*N$8(lsbUFNS1yWj0_-wUTs5n?|f0XL4Us1CusSy8=!tFWpK zk84&c3!ksceB%hk)(Gu=pAO8~kUozZ6mH;ac&dX6+Cu8-Wy1418o$ClSy3H7#xrjg zKK3AfSeNGmq`R2OJFA>4WaU zA8cY6@kYbXB=&t;^z0XgFOzkdKUSCdeBnRei8l(DaxbhCqoQBfM!ZpEMYXr^jbTY$ z=6@TlY+dH}i{*3<{wiG3&yBEjHI6Bw1*SDv=QqXV^f1Pam($X=HeI^{)3I?->iQ;X z%!=xRB9z=JhWM5y>TMX!63>ciDt;nVog3;hzqi*q`-E-8H{sy4Dc=jO!jbq7zS?75 zeL>=Q5H_`Xd{AT}bX(zja7Fs}ya`fp+QET>>&8LhArS#V$4F7sPsK!eOI_x_ZN$X> zU}pM!a8SgyFG_K07g!*Kzs*7&nar3c0-HMqQ*65qb4S~584X!c9gfB6-;3)q|8KK) zHiyJ*F4om$zNO{BtPOOjOTFS zL}y2|fq8=CT88YTWJR?ehvTsEl-9I0^NzZh_4XIbBj_+)mT^~c3#fd6#+#rNL&_)WPz2f@3+n3 zb(wF?ifW+zbp%>Oz3=4cAcLa|eEO-i2It&kPfhlS2} zJ1!ro%vkAO`-++H0FgHJNI#5h8a<_ZL3-c}(KxG9LriKU8&?aP=Z=+-IHuTGm-$2Z zgh;m8kQLPtO&Z!HQcrIXw$2|fnRi^3wJ!5@Vo&*C+&>xL`SecTCu}^eoh05)(zf3v zqOe2pWn4GWfk|4jzJ%}TFm1bST|HGeLkJhw;^yQaObF6%-z-ij{N6Z8yTj4#(TpWR zdD$XbyWGV`GYT>4cFoa@VFnx{4&%%bOUGi7ZP?GlIOmBNVt)}RUAfB+`+>VPLh9L|vjcZC1=%^aAGo_q z#M3J$#euuwNO@#Kk67-NZoOvwBbEo*@rdO*+mBd2)1;k!jlR;h(y3xUypuz<4~kH- cZ+mb52iy6~qVU9(X8-^I07*qoM6N<$f`xGLK>z>% literal 0 HcmV?d00001 diff --git a/static/img/compare.png b/static/img/compare.png new file mode 100644 index 0000000000000000000000000000000000000000..154a7fecf3cb68c146947be090492ddd90913c68 GIT binary patch literal 3001 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 literal 0 HcmV?d00001 diff --git a/static/img/horizontal_line.png b/static/img/horizontal_line.png new file mode 100644 index 0000000000000000000000000000000000000000..3c1dc5491c121ebe2ac4d47ef5689439e656b408 GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0y~yV15QM1MG8<*+tbA{B*XdbF+)ZM0}f^bfsR{TDd$ZJ qRKu-KiUH*d^3r~Z1L+;%Um2ckV_~`{<(3WPGI+ZBxvXn zja8DQ$m15ZAl2g%6Qajuq$!&H|JzqRF+5bQ-s*>@C&PH_1KSpqONQ}zXc*-qus*^? zww9kefRT66OEt~44~`8uyR2!k9XQ{Ft_L-$MJtk3+>%JZ>j|_)pyL{vm#RJc+2{Bk z!t3%?SFpPW{c_&1{0%o#XV8vmCD;G}010qNS#tmY3ljhU3ljkVnw%H_00w_aL_t(& zf!*6pj9z6G2k_raCt6ElQtapCE|d=iMHWUWO(V@5jvapS*dK z_rB-3|NlMDeLl`}PMwUaCp$YEyF5HPtn2!Uvw=VNPG-SgsCp`UXr-^n0Sy6pZ@P0#xAJ)Mfq(*5YzJmb9FM^S$F+#gw%ny+1Pwb(udUW}X~d#{17X!n2~f2Hz0# z^!9EN>@pt0PjGiuR3908aXgRTj}u~XGNto$J4oC&3N81Ky*^5KR#Z2Mwf6&4wIb^z zl7=5(WmZ%-j=Xk8cv=N*6{BIptsnlOk2B$-qj;z;^9`-Em=)DJu}|)J80$PZE%yC8TQSOt zY8$?W1$CJpAD-M-h;Y%~21IVd#~RqRgWH4`Tfts2O|QVNVd1MqjO_UaBtD0a>#fIs z-@xuUyd|{m>PsQuH}SK&%)i_@e$x+GQTFWaP8wysSkW(@z~ZJ2)Mfrvyt|j5bkC+3#L$4``ZgMB_nqrC zMhU-hl0TmpSyA<&JQY})zF+RgA-pa2sTVs|i=?8b zheJ<$a5EORnpuz))f`h0h^Wi_?N*G^QPMFyU6=Wq;RwuL5ze^*&$LM7aop0PO}lss zpKj4+8RklHhhgCdL`v0atqcFTI8p7T$M-a_TP-vmUx8x)!#|7^zFQ>EZAvLs7X^}*O(I#~%qwz6_=wZR`67?( zVnHFspp7F>f6p0^vZC5ABCl7>^b^yR3-?zsg{>NSZM^;Xy&_|9%gEEknT8Rkzq5s= zQ8-6<$_;%GUlL*CnToqa*5kIi%>Ov{;`t&l8&P3fN}iih$cpL~k?nX8_l)NSk`48zei8w$i;I8GKeeoPFs*Olu^L`vm7z6D1^07;LP|{LlCTuEgQ2sIKfJ z(M}?H`mo@-cCuvNNu#WFnLi=Ulo#Q}>G;m4clrgv@iP~a#M?^R_J>4`$z}Ma$ex%E zY1>~HnN2OFZC`L)JvF#Q1TG%LBWZy!B}n&vL{upJ+9XN4W6`uUV~Z%wI3b>P+2hiT zLiD=clxB<}aE&O&St+KD`>?ai#W?H4hGQP~<2yYo#uuF Rr%?a^002ovPDHLkV1nslEo}e* literal 0 HcmV?d00001 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%; }