Merge branch 'bugfix/rowerfav' into develop

rowers/templates/dashboard.html

@@ -54,14 +54,14 @@
 		<div id="thumb-container" class="grid_2 alpha">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 			{% elif forloop.counter == 3 %}
 		<div id="thumb-container" class="grid_2 omega">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 
@@ -69,7 +69,7 @@
 		<div id="thumb-container" class="grid_2">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>
 			{% endif %}
@@ -81,14 +81,14 @@
 		<div id="thumb-container" class="grid_2 alpha">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 			{% elif forloop.counter == 3 %}
 		<div id="thumb-container" class="grid_2 omega">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 
@@ -96,7 +96,7 @@
 		<div id="thumb-container" class="grid_2">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>
 			{% endif %}

rowers/templates/list_graphs.html

@@ -23,7 +23,7 @@
 		<div id="thumb-container" class="grid_2">
 		<p class="caption"><a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a></p>
 		<p class="caption">{{ graph.workout.name }}</p>
 		</div>
@@ -46,7 +46,7 @@
 		<div id="thumb-container" class="grid_2">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<p class="caption"><img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a></p>
 		<p class="caption">{{ graph.workout.name }}</p>
 		</div>

rowers/templates/panel_statcharts.html

@@ -4,7 +4,7 @@
 <div id="thumb-container" class="grid_3 alpha">
   <a href="/rowers/graph/{{ graph.id }}/">
     <img src="/{{ graph.filename }}" 
-	 onerror="this.src='/static/img/waiting.png'"
+	 onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	 alt="{{ graph.filename }}" width="180" height="150"></a>
 </div>	
 {% endfor %}

rowers/templates/workout_comments.html

@@ -80,14 +80,14 @@
   <div id="thumb-container" class="grid_2 alpha">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>	
   {% elif forloop.counter == 3 %}
   <div id="thumb-container" class="grid_2 omega">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>	
   
@@ -95,7 +95,7 @@
   <div id="thumb-container" class="grid_2">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>
   {% endif %}
@@ -107,14 +107,14 @@
   <div id="thumb-container" class="grid_2 alpha">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>	
   {% elif forloop.counter == 3 %}
   <div id="thumb-container" class="grid_2 omega">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>	
   
@@ -122,7 +122,7 @@
   <div id="thumb-container" class="grid_2">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-	   onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>
   {% endif %}

rowers/templates/workout_form.html

@@ -147,14 +147,14 @@
     <div id="thumb-container" class="grid_2 alpha">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>	
     {% elif forloop.counter == 3 %}
     <div id="thumb-container" class="grid_2 omega">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>	
     
@@ -162,7 +162,7 @@
     <div id="thumb-container" class="grid_2">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>
     {% endif %}
@@ -174,14 +174,14 @@
     <div id="thumb-container" class="grid_2 alpha">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>	
     {% elif forloop.counter == 3 %}
     <div id="thumb-container" class="grid_2 omega">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>	
     
@@ -189,7 +189,7 @@
     <div id="thumb-container" class="grid_2">
       <a href="/rowers/graph/{{ graph.id }}/">
 	<img src="/{{ graph.filename }}" 
-	     onerror="this.src='/static/img/waiting.png'"
+	     onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100"></a>
     </div>
     {% endif %}

rowers/templates/workout_view.html

@@ -102,14 +102,15 @@
   <div id="thumb-container" class="grid_2 alpha">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
+           
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>	
   {% elif forloop.counter == 3 %}
   <div id="thumb-container" class="grid_2 omega">
     <a href="/rowers/graph/{{ graph.id }}/">
       <img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+	   onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 	   alt="{{ graph.filename }}" width="120" height="100"></a>
   </div>	
   
@@ -117,7 +118,7 @@
   <div id="thumb-container" class="grid_2">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>
 			{% endif %}
@@ -129,14 +130,14 @@
 		<div id="thumb-container" class="grid_2 alpha">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 			{% elif forloop.counter == 3 %}
 		<div id="thumb-container" class="grid_2 omega">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>	
 
@@ -144,7 +145,7 @@
 		<div id="thumb-container" class="grid_2">
 		<a href="/rowers/graph/{{ graph.id }}/">
 		<img src="/{{ graph.filename }}" 
-			onerror="this.src='/static/img/waiting.png'"
+			onerror="this.src='/static/img/ajax_loader_blue_350.gif'"
 			alt="{{ graph.filename }}" width="120" height="100"></a>
 		</div>
 			{% endif %}

rowers/views.py

@@ -6672,10 +6672,13 @@ def workout_flexchart3_view(request,*args,**kwargs):
             yparam2 = 'hr'
 
     if not request.user.is_anonymous():
+        r = getrower(request.user)
         if favoritenr>=0 and r.showfavoritechartnotes:
             favoritechartnotes = favorites[favoritenr].notes
         else:
             favoritechartnotes = ''
+    else:
+        favoritechartnotes = ''
         favoritenr = 0
         
     if 'plottype' in kwargs: