diff --git a/rowers/templates/menu_profile.html b/rowers/templates/menu_profile.html index 11c21fe0..1315e599 100644 --- a/rowers/templates/menu_profile.html +++ b/rowers/templates/menu_profile.html @@ -1,3 +1,5 @@ +{% load staticfiles %} +{% load rowerfilters %}

Profile

  • @@ -17,3 +19,26 @@
+{% if user.is_authenticated and user|is_manager %} +

 

+ +
    +
  • + + +
      + {% for member in user|team_members %} + + + {% if member == rower.user %} + • + {% else %} +   + {% endif %} + {{ member.first_name }} {{ member.last_name }} + + {% endfor %} +
    +
    • +
+{% endif %} diff --git a/rowers/templates/menu_teams.html b/rowers/templates/menu_teams.html index d6c62fc8..b98bc6c2 100644 --- a/rowers/templates/menu_teams.html +++ b/rowers/templates/menu_teams.html @@ -1,24 +1,101 @@ +{% load staticfiles %} +{% load rowerfilters %}

Teams

+
  • - -  Manage + +  Overview
    • - {% if teams %} -
  • - - -
      - {% for team in teams %} -
    • - -  {{ team.name }} - -
      • - {% endfor %} -
    + {% if user|is_manager %} +
  • + +  New Team +
    • {% endif %}
+

 

+ +{% if teams %} +

Managing

+
    + {% for team in myteams %} +
  • + + +
      +
    • + +  View + +
      • +
    • + +  Edit + +
      • +
    • + +  Member Stats + +
      • +
    • + +  Member Workouts + +
      • +
    • + +  Leave + +
      • +
    • + +  Delete + +
      • +
    +
    • + {% endfor %} +
+{% endif %} + +

 

+ +{% if memberteams %} +

Member

+
    + {% for team in memberteams %} +
  • + + +
      +
    • + +  View + +
      • +
    • + +  Member Stats + +
      • +
    • + +  Member Workouts + +
      • +
    • + +  Leave + +
      • +
    +
    • + {% endfor %} +
+{% endif %} + diff --git a/rowers/templates/rower_exportsettings.html b/rowers/templates/rower_exportsettings.html index fbaa80e2..980e8d73 100644 --- a/rowers/templates/rower_exportsettings.html +++ b/rowers/templates/rower_exportsettings.html @@ -1,31 +1,28 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% block title %}Change Rower Export Settings{% endblock %} -{% block content %} -
-
-

-

Export Settings

- {% if form.errors %} -

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

- {% endif %} +{% block main %} +

Import and Export Settings for {{ rower.user.first_name }} {{ rower.user.last_name }}

+{% if form.errors %} +

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

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

-
-
-
+
+ + {{ form.as_table }} +
+ {% csrf_token %} + +
+ +{% endblock %} + +{% block sidebar %} +{% include 'menu_profile.html' %} {% endblock %} diff --git a/rowers/templates/teams.html b/rowers/templates/teams.html index af2bc40e..280ac749 100644 --- a/rowers/templates/teams.html +++ b/rowers/templates/teams.html @@ -1,46 +1,39 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% block title %}Teams {% endblock %} -{% block content %} -
-
-

-

My Teams

- {% if teams %} - - - - - - - - +{% block main %} +
    + {% if teams %} +
  • +

    My Teams

    +
Name 
+ + + + + + + {% for team in teams %} {% endfor %} -
Name 
- {{ team.name }} + {{ team.name }} -
- Leave -
+ Leave
- {% else %} -

You are not a member of any team.

- {% endif %} -

- + + + {% endif %} -
-
- {% if otherteams %} + {% if otherteams %} +

  • Other Teams

    - +
    @@ -60,21 +53,16 @@ {% endfor %}
    Name
    - - {% else %} -

     

    - {% endif %} -
    • -
    + + {% endif %} -
    -
    - {% if user.rower.rowerplan == 'coach' %} + {% if user.rower.rowerplan == 'coach' %} +

  • Teams I manage

    Number of members: {{ clubsize }}

    Maximum club size: {{ max_clubsize }}

    {% if myteams %} - +
    @@ -88,31 +76,25 @@ {{ team.name }} {% endfor %}
    Name -
    - Delete -
    + Delete
    {% endif %} -
    - New Team -
    - {% else %} -

     

    - {% endif %} -
    • -
    - {% if invites or requests or myrequests or myinvites %} + New Team + + {% endif %} + {% if invites or requests or myrequests or myinvites %} +

  • Invitations and Requests

    This section lists open invites to join a team. By accepting a team invite, you are agreeing with the sharing of personal data between team members and coaches according to our privacy policy.

    - +

    As a team manager, by accepting a team invite, you are agreeing with privacy policy regarding teams and personal data owned by team members.

    @@ -177,8 +159,7 @@ {% endfor %} -

    Manual code redeem

    -
    +

    Manual code redeem

    {% if form.errors %}

    @@ -187,20 +168,17 @@ {% endif %} {% csrf_token %} - {{ form.as_table }} + {{ form.as_table }}
    -

    - -
    -
    -

    - {% else %} -

     

    {% endif %} -
    • -
    + + {% endblock %} + +{% block sidebar %} +{% include 'menu_teams.html' %} +{% endblock %} diff --git a/rowers/urls.py b/rowers/urls.py index 46cf766d..e88eb97e 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -339,6 +339,7 @@ urlpatterns = [ url(r'^me/teams/$',views.rower_teams_view), url(r'^me/calcdps/$',views.rower_calcdps_view), url(r'^me/exportsettings/$',views.rower_exportsettings_view), + url(r'^me/exportsettings/user/(?P\d+)$',views.rower_exportsettings_view), url(r'^team/(?P\d+)/$',views.team_view), url(r'^team/(?P\d+)/memberstats$',views.team_members_stats_view), url(r'^team/(?P\d+)/edit$',views.team_edit_view), @@ -359,7 +360,7 @@ urlpatterns = [ url(r'^me/request/(\w+.*)/$',views.manager_requests_view), url(r'^me/request/$',views.manager_requests_view), url(r'^me/edit/$',views.rower_edit_view), - url(r'^rower/edit/(?P\d+)$',views.rower_edit_view), + url(r'^me/edit/user/(?P\d+)$',views.rower_edit_view), url(r'^me/edit/(.+.*)/$',views.rower_edit_view), url(r'^me/c2authorize/$',views.rower_c2_authorize), url(r'^me/polarauthorize/$',views.rower_polar_authorize), diff --git a/rowers/views.py b/rowers/views.py index 247cf04d..73aad27b 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -11887,8 +11887,8 @@ def rower_favoritecharts_view(request): # page where user sets his export settings @login_required() -def rower_exportsettings_view(request): - r = getrower(request.user) +def rower_exportsettings_view(request,userid=0): + r = getrequestrower(request,userid=userid) if request.method == 'POST': form = RowerExportForm(request.POST) if form.is_valid(): @@ -11901,17 +11901,30 @@ def rower_exportsettings_view(request): messages.info(request,'Settings saved') else: form = RowerExportForm(instance=r) + + breadcrumbs = [ + { + 'url':'/rowers/me', + 'name': 'Profile' + }, + { + 'url': reverse(rower_exportsettings_view), + 'name': 'Export Settings' + } + ] + return render(request, 'rower_exportsettings.html', {'form':form, - 'rower':r, + 'rower':r, + 'breadcrumbs': breadcrumbs, }) # Page where user can set his details # Add email address to form so user can change his email address @login_required() -def rower_edit_view(request,rowerid=0,message=""): - r = getrequestrower(request,rowerid=rowerid,notpermanent=True) +def rower_edit_view(request,rowerid=0,userid=0,message=""): + r = getrequestrower(request,rowerid=rowerid,userid=userid,notpermanent=True) rowerid = r.id @@ -12628,6 +12641,7 @@ def rower_teams_view(request,message='',successmessage=''): r = getrower(request.user) ts = Team.objects.filter(rower=r) myteams = Team.objects.filter(manager=request.user) + memberteams = Team.objects.filter(rower=r).exclude(manager=request.user).order_by('name') otherteams = Team.objects.filter(private='open').exclude(rower=r).exclude(manager=request.user).order_by('name') teams.remove_expired_invites() @@ -12640,12 +12654,23 @@ def rower_teams_view(request,message='',successmessage=''): messages.info(request,successmessage) messages.error(request,message) + + breadcrumbs = [ + { + 'url':reverse(rower_teams_view), + 'name': 'Teams' + } + ] + return render(request, 'teams.html', { 'teams':ts, + 'active':'nav-teams', + 'breadcrumbs':breadcrumbs, 'clubsize':clubsize, 'max_clubsize':max_clubsize, 'myteams':myteams, + 'memberteams':memberteams, 'invites':invites, 'otherteams':otherteams, 'requests':requests, diff --git a/static/css/styles2.css b/static/css/styles2.css index 81c8d8a8..f1ecf61c 100644 --- a/static/css/styles2.css +++ b/static/css/styles2.css @@ -245,7 +245,7 @@ nav a { margin: 1em; } - + nav a, nav a i { color: white; @@ -328,10 +328,22 @@ .sideheader { grid-area: side-header; + color: #dddddd; background: #35383d; padding: 0; } +.side h2 { + color: #dddddd; + font-weight: bold; + text-align: left; + font-size: 1.0em; + padding: 5px; + margin: 0; + margin-left: 30px; + padding-bottom: 0; +} + .sideheader h1 { font-weight: bold; text-align: left; diff --git a/templates/newbase.html b/templates/newbase.html index 398a855b..524b4263 100644 --- a/templates/newbase.html +++ b/templates/newbase.html @@ -209,7 +209,7 @@
  • - +  Teams