sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'bugfix/rowerfav' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2017-11-01 20:12:12 +01:00
parent 255f4df8d1 1a91612142
commit 614d315981
8 changed files with 50 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/templates/dashboard.html
+6 -6
View File
@@ -54,14 +54,14 @@
<div id="thumb-container" class="grid_2 alpha"> <div id="thumb-container" class="grid_2 alpha">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% elif forloop.counter == 3 %} {% elif forloop.counter == 3 %}
<div id="thumb-container" class="grid_2 omega"> <div id="thumb-container" class="grid_2 omega">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
@@ -69,7 +69,7 @@
<div id="thumb-container" class="grid_2"> <div id="thumb-container" class="grid_2">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% endif %} {% endif %}
@@ -81,14 +81,14 @@
<div id="thumb-container" class="grid_2 alpha"> <div id="thumb-container" class="grid_2 alpha">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% elif forloop.counter == 3 %} {% elif forloop.counter == 3 %}
<div id="thumb-container" class="grid_2 omega"> <div id="thumb-container" class="grid_2 omega">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
@@ -96,7 +96,7 @@
<div id="thumb-container" class="grid_2"> <div id="thumb-container" class="grid_2">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% endif %} {% endif %}
rowers/templates/list_graphs.html
+2 -2
View File
@@ -23,7 +23,7 @@
<div id="thumb-container" class="grid_2"> <div id="thumb-container" class="grid_2">
<p class="caption"><a href="/rowers/graph/{{ graph.id }}/"> <p class="caption"><a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a></p>
<p class="caption">{{ graph.workout.name }}</p> <p class="caption">{{ graph.workout.name }}</p>
</div> </div>
@@ -46,7 +46,7 @@
<div id="thumb-container" class="grid_2"> <div id="thumb-container" class="grid_2">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<p class="caption"><img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a></p>
<p class="caption">{{ graph.workout.name }}</p> <p class="caption">{{ graph.workout.name }}</p>
</div> </div>
rowers/templates/panel_statcharts.html
+1 -1
View File
@@ -4,7 +4,7 @@
<div id="thumb-container" class="grid_3 alpha"> <div id="thumb-container" class="grid_3 alpha">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="180" height="150"></a>
</div> </div>
{% endfor %} {% endfor %}
rowers/templates/workout_comments.html
+6 -6
View File
@@ -80,14 +80,14 @@
<div id="thumb-container" class="grid_2 alpha"> <div id="thumb-container" class="grid_2 alpha">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% elif forloop.counter == 3 %} {% elif forloop.counter == 3 %}
<div id="thumb-container" class="grid_2 omega"> <div id="thumb-container" class="grid_2 omega">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
@@ -95,7 +95,7 @@
<div id="thumb-container" class="grid_2"> <div id="thumb-container" class="grid_2">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% endif %} {% endif %}
@@ -107,14 +107,14 @@
<div id="thumb-container" class="grid_2 alpha"> <div id="thumb-container" class="grid_2 alpha">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% elif forloop.counter == 3 %} {% elif forloop.counter == 3 %}
<div id="thumb-container" class="grid_2 omega"> <div id="thumb-container" class="grid_2 omega">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
@@ -122,7 +122,7 @@
<div id="thumb-container" class="grid_2"> <div id="thumb-container" class="grid_2">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% endif %} {% endif %}
rowers/templates/workout_form.html
+6 -6
View File
@@ -147,14 +147,14 @@
<div id="thumb-container" class="grid_2 alpha"> <div id="thumb-container" class="grid_2 alpha">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% elif forloop.counter == 3 %} {% elif forloop.counter == 3 %}
<div id="thumb-container" class="grid_2 omega"> <div id="thumb-container" class="grid_2 omega">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
@@ -162,7 +162,7 @@
<div id="thumb-container" class="grid_2"> <div id="thumb-container" class="grid_2">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% endif %} {% endif %}
@@ -174,14 +174,14 @@
<div id="thumb-container" class="grid_2 alpha"> <div id="thumb-container" class="grid_2 alpha">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% elif forloop.counter == 3 %} {% elif forloop.counter == 3 %}
<div id="thumb-container" class="grid_2 omega"> <div id="thumb-container" class="grid_2 omega">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
@@ -189,7 +189,7 @@
<div id="thumb-container" class="grid_2"> <div id="thumb-container" class="grid_2">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% endif %} {% endif %}
rowers/templates/workout_view.html
+26 -25
View File
@@ -94,30 +94,31 @@
</div> </div>
<div id="images" class="grid_6 omega"> <div id="images" class="grid_6 omega">
<h1>Images linked to this workout</h1> <h1>Images linked to this workout</h1>
{% if graphs1 %} {% if graphs1 %}
{% for graph in graphs1 %} {% for graph in graphs1 %}
{% if forloop.counter == 1 %} {% if forloop.counter == 1 %}
<div id="thumb-container" class="grid_2 alpha"> <div id="thumb-container" class="grid_2 alpha">
<a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}"
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/ajax_loader_blue_350.gif'"
alt="{{ graph.filename }}" width="120" height="100"></a>
</div>
{% else %}
<div id="thumb-container" class="grid_2">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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'"
alt="{{ graph.filename }}" width="120" height="100"></a>
</div>
{% else %}
<div id="thumb-container" class="grid_2">
<a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}"
onerror="this.src='/static/img/waiting.png'"
alt="{{ graph.filename }}" width="120" height="100"></a> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% endif %} {% endif %}
@@ -129,14 +130,14 @@
<div id="thumb-container" class="grid_2 alpha"> <div id="thumb-container" class="grid_2 alpha">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% elif forloop.counter == 3 %} {% elif forloop.counter == 3 %}
<div id="thumb-container" class="grid_2 omega"> <div id="thumb-container" class="grid_2 omega">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
@@ -144,7 +145,7 @@
<div id="thumb-container" class="grid_2"> <div id="thumb-container" class="grid_2">
<a href="/rowers/graph/{{ graph.id }}/"> <a href="/rowers/graph/{{ graph.id }}/">
<img src="/{{ graph.filename }}" <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> alt="{{ graph.filename }}" width="120" height="100"></a>
</div> </div>
{% endif %} {% endif %}
rowers/views.py
+3
View File
@@ -6672,8 +6672,11 @@ def workout_flexchart3_view(request,*args,**kwargs):
yparam2 = 'hr' yparam2 = 'hr'
if not request.user.is_anonymous(): if not request.user.is_anonymous():
r = getrower(request.user)
if favoritenr>=0 and r.showfavoritechartnotes: if favoritenr>=0 and r.showfavoritechartnotes:
favoritechartnotes = favorites[favoritenr].notes favoritechartnotes = favorites[favoritenr].notes
else:
favoritechartnotes = ''
else: else:
favoritechartnotes = '' favoritechartnotes = ''
favoritenr = 0 favoritenr = 0
static/img/ajax_loader_blue_350.gif
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 32 KiB