diff --git a/rowers/mytypes.py b/rowers/mytypes.py index 9249b0a6..e264fa8c 100644 --- a/rowers/mytypes.py +++ b/rowers/mytypes.py @@ -42,35 +42,35 @@ workouttypes_ordered = collections.OrderedDict({ ) workouttypes_icons = collections.OrderedDict({ - 'water':'far fa-water', - 'rower':'far fa-tire', - 'skierg':'far fa-tire', - 'bikeerg':'far fa-biking', - 'dynamic':'far fa-tire', - 'slides':'far fa-tire', - 'paddle':'far fa-utensil-spoon', - 'snow':'far fa-snowflakes', - 'coastal':'far fa-water', - 'c-boat':'far fa-water', - 'churchboat':'far fa-water', - 'Ride':'far fa-biking', - 'bike':'far fa-biking', - 'Run':'far fa-running', - 'NordicSki':'far fa-skiing-nordic', - 'Swim':'far fa-swimmer', - 'Hike':'far fa-hiking', - 'Walk':'far fa-walking', - 'Canoeing':'far fa-blind', - 'Crossfit':'far fa-dumbbell', - 'StandUpPaddling':'far fa-blind', - 'IceSkate':'far fa-skating', - 'WeightTraining':'far fa-dumbbell', - 'InlineSkate':'far fa-skating', - 'Kayaking':'far fa-water', - 'Workout':'far fa-dumbbell', - 'Yoga':'far fa-pray', + 'water':'rowing.svg', # g + 'rower':'indoor_rower.svg', # g + 'skierg':'ski_erg.svg', #g + 'bikeerg':'bike_erg.svg', #g + 'dynamic':'indoor_rower.svg', + 'slides':'indoor_rower.svg', + 'paddle':'paddle.svg', # could be better + 'snow':'cross_country_ski.svg', # ok + 'coastal':'rowing.svg', # ok + 'c-boat':'rowing.svg', # ok + 'churchboat':'rowing.svg', # ok + 'Ride':'bike.svg', # ok + 'bike':'bike.svg', # ok + 'Run':'run.svg', # ok + 'NordicSki':'cross_country_ski.svg', # ok + 'Swim':'swim.svg', # ok + 'Hike':'hike.svg', # ok + 'Walk':'walk.svg', # o k + 'Canoeing':'canoeing.svg', # ok + 'Crossfit':'crossfit.svg', + 'StandUpPaddling':'standup_paddling.svg', + 'IceSkate':'ice_skating.svg', + 'WeightTraining':'weight_training.svg', + 'InlineSkate':'inline_skating.svg', + 'Kayaking':'kayaking.svg', + 'Workout':'workout.svg', + 'Yoga':'yoga.svg', # 'bike':'Bike', - 'other':'far fa-biking', + 'other':'other.svg', } ) diff --git a/rowers/templates/__MACOSX/svg/._bike.svg b/rowers/templates/__MACOSX/svg/._bike.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._bike.svg differ diff --git a/rowers/templates/__MACOSX/svg/._bike_erg.svg b/rowers/templates/__MACOSX/svg/._bike_erg.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._bike_erg.svg differ diff --git a/rowers/templates/__MACOSX/svg/._canoeing.svg b/rowers/templates/__MACOSX/svg/._canoeing.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._canoeing.svg differ diff --git a/rowers/templates/__MACOSX/svg/._cross_country_ski.svg b/rowers/templates/__MACOSX/svg/._cross_country_ski.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._cross_country_ski.svg differ diff --git a/rowers/templates/__MACOSX/svg/._crossfit.svg b/rowers/templates/__MACOSX/svg/._crossfit.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._crossfit.svg differ diff --git a/rowers/templates/__MACOSX/svg/._hike.svg b/rowers/templates/__MACOSX/svg/._hike.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._hike.svg differ diff --git a/rowers/templates/__MACOSX/svg/._ice_skating.svg b/rowers/templates/__MACOSX/svg/._ice_skating.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._ice_skating.svg differ diff --git a/rowers/templates/__MACOSX/svg/._indoor_rower.svg b/rowers/templates/__MACOSX/svg/._indoor_rower.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._indoor_rower.svg differ diff --git a/rowers/templates/__MACOSX/svg/._inline_skating.svg b/rowers/templates/__MACOSX/svg/._inline_skating.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._inline_skating.svg differ diff --git a/rowers/templates/__MACOSX/svg/._kayaking.svg b/rowers/templates/__MACOSX/svg/._kayaking.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._kayaking.svg differ diff --git a/rowers/templates/__MACOSX/svg/._other.svg b/rowers/templates/__MACOSX/svg/._other.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._other.svg differ diff --git a/rowers/templates/__MACOSX/svg/._paddle.svg b/rowers/templates/__MACOSX/svg/._paddle.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._paddle.svg differ diff --git a/rowers/templates/__MACOSX/svg/._rowing.svg b/rowers/templates/__MACOSX/svg/._rowing.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._rowing.svg differ diff --git a/rowers/templates/__MACOSX/svg/._run.svg b/rowers/templates/__MACOSX/svg/._run.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._run.svg differ diff --git a/rowers/templates/__MACOSX/svg/._ski_erg.svg b/rowers/templates/__MACOSX/svg/._ski_erg.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._ski_erg.svg differ diff --git a/rowers/templates/__MACOSX/svg/._standup_paddling.svg b/rowers/templates/__MACOSX/svg/._standup_paddling.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._standup_paddling.svg differ diff --git a/rowers/templates/__MACOSX/svg/._swim.svg b/rowers/templates/__MACOSX/svg/._swim.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._swim.svg differ diff --git a/rowers/templates/__MACOSX/svg/._walk.svg b/rowers/templates/__MACOSX/svg/._walk.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._walk.svg differ diff --git a/rowers/templates/__MACOSX/svg/._weight_training.svg b/rowers/templates/__MACOSX/svg/._weight_training.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._weight_training.svg differ diff --git a/rowers/templates/__MACOSX/svg/._workout.svg b/rowers/templates/__MACOSX/svg/._workout.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._workout.svg differ diff --git a/rowers/templates/__MACOSX/svg/._yoga.svg b/rowers/templates/__MACOSX/svg/._yoga.svg new file mode 100644 index 00000000..61066ba6 Binary files /dev/null and b/rowers/templates/__MACOSX/svg/._yoga.svg differ diff --git a/rowers/templates/bike.svg b/rowers/templates/bike.svg new file mode 100644 index 00000000..50a78948 --- /dev/null +++ b/rowers/templates/bike.svg @@ -0,0 +1,25 @@ + + + + + + diff --git a/rowers/templates/bike_erg.svg b/rowers/templates/bike_erg.svg new file mode 100644 index 00000000..05fd9ddd --- /dev/null +++ b/rowers/templates/bike_erg.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/rowers/templates/canoeing.svg b/rowers/templates/canoeing.svg new file mode 100644 index 00000000..6fd77453 --- /dev/null +++ b/rowers/templates/canoeing.svg @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/rowers/templates/cross_country_ski.svg b/rowers/templates/cross_country_ski.svg new file mode 100644 index 00000000..053971dc --- /dev/null +++ b/rowers/templates/cross_country_ski.svg @@ -0,0 +1,25 @@ + + + + + + + + + diff --git a/rowers/templates/crossfit.svg b/rowers/templates/crossfit.svg new file mode 100644 index 00000000..94424445 --- /dev/null +++ b/rowers/templates/crossfit.svg @@ -0,0 +1,27 @@ + + + + + + diff --git a/rowers/templates/hike.svg b/rowers/templates/hike.svg new file mode 100644 index 00000000..23d9c5b5 --- /dev/null +++ b/rowers/templates/hike.svg @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/rowers/templates/ice_skating.svg b/rowers/templates/ice_skating.svg new file mode 100644 index 00000000..d6381b02 --- /dev/null +++ b/rowers/templates/ice_skating.svg @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/rowers/templates/icons/bike.svg b/rowers/templates/icons/bike.svg new file mode 100644 index 00000000..53783f7f --- /dev/null +++ b/rowers/templates/icons/bike.svg @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/rowers/templates/icons/bike_erg.svg b/rowers/templates/icons/bike_erg.svg new file mode 100644 index 00000000..b53b0f1f --- /dev/null +++ b/rowers/templates/icons/bike_erg.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/rowers/templates/icons/canoeing.svg b/rowers/templates/icons/canoeing.svg new file mode 100644 index 00000000..b749ff73 --- /dev/null +++ b/rowers/templates/icons/canoeing.svg @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/rowers/templates/icons/cross_country_ski.svg b/rowers/templates/icons/cross_country_ski.svg new file mode 100644 index 00000000..cf2207b7 --- /dev/null +++ b/rowers/templates/icons/cross_country_ski.svg @@ -0,0 +1,25 @@ + + + + + + + + + diff --git a/rowers/templates/icons/crossfit.svg b/rowers/templates/icons/crossfit.svg new file mode 100644 index 00000000..6f13a7b6 --- /dev/null +++ b/rowers/templates/icons/crossfit.svg @@ -0,0 +1,29 @@ + + + + + + + + diff --git a/rowers/templates/icons/hike.svg b/rowers/templates/icons/hike.svg new file mode 100644 index 00000000..89fa0a01 --- /dev/null +++ b/rowers/templates/icons/hike.svg @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/rowers/templates/icons/ice_skating.svg b/rowers/templates/icons/ice_skating.svg new file mode 100644 index 00000000..50fa4775 --- /dev/null +++ b/rowers/templates/icons/ice_skating.svg @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/rowers/templates/icons/indoor_rower.svg b/rowers/templates/icons/indoor_rower.svg new file mode 100644 index 00000000..4eba251e --- /dev/null +++ b/rowers/templates/icons/indoor_rower.svg @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/rowers/templates/icons/inline_skating.svg b/rowers/templates/icons/inline_skating.svg new file mode 100644 index 00000000..1945100e --- /dev/null +++ b/rowers/templates/icons/inline_skating.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + diff --git a/rowers/templates/icons/kayaking.svg b/rowers/templates/icons/kayaking.svg new file mode 100644 index 00000000..b4bad483 --- /dev/null +++ b/rowers/templates/icons/kayaking.svg @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/rowers/templates/icons/other.svg b/rowers/templates/icons/other.svg new file mode 100644 index 00000000..b3be09c4 --- /dev/null +++ b/rowers/templates/icons/other.svg @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/rowers/templates/icons/paddle.svg b/rowers/templates/icons/paddle.svg new file mode 100644 index 00000000..2bba600a --- /dev/null +++ b/rowers/templates/icons/paddle.svg @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/rowers/templates/icons/rowing.svg b/rowers/templates/icons/rowing.svg new file mode 100644 index 00000000..0644953d --- /dev/null +++ b/rowers/templates/icons/rowing.svg @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/rowers/templates/icons/run.svg b/rowers/templates/icons/run.svg new file mode 100644 index 00000000..3445f4fb --- /dev/null +++ b/rowers/templates/icons/run.svg @@ -0,0 +1,20 @@ + + + + + + + + diff --git a/rowers/templates/icons/ski_erg.svg b/rowers/templates/icons/ski_erg.svg new file mode 100644 index 00000000..2041a06b --- /dev/null +++ b/rowers/templates/icons/ski_erg.svg @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/rowers/templates/icons/standup_paddling.svg b/rowers/templates/icons/standup_paddling.svg new file mode 100644 index 00000000..e60e9ace --- /dev/null +++ b/rowers/templates/icons/standup_paddling.svg @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/rowers/templates/icons/swim.svg b/rowers/templates/icons/swim.svg new file mode 100644 index 00000000..08633397 --- /dev/null +++ b/rowers/templates/icons/swim.svg @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/rowers/templates/icons/walk.svg b/rowers/templates/icons/walk.svg new file mode 100644 index 00000000..5f91dc00 --- /dev/null +++ b/rowers/templates/icons/walk.svg @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/rowers/templates/icons/weight_training.svg b/rowers/templates/icons/weight_training.svg new file mode 100644 index 00000000..b3510111 --- /dev/null +++ b/rowers/templates/icons/weight_training.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/rowers/templates/icons/workout.svg b/rowers/templates/icons/workout.svg new file mode 100644 index 00000000..f30fe27d --- /dev/null +++ b/rowers/templates/icons/workout.svg @@ -0,0 +1,17 @@ + + + + + + + + diff --git a/rowers/templates/icons/yoga.svg b/rowers/templates/icons/yoga.svg new file mode 100644 index 00000000..4a207e32 --- /dev/null +++ b/rowers/templates/icons/yoga.svg @@ -0,0 +1,19 @@ + + + + + + + + + diff --git a/rowers/templates/indoor_rower.svg b/rowers/templates/indoor_rower.svg new file mode 100644 index 00000000..998e3e05 --- /dev/null +++ b/rowers/templates/indoor_rower.svg @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/rowers/templates/inline_skating.svg b/rowers/templates/inline_skating.svg new file mode 100644 index 00000000..06fd9308 --- /dev/null +++ b/rowers/templates/inline_skating.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + diff --git a/rowers/templates/kayaking.svg b/rowers/templates/kayaking.svg new file mode 100644 index 00000000..3027e2d7 --- /dev/null +++ b/rowers/templates/kayaking.svg @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index 64aa921e..bb67af4b 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -136,19 +136,21 @@ {% endif %} -
+
- {{ workout.workouttype|icon|safe }} + {% with workout.workouttype|icon|safe as templateName %} + {% include templateName %} + {% endwith %}
-
+
Distance
{{ workout.distance|distanceprint }}
-
+
Time
{{ workout.duration |durationprint:"%H:%M:%S.%f" }}
-
+
{% if workout|may_edit:request %} + + + + + diff --git a/rowers/templates/paddle.svg b/rowers/templates/paddle.svg new file mode 100644 index 00000000..2ce5dc3a --- /dev/null +++ b/rowers/templates/paddle.svg @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/rowers/templates/rowing.svg b/rowers/templates/rowing.svg new file mode 100644 index 00000000..478fbd8b --- /dev/null +++ b/rowers/templates/rowing.svg @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/rowers/templates/run.svg b/rowers/templates/run.svg new file mode 100644 index 00000000..7fa18a46 --- /dev/null +++ b/rowers/templates/run.svg @@ -0,0 +1,18 @@ + + + + + + diff --git a/rowers/templates/ski_erg.svg b/rowers/templates/ski_erg.svg new file mode 100644 index 00000000..e788f26b --- /dev/null +++ b/rowers/templates/ski_erg.svg @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/rowers/templates/standup_paddling.svg b/rowers/templates/standup_paddling.svg new file mode 100644 index 00000000..b5d64b11 --- /dev/null +++ b/rowers/templates/standup_paddling.svg @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/rowers/templates/svg/bike.svg b/rowers/templates/svg/bike.svg new file mode 100644 index 00000000..50a78948 --- /dev/null +++ b/rowers/templates/svg/bike.svg @@ -0,0 +1,25 @@ + + + + + + diff --git a/rowers/templates/svg/bike_erg.svg b/rowers/templates/svg/bike_erg.svg new file mode 100644 index 00000000..05fd9ddd --- /dev/null +++ b/rowers/templates/svg/bike_erg.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/rowers/templates/svg/canoeing.svg b/rowers/templates/svg/canoeing.svg new file mode 100644 index 00000000..6fd77453 --- /dev/null +++ b/rowers/templates/svg/canoeing.svg @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/rowers/templates/svg/cross_country_ski.svg b/rowers/templates/svg/cross_country_ski.svg new file mode 100644 index 00000000..053971dc --- /dev/null +++ b/rowers/templates/svg/cross_country_ski.svg @@ -0,0 +1,25 @@ + + + + + + + + + diff --git a/rowers/templates/svg/crossfit.svg b/rowers/templates/svg/crossfit.svg new file mode 100644 index 00000000..94424445 --- /dev/null +++ b/rowers/templates/svg/crossfit.svg @@ -0,0 +1,27 @@ + + + + + + diff --git a/rowers/templates/svg/hike.svg b/rowers/templates/svg/hike.svg new file mode 100644 index 00000000..23d9c5b5 --- /dev/null +++ b/rowers/templates/svg/hike.svg @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/rowers/templates/svg/ice_skating.svg b/rowers/templates/svg/ice_skating.svg new file mode 100644 index 00000000..d6381b02 --- /dev/null +++ b/rowers/templates/svg/ice_skating.svg @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/rowers/templates/svg/indoor_rower.svg b/rowers/templates/svg/indoor_rower.svg new file mode 100644 index 00000000..998e3e05 --- /dev/null +++ b/rowers/templates/svg/indoor_rower.svg @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/rowers/templates/svg/inline_skating.svg b/rowers/templates/svg/inline_skating.svg new file mode 100644 index 00000000..06fd9308 --- /dev/null +++ b/rowers/templates/svg/inline_skating.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + diff --git a/rowers/templates/svg/kayaking.svg b/rowers/templates/svg/kayaking.svg new file mode 100644 index 00000000..3027e2d7 --- /dev/null +++ b/rowers/templates/svg/kayaking.svg @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/rowers/templates/svg/other.svg b/rowers/templates/svg/other.svg new file mode 100644 index 00000000..184ebc08 --- /dev/null +++ b/rowers/templates/svg/other.svg @@ -0,0 +1,20 @@ + + + + + + diff --git a/rowers/templates/svg/paddle.svg b/rowers/templates/svg/paddle.svg new file mode 100644 index 00000000..2ce5dc3a --- /dev/null +++ b/rowers/templates/svg/paddle.svg @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/rowers/templates/svg/rowing.svg b/rowers/templates/svg/rowing.svg new file mode 100644 index 00000000..478fbd8b --- /dev/null +++ b/rowers/templates/svg/rowing.svg @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/rowers/templates/svg/run.svg b/rowers/templates/svg/run.svg new file mode 100644 index 00000000..7fa18a46 --- /dev/null +++ b/rowers/templates/svg/run.svg @@ -0,0 +1,18 @@ + + + + + + diff --git a/rowers/templates/svg/ski_erg.svg b/rowers/templates/svg/ski_erg.svg new file mode 100644 index 00000000..e788f26b --- /dev/null +++ b/rowers/templates/svg/ski_erg.svg @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/rowers/templates/svg/standup_paddling.svg b/rowers/templates/svg/standup_paddling.svg new file mode 100644 index 00000000..b5d64b11 --- /dev/null +++ b/rowers/templates/svg/standup_paddling.svg @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/rowers/templates/svg/swim.svg b/rowers/templates/svg/swim.svg new file mode 100644 index 00000000..13b52084 --- /dev/null +++ b/rowers/templates/svg/swim.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/rowers/templates/svg/walk.svg b/rowers/templates/svg/walk.svg new file mode 100644 index 00000000..d51d7f33 --- /dev/null +++ b/rowers/templates/svg/walk.svg @@ -0,0 +1,16 @@ + + + + + + diff --git a/rowers/templates/svg/weight_training.svg b/rowers/templates/svg/weight_training.svg new file mode 100644 index 00000000..37ae236e --- /dev/null +++ b/rowers/templates/svg/weight_training.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/rowers/templates/svg/workout.svg b/rowers/templates/svg/workout.svg new file mode 100644 index 00000000..427f2612 --- /dev/null +++ b/rowers/templates/svg/workout.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/rowers/templates/svg/yoga.svg b/rowers/templates/svg/yoga.svg new file mode 100644 index 00000000..11ba38da --- /dev/null +++ b/rowers/templates/svg/yoga.svg @@ -0,0 +1,19 @@ + + + + + + + + + diff --git a/rowers/templates/swim.svg b/rowers/templates/swim.svg new file mode 100644 index 00000000..13b52084 --- /dev/null +++ b/rowers/templates/swim.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/rowers/templates/walk.svg b/rowers/templates/walk.svg new file mode 100644 index 00000000..d51d7f33 --- /dev/null +++ b/rowers/templates/walk.svg @@ -0,0 +1,16 @@ + + + + + + diff --git a/rowers/templates/weight_training.svg b/rowers/templates/weight_training.svg new file mode 100644 index 00000000..37ae236e --- /dev/null +++ b/rowers/templates/weight_training.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/rowers/templates/workout.svg b/rowers/templates/workout.svg new file mode 100644 index 00000000..427f2612 --- /dev/null +++ b/rowers/templates/workout.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/rowers/templates/yoga.svg b/rowers/templates/yoga.svg new file mode 100644 index 00000000..11ba38da --- /dev/null +++ b/rowers/templates/yoga.svg @@ -0,0 +1,19 @@ + + + + + + + + + diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py index 18c2b1d4..57db8e3b 100644 --- a/rowers/templatetags/rowerfilters.py +++ b/rowers/templatetags/rowerfilters.py @@ -494,13 +494,9 @@ def icon(workouttype): try: s = workouttypes_icons.get(workouttype) except KeyError: - s = "far fa-biking" + s = "bike.svg" - iconstring = """ - - - - """.format(s=s) + iconstring = "{s}".format(s=s) return iconstring diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css index 1aba5066..62e92d7d 100644 --- a/static/css/rowsandall2.css +++ b/static/css/rowsandall2.css @@ -332,6 +332,17 @@ th.rotate > div > span { margin: 0px; } +.workoutcontainer { + display: grid; + grid-template-columns: 50px repeat(auto-fit, minmax(calc((100% - 100px)/4), 1fr)); + /* grid-template-columns: 50px repeat(auto-fit, minmax(100px, 1fr)) 50px; ????*/ + padding: 5px; +} + +.workoutelement { + margin-left: auto; + margin-right: auto; +} .divlines h3 { font-size: 1.2em; diff --git a/static/img/bike.svg b/static/img/bike.svg new file mode 100644 index 00000000..1cf2f65a --- /dev/null +++ b/static/img/bike.svg @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/static/img/bike_erg.svg b/static/img/bike_erg.svg new file mode 100644 index 00000000..5e441fb2 --- /dev/null +++ b/static/img/bike_erg.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/static/img/canoeing.svg b/static/img/canoeing.svg new file mode 100644 index 00000000..09406837 --- /dev/null +++ b/static/img/canoeing.svg @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/static/img/cross_country_ski.svg b/static/img/cross_country_ski.svg new file mode 100644 index 00000000..51260a59 --- /dev/null +++ b/static/img/cross_country_ski.svg @@ -0,0 +1,25 @@ + + + + + + + + + diff --git a/static/img/crossfit.svg b/static/img/crossfit.svg new file mode 100644 index 00000000..4865cde7 --- /dev/null +++ b/static/img/crossfit.svg @@ -0,0 +1,27 @@ + + + + + + diff --git a/static/img/hike.svg b/static/img/hike.svg new file mode 100644 index 00000000..9b857bc2 --- /dev/null +++ b/static/img/hike.svg @@ -0,0 +1,21 @@ + + + + + + + + + + diff --git a/static/img/ice_skating.svg b/static/img/ice_skating.svg new file mode 100644 index 00000000..112dd33b --- /dev/null +++ b/static/img/ice_skating.svg @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/static/img/indoor_rower.svg b/static/img/indoor_rower.svg new file mode 100644 index 00000000..eab7ba0c --- /dev/null +++ b/static/img/indoor_rower.svg @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/static/img/inline_skating.svg b/static/img/inline_skating.svg new file mode 100644 index 00000000..f0aae778 --- /dev/null +++ b/static/img/inline_skating.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + diff --git a/static/img/kayaking.svg b/static/img/kayaking.svg new file mode 100644 index 00000000..90dbb0c0 --- /dev/null +++ b/static/img/kayaking.svg @@ -0,0 +1,26 @@ + + + + + + + + + diff --git a/static/img/other.svg b/static/img/other.svg new file mode 100644 index 00000000..4c95ea08 --- /dev/null +++ b/static/img/other.svg @@ -0,0 +1,20 @@ + + + + + + diff --git a/static/img/paddle.svg b/static/img/paddle.svg new file mode 100644 index 00000000..0056f1ba --- /dev/null +++ b/static/img/paddle.svg @@ -0,0 +1,25 @@ + + + + + + + + + + diff --git a/static/img/rowing.svg b/static/img/rowing.svg new file mode 100644 index 00000000..aee6bb68 --- /dev/null +++ b/static/img/rowing.svg @@ -0,0 +1,23 @@ + + + + + + + + + diff --git a/static/img/run.svg b/static/img/run.svg new file mode 100644 index 00000000..999d7964 --- /dev/null +++ b/static/img/run.svg @@ -0,0 +1,18 @@ + + + + + + diff --git a/static/img/ski_erg.svg b/static/img/ski_erg.svg new file mode 100644 index 00000000..7f4eb2be --- /dev/null +++ b/static/img/ski_erg.svg @@ -0,0 +1,29 @@ + + + + + + + + + + diff --git a/static/img/standup_paddling.svg b/static/img/standup_paddling.svg new file mode 100644 index 00000000..d79f487a --- /dev/null +++ b/static/img/standup_paddling.svg @@ -0,0 +1,27 @@ + + + + + + + + + + diff --git a/static/img/swim.svg b/static/img/swim.svg new file mode 100644 index 00000000..7d159811 --- /dev/null +++ b/static/img/swim.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + diff --git a/static/img/walk.svg b/static/img/walk.svg new file mode 100644 index 00000000..0b8f7c06 --- /dev/null +++ b/static/img/walk.svg @@ -0,0 +1,16 @@ + + + + + + diff --git a/static/img/weight_training.svg b/static/img/weight_training.svg new file mode 100644 index 00000000..eed70eb5 --- /dev/null +++ b/static/img/weight_training.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + diff --git a/static/img/workout.svg b/static/img/workout.svg new file mode 100644 index 00000000..439aeb40 --- /dev/null +++ b/static/img/workout.svg @@ -0,0 +1,15 @@ + + + + + + diff --git a/static/img/yoga.svg b/static/img/yoga.svg new file mode 100644 index 00000000..748b75a5 --- /dev/null +++ b/static/img/yoga.svg @@ -0,0 +1,19 @@ + + + + + + + + +