From 7401fc2e66bf656386d1b4743191d48e0ab44b48 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 11 Oct 2018 08:39:14 +0200
Subject: [PATCH] fav charts

---
 rowers/templates/favoritecharts.html | 41 ++++++++++++++++------------
 rowers/templates/menu_profile.html   | 12 ++++----
 rowers/views.py                      |  5 ++--
 static/css/rowsandall2.css           | 11 +++++++-
 4 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/rowers/templates/favoritecharts.html b/rowers/templates/favoritecharts.html
index d8c52704..b9ffd6eb 100644
--- a/rowers/templates/favoritecharts.html
+++ b/rowers/templates/favoritecharts.html
@@ -1,41 +1,46 @@
-{% extends "base.html" %}
+{% extends "newbase.html" %}
 
 {% block title %}Change Favorite Charts{% endblock %}
 
-{% block content %}
+{% block main %}
+<h1>Change Your Favorite Charts</h1>
+
 <form method="post">
+<ul class="main-content">
   {% csrf_token %}
-  <div class="grid_12 alpha">
-    <div class="grid_4 alpha fav-form-header">
+  <li class="grid_4">
+    <div class="fav-form-header">
       <p><input type="submit" value="Update Favorites" class="button green small"/></p>
     </div>
-  </div>
   {{ favorites_formset.management_form }}
+  </li>
 
   {% for favorites_form in favorites_formset %}
-  <div class="fav-formset grid_4 alpha">
-  <h2>Chart {{ forloop.counter }}</h2>
-  <table>
-    {{ favorites_form.as_table }}
-  </table>
-  </div>
+  <li>
+    <div class="fav-formset rounder">
+      <h2>Chart {{ forloop.counter }}</h2>
+      <table width=100%>
+        {{ favorites_form.as_table }}
+      </table>
+    </div>
+  </li>
   {% endfor %}
-  <div class="grid_12 alpha">
-    <p>&nbsp;</p>
-  </div>
+</ul>
 </form>
 
-
-
 <!-- Include formset plugin - including jQuery dependency -->
 <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
 <script src="/static/js/jquery.formset.js"></script>
 <script>
     $('.fav-formset').formset({
-        addText: '<div class="grid_12">&nbsp;</div><div class="button grid_2 green small">add chart</div>',
-        deleteText: '<div class="grid_12"><p>&nbsp;</p></div><div class="button grid_1 red small">remove</div>'
+        addText: '<div>&nbsp;</div><div class="button green small">add chart</div>',
+        deleteText: '<div><p>&nbsp;</p></div><div class="button red small">remove</div>'
     });
 </script>
 
 
 {% endblock %}
+
+{% block sidebar %}
+{% include 'menu_profile.html' %}
+{% endblock %}
diff --git a/rowers/templates/menu_profile.html b/rowers/templates/menu_profile.html
index f4535b50..7afa79d9 100644
--- a/rowers/templates/menu_profile.html
+++ b/rowers/templates/menu_profile.html
@@ -2,9 +2,9 @@
 {% load rowerfilters %}
 <h1>Profile</h1>
 <ul class="cd-accordion-menu animated">
-  <li id="manage-account">
-    <a href="/rowers/me/edit">
-      <i class="fas fa-user fa-fw"></i>&nbsp;Account
+  <li id="manage-prefs">
+    <a href="/rowers/me/preferences/">
+      <i class="fas fa-cog fa-fw"></i>&nbsp;Zones
     </a>
   </li>
   <li id="manage-impex">
@@ -12,9 +12,9 @@
       <i class="fas fa-cloud-download fa-fw"></i>&nbsp;Import/Export
     </a>
   </li>
-  <li id="manage-prefs">
-    <a href="rowers/me/preferences/">
-      <i class="fas fa-cog fa-fw"></i>&nbsp;Zones
+  <li id="manage-account">
+    <a href="/rowers/me/edit">
+      <i class="fas fa-user fa-fw"></i>&nbsp;Account
     </a>
   </li>
   <li id="manage-favs">
diff --git a/rowers/views.py b/rowers/views.py
index 65d5860a..63e36bf1 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -11821,10 +11821,10 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 
 # Page where user can manage his favorite charts
 @login_required()
-def rower_favoritecharts_view(request):
+def rower_favoritecharts_view(request,userid=0):
     message = ''
     successmessage = ''
-    r = getrower(request.user)
+    r = getrequestrower(request,userid=userid,notpermanent=True)
     favorites = FavoriteChart.objects.filter(user=r).order_by('id')
     aantal = len(favorites)
     favorites_data = [{'yparam1':f.yparam1,
@@ -11879,6 +11879,7 @@ def rower_favoritecharts_view(request):
     context = {
         'favorites_formset':favorites_formset,
         'teams':get_my_teams(request.user),
+        'rower':r,
         }
 
     
diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css
index a55eb415..bf555be9 100644
--- a/static/css/rowsandall2.css
+++ b/static/css/rowsandall2.css
@@ -254,7 +254,16 @@ th.rotate > div > span {
 
 .dot:hover {
     text-decoration: none; 
-}    
+}
+
+.rounder {
+    border-radius: 10px;
+    display: block;
+    overflow-x: hidden;
+    border: solid 1px #333;
+    padding: 5px;
+    margin: 2px;
+}
 
 .button {
   font: 1.1em/1.5em sans-serif;