From 49be534e9506666039dd77862f1034f858beea0d Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 7 Dec 2016 21:22:30 +0100
Subject: [PATCH] Favoritecharts

---
 rowers/templates/analysis.html   |  4 ++--
 rowers/templates/flexchart3.html |  4 ++--
 rowers/views.py                  | 30 +++++++++++++++---------------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/rowers/templates/analysis.html b/rowers/templates/analysis.html
index bc78211c..4935c8a1 100644
--- a/rowers/templates/analysis.html
+++ b/rowers/templates/analysis.html
@@ -44,7 +44,7 @@
 	{% if user.rower.rowerplan == 'pro' %}
 	<a class="button blue small" href="/rowers/histo">Power Histogram</a>		
 	{% else %}
-	<a class="button blue small" href="/rowers/about">Power Histogram</a>		
+	<a class="button blue small" href="/rowers/promembership">Power Histogram</a>		
 	{% endif %}
 	</p>
 	<p>
@@ -73,4 +73,4 @@
 </div>
 
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/rowers/templates/flexchart3.html b/rowers/templates/flexchart3.html
index 1a6fa8fb..3f6a2dd8 100644
--- a/rowers/templates/flexchart3.html
+++ b/rowers/templates/flexchart3.html
@@ -176,7 +176,7 @@
     {% if favoritenr > 0 %}
     <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ favoritenr|add:-1 }}">&lt</a>
     {% else %}
-    <p>&nbsp;</p>
+    <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ maxfav }}">&lt</a>
     {% endif %}
   </div>
   <div class="grid_2">
@@ -190,7 +190,7 @@
   {% if favoritenr < maxfav %}
   <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart={{ favoritenr|add:1 }}">&gt</a>
     {% else %}
-  <p>&nbsp;</p>
+  <a class="button blue small" href="/rowers/workout/{{ id }}/flexchart?favoritechart=0">&gt</a>
     {% endif %}
   </div>                        
 </div>
diff --git a/rowers/views.py b/rowers/views.py
index d91a02a9..875457bf 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -1449,7 +1449,7 @@ def histo(request,theuser=0,
 	    promember=1
 
     if not promember:
-	return HttpResponseRedirect("/rowers/about/")
+	return HttpResponseRedirect("/rowers/promembership/")
 	
     # get all indoor rows of in date range
     
@@ -1912,7 +1912,7 @@ def workouts_view(request,message='',successmessage='',
     except Rower.DoesNotExist:
 	return HttpResponse("User has no rower instance")
 
-@user_passes_test(promember,login_url="/login")
+@user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_comparison_list(request,id=0,message='',successmessage='',
                             startdatestring="",enddatestring="",
                             startdate=timezone.now()-datetime.timedelta(days=365),
@@ -2026,7 +2026,7 @@ def workout_view(request,id=0):
 	return HttpResponse("Workout doesn't exist")
 
 
-@user_passes_test(promember,login_url="/login")
+@user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_undo_smoothenpace_view(request,id=0,message="",successmessage=""):
     row = Workout.objects.get(id=id)
     if (checkworkoutuser(request.user,row)==False):
@@ -2053,7 +2053,7 @@ def workout_undo_smoothenpace_view(request,id=0,message="",successmessage=""):
 
 	
 
-@user_passes_test(promember,login_url="/login")
+@user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
     row = Workout.objects.get(id=id)
     if (checkworkoutuser(request.user,row)==False):
@@ -2088,7 +2088,7 @@ def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
 
     return HttpResponseRedirect(url)
 
-@user_passes_test(promember,login_url="/login")
+@user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
     row = Workout.objects.get(id=id)
     if request.method == 'POST':
@@ -2132,7 +2132,7 @@ def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
 		      {'form':form,
 		       'id':row.id})
 
-@user_passes_test(promember,login_url="/login")
+@user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_downloadwind_view(request,id=0,message="",successmessage=""):
     row = Workout.objects.get(id=id)
     f1 = row.csvfilename
@@ -2189,7 +2189,7 @@ def workout_downloadwind_view(request,id=0,message="",successmessage=""):
     return response
 	
 
-@user_passes_test(promember,login_url="/login")
+@user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_wind_view(request,id=0,message="",successmessage=""):
     row = Workout.objects.get(id=id)
     if (checkworkoutuser(request.user,row)==False):
@@ -2285,7 +2285,7 @@ def workout_wind_view(request,id=0,message="",successmessage=""):
 		   'gmapdiv':gmdiv})
     
 
-@user_passes_test(promember,login_url="/login")
+@user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_stream_view(request,id=0,message="",successmessage=""):
     row = Workout.objects.get(id=id)
     if (checkworkoutuser(request.user,row)==False):
@@ -2347,7 +2347,7 @@ def workout_stream_view(request,id=0,message="",successmessage=""):
 		   'the_div':div})
     
 
-@user_passes_test(promember, login_url="/login")
+@user_passes_test(promember, login_url="/",redirect_field_name=None)
 def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
     row = Workout.objects.get(id=id)
     if (checkworkoutuser(request.user,row)==False):
@@ -2477,7 +2477,7 @@ def workout_geeky_view(request,id=0,message="",successmessage=""):
 		   'interactiveplot':script,
 		   'the_div':div})
 
-#@user_passes_test(promember,login_url="/login")
+#@user_passes_test(promember,login_url="/",redirect_field_name=None)
 @login_required()
 def workout_advanced_view(request,id=0,message="",successmessage=""):
     row = Workout.objects.get(id=id)
@@ -2809,7 +2809,7 @@ def testbokeh(request):
 		   'css_res':css_resources,
 		   })
 
-#@user_passes_test(promember,login_url="/login")
+#@user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_biginteractive_view(request,id=0,message="",successmessage=""):
     row = Workout.objects.get(id=id)
     # check if user is owner of this workout
@@ -3051,7 +3051,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
 			  'workout_form.html',
 			  {'form':form})
 
-@user_passes_test(promember,login_url="/login")
+@user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_add_otw_powerplot_view(request,id):
     w = Workout.objects.get(id=id)
     if (checkworkoutuser(request.user,w)==False):
@@ -3273,7 +3273,7 @@ def workout_add_distanceplot_view(request,id):
     url = "/rowers/workout/"+str(w.id)+"/edit"
     return HttpResponseRedirect(url)
 
-@user_passes_test(promember,login_url="/login")
+@user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_add_distanceplot2_view(request,id):
     w = Workout.objects.get(id=id)
     if (checkworkoutuser(request.user,w)==False):
@@ -3317,7 +3317,7 @@ def workout_add_distanceplot2_view(request,id):
     return HttpResponseRedirect(url)
 
 
-@user_passes_test(promember,login_url="/login")
+@user_passes_test(promember,login_url="/",redirect_field_name=None)
 def workout_add_timeplot2_view(request,id):
     w = Workout.objects.get(id=id)
     if (checkworkoutuser(request.user,w)==False):
@@ -4502,7 +4502,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 		   })
 
 
-@user_passes_test(promember,login_url="/login")
+@user_passes_test(promember,login_url="/rowers/me/edit",redirect_field_name=None)
 def rower_favoritecharts_view(request):
     message = ''
     successmessage = ''