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

fav charts

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-11 08:39:14 +02:00
parent 48564dc31f
commit 7401fc2e66
4 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
rowers/templates/favoritecharts.html
View File

@@ -1,41 +1,46 @@
{% extends "base.html" %} {% extends "newbase.html" %}
{% block title %}Change Favorite Charts{% endblock %} {% block title %}Change Favorite Charts{% endblock %}
{% block content %} {% block main %}
<h1>Change Your Favorite Charts</h1>
<form method="post"> <form method="post">
<ul class="main-content">
{% csrf_token %} {% csrf_token %}
<div class="grid_12 alpha"> <li class="grid_4">
<div class="grid_4 alpha fav-form-header"> <div class="fav-form-header">
<p><input type="submit" value="Update Favorites" class="button green small"/></p> <p><input type="submit" value="Update Favorites" class="button green small"/></p>
</div> </div>
</div>
{{ favorites_formset.management_form }} {{ favorites_formset.management_form }}
</li>
{% for favorites_form in favorites_formset %} {% for favorites_form in favorites_formset %}
<div class="fav-formset grid_4 alpha"> <li>
<h2>Chart {{ forloop.counter }}</h2> <div class="fav-formset rounder">
<table> <h2>Chart {{ forloop.counter }}</h2>
{{ favorites_form.as_table }} <table width=100%>
</table> {{ favorites_form.as_table }}
</div> </table>
</div>
</li>
{% endfor %} {% endfor %}
<div class="grid_12 alpha"> </ul>
<p>&nbsp;</p>
</div>
</form> </form>
<!-- Include formset plugin - including jQuery dependency --> <!-- Include formset plugin - including jQuery dependency -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="/static/js/jquery.formset.js"></script> <script src="/static/js/jquery.formset.js"></script>
<script> <script>
$('.fav-formset').formset({ $('.fav-formset').formset({
addText: '<div class="grid_12">&nbsp;</div><div class="button grid_2 green small">add chart</div>', addText: '<div>&nbsp;</div><div class="button green small">add chart</div>',
deleteText: '<div class="grid_12"><p>&nbsp;</p></div><div class="button grid_1 red small">remove</div>' deleteText: '<div><p>&nbsp;</p></div><div class="button red small">remove</div>'
}); });
</script> </script>
{% endblock %} {% endblock %}
{% block sidebar %}
{% include 'menu_profile.html' %}
{% endblock %}

12
rowers/templates/menu_profile.html
View File

@@ -2,9 +2,9 @@
{% load rowerfilters %} {% load rowerfilters %}
<h1>Profile</h1> <h1>Profile</h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li id="manage-account"> <li id="manage-prefs">
<a href="/rowers/me/edit"> <a href="/rowers/me/preferences/">
<i class="fas fa-user fa-fw"></i>&nbsp;Account <i class="fas fa-cog fa-fw"></i>&nbsp;Zones
</a> </a>
</li> </li>
<li id="manage-impex"> <li id="manage-impex">
@@ -12,9 +12,9 @@
<i class="fas fa-cloud-download fa-fw"></i>&nbsp;Import/Export <i class="fas fa-cloud-download fa-fw"></i>&nbsp;Import/Export
</a> </a>
</li> </li>
<li id="manage-prefs"> <li id="manage-account">
<a href="rowers/me/preferences/"> <a href="/rowers/me/edit">
<i class="fas fa-cog fa-fw"></i>&nbsp;Zones <i class="fas fa-user fa-fw"></i>&nbsp;Account
</a> </a>
</li> </li>
<li id="manage-favs"> <li id="manage-favs">

5
rowers/views.py
View File

@@ -11821,10 +11821,10 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
# Page where user can manage his favorite charts # Page where user can manage his favorite charts
@login_required() @login_required()
def rower_favoritecharts_view(request): def rower_favoritecharts_view(request,userid=0):
message = '' message = ''
successmessage = '' successmessage = ''
r = getrower(request.user) r = getrequestrower(request,userid=userid,notpermanent=True)
favorites = FavoriteChart.objects.filter(user=r).order_by('id') favorites = FavoriteChart.objects.filter(user=r).order_by('id')
aantal = len(favorites) aantal = len(favorites)
favorites_data = [{'yparam1':f.yparam1, favorites_data = [{'yparam1':f.yparam1,
@@ -11879,6 +11879,7 @@ def rower_favoritecharts_view(request):
context = { context = {
'favorites_formset':favorites_formset, 'favorites_formset':favorites_formset,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
'rower':r,
} }

9
static/css/rowsandall2.css
View File

@@ -256,6 +256,15 @@ th.rotate > div > span {
text-decoration: none; text-decoration: none;
} }
.rounder {
border-radius: 10px;
display: block;
overflow-x: hidden;
border: solid 1px #333;
padding: 5px;
margin: 2px;
}
.button { .button {
font: 1.1em/1.5em sans-serif; font: 1.1em/1.5em sans-serif;
text-decoration: none; text-decoration: none;