From ec7002bfddd52ebd138f999713bfd088e2b245f3 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 18 Oct 2018 12:20:27 +0200 Subject: [PATCH 1/4] fixes in style sheet --- static/css/frontstyles.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/css/frontstyles.css b/static/css/frontstyles.css index 1915b570..818d0e76 100644 --- a/static/css/frontstyles.css +++ b/static/css/frontstyles.css @@ -590,10 +590,10 @@ } .main-content li.grid_4 { - grid-column-end: span 3; + grid-column-end: span 4; } .main-content li.grid_5 { - grid-column-end: span 3; + grid-column-end: span 5; } } From e9bc68c2a9635d41e2be58bd8624e57d11d69b53 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 18 Oct 2018 15:37:05 +0200 Subject: [PATCH 2/4] cleaning up --- rowers/templates/c2_list_import.html | 84 ++++++++++--------- rowers/templates/histoall.html | 54 ------------ rowers/templates/invitations.html | 27 ------ rowers/templates/partners.html | 20 ++--- rowers/templates/plannedsssionsmanage.html | 48 ----------- rowers/templates/registration/logout.html | 21 +++++ rowers/templates/underarmour_list_import.html | 64 +++++++------- rowers/views.py | 4 +- static/css/frontstyles.css | 2 + 9 files changed, 113 insertions(+), 211 deletions(-) delete mode 100644 rowers/templates/histoall.html delete mode 100644 rowers/templates/invitations.html delete mode 100644 rowers/templates/plannedsssionsmanage.html create mode 100644 rowers/templates/registration/logout.html 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 { From e607d24a40e62efd8201256858dc84e55f088b3b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 18 Oct 2018 15:39:04 +0200 Subject: [PATCH 3/4] extra vignet --- rowers/templates/frontpage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html index 60f4e349..24692295 100644 --- a/rowers/templates/frontpage.html +++ b/rowers/templates/frontpage.html @@ -83,7 +83,7 @@ alt="Analyze" width="62px">

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

From 494e71f1519f5ab65b2a9f002c7aee870d93b05e Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 18 Oct 2018 15:43:31 +0200 Subject: [PATCH 4/4] small improvements --- rowers/templates/frontpage.html | 10 ++++++++++ static/css/frontstyles.css | 1 + static/img/upload.png | Bin 0 -> 2240 bytes 3 files changed, 11 insertions(+) create mode 100644 static/img/upload.png diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html index 24692295..5751ed7c 100644 --- a/rowers/templates/frontpage.html +++ b/rowers/templates/frontpage.html @@ -76,6 +76,16 @@

  • WHAT WE OFFER

    • +
  • +

    SYNC

    +
    + Analyze +
    +

    + Easily upload data from the most popular devices and apps. +

    +

  • LOG

    diff --git a/static/css/frontstyles.css b/static/css/frontstyles.css index a3701396..643bfa83 100644 --- a/static/css/frontstyles.css +++ b/static/css/frontstyles.css @@ -476,6 +476,7 @@ overflow-x: hidden; margin-left: 15px; margin-right: 15px; + margin-bottom: 15px; } diff --git a/static/img/upload.png b/static/img/upload.png new file mode 100644 index 0000000000000000000000000000000000000000..53b08fc3ac2ba355604c6fdf815ba34706e64a16 GIT binary patch literal 2240 zcmV;x2tW6UP)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!hqL_t(& zf$iH}j2=}T2Jl~(LMkLC<*Rfv(a47u#S1SikXS%68e*wUq*_hXcm<(Q1?d#LDHSiI z9Z?7$3U{Ixify!&VzDFDLR0C5-Y6)Q#KcJp1tF0DO%>|J|GeFIx9{$|@9xZQi$2NZ zeKTj~oadP{ALsnf^Pi(dWJUEZd>kLdFczlY&IbFtwgc(+8SJdf{LQww&1t&AtfNf#wFsyEyL;JqCJTRu&FNdBh%$PZQ)r_U4f1GC~9oNFR;5V^Z!h6W#XX3eSq_bRqgo(bM~yCfWwFqI$pJ{gM#hv$J~M z>gkj9Q@jtKJ5fYKUFOeWCC!i`o1;^wv2o6W89P#)rZCw_UiFFaYzhKTKi6CMKzQaRo}15RFSx^6doX*S94;O`h%$1DtC*`@4m& z67%VY+8{7ibY12@sLTBOWBJBf!Wa> zUn;^yTbgckBGFyMW}@e}2#re_5x!i+$ewDlrOAlyUoGCV zxi!^!e*@eO3a!IKVp->fe!>0$@Jjl<4SyfA?V8}cT|JJ!HI+3I07)8O#KIxb<2`#} ziuf{i3$mSUkdfePW6s@;FEz+-KZZNE`ZG<{T9^4=vHEcoSy6oif0$$ym)B+f$ENu7 zz@ z@gdAg1B$T$2F{JiCcPfjZxJmOs81KPE%eaT} zTuU4Xjj!X0Igl0AW?X><)Ag;4hqQuui}4?+gTh(ScZqk3?axhZJW-eViq5*y7JNnw zHGkVi!*!W&$M!bro+OrFz7%)pjNG;fOV#pOA~h3OE;MeVYneDJs+~9==e6Zrnk^*9 z)brR^m-&^@y@dLJuv1)XfW^WTW?HQUm*hA&f_v*SUq8S(*9ni@&7B?H!Z!)?+`6o& z9v;BHwMe)RXA+AhdtkDMtrKQ}&7J*6h1X?%BrB@5;^nr+NC>GPz93d5XR^otF~ISK zaCKbMz506$*{rA@6_MBTXUoIZ6p|P2Z{icSth=n&eEc@y7~Igkx_F|YYxQ@Y&@>9i z2v6S7dqkY;#D%_pSb0-wCqWYw8JMJ(NsU3xh>|XQ5 zoA4}Qn`(0m-5922_kwi7r^UtDnl8j~jl^-Q;Jj=iL*j(N#=6Y^g3sdu?8%Dif+mSJ ziPY131lN`Q%)EW0tZ8zwRM;f<9*@s_dZwQi96vRg8Qvha?GK0?lXLNPF>E{@Y};QI z&ZdEE+mnu~rwT6?fs1?aa2g=Y3R2q-iwuR|=wsR)i>an&Y!Im#hs4z`XE-&Z5O>|o zq-KmEaFIyHxmtWWzJ&){PR6-T%puOiqxi;*CFArUbh#KBE*6%m%_9BksfN<8mWUw2 zHAd2}in`1vT5|4-rW5Y2$7Mzm?j9APo;?OjxVuz{z1m2^-7XO`*nC_h+>J%@k#(n7 zo|cN<)<4B^fzc_J+l{1Hb_@rNpw-z|R#fwFB`!2rQth*1DtV|aZvO@E!JMFeaflQE O0000