fav charts

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 %}

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">

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,
         }