Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Move the exercise overview to the boostrap classes

Roland Geiderec60c167b6ed
diff --git a/wger/core/management/commands/clear-cache.py b/wger/core/management/commands/clear-cache.py
index ef0301dc7..9db854512 100644
--- a/wger/core/management/commands/clear-cache.py
+++ b/wger/core/management/commands/clear-cache.py
@@ -61,7 +61,6 @@ class Command(BaseCommand):
delete_template_fragment_cache('muscle-overview', language.id)
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
- delete_template_fragment_cache('exercise-overview-search', language.id)
delete_template_fragment_cache('equipment-overview', language.id)
for language in Language.objects.all():
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 4b90ba7f3..e72b7d588 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -136,7 +136,6 @@ class ExerciseCategory(models.Model):
for language in Language.objects.all():
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
- delete_template_fragment_cache('exercise-overview-search', language.id)
def delete(self, *args, **kwargs):
'''
@@ -145,7 +144,6 @@ class ExerciseCategory(models.Model):
for language in Language.objects.all():
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
- delete_template_fragment_cache('exercise-overview-search', language.id)
super(ExerciseCategory, self).delete(*args, **kwargs)
@@ -224,7 +222,6 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
delete_template_fragment_cache('muscle-overview', language.id)
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
- delete_template_fragment_cache('exercise-overview-search', language.id)
delete_template_fragment_cache('exercise-detail-header', self.id, language.id)
delete_template_fragment_cache('exercise-detail-muscles', self.id, language.id)
delete_template_fragment_cache('equipment-overview', language.id)
@@ -247,7 +244,6 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
delete_template_fragment_cache('muscle-overview', language.id)
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
- delete_template_fragment_cache('exercise-overview-search', language.id)
delete_template_fragment_cache('exercise-detail-header', self.id, language.id)
delete_template_fragment_cache('exercise-detail-muscles', self.id, language.id)
delete_template_fragment_cache('equipment-overview', language.id)
@@ -387,7 +383,6 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
delete_template_fragment_cache('muscle-overview', language.id)
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
- delete_template_fragment_cache('exercise-overview-search', language.id)
delete_template_fragment_cache('equipment-overview', language.id)
delete_template_fragment_cache('exercise-detail-header',
self.exercise.id,
@@ -409,7 +404,6 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
delete_template_fragment_cache('muscle-overview', language.id)
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
- delete_template_fragment_cache('exercise-overview-search', language.id)
delete_template_fragment_cache('exercise-detail-header', self.exercise.id, language.id)
delete_template_fragment_cache('exercise-detail-muscles', self.exercise.id, language.id)
delete_template_fragment_cache('equipment-overview', language.id)
diff --git a/wger/exercises/templates/equipment/overview.html b/wger/exercises/templates/equipment/overview.html
index 219931bde..e23b0206c 100644
--- a/wger/exercises/templates/equipment/overview.html
+++ b/wger/exercises/templates/equipment/overview.html
@@ -45,8 +45,8 @@ $(function() {
<div class="panel panel-default">
<div class="panel-heading">
<h4 class="panel-title">
- <a data-toggle="collapse" data-parent="#accordion" href="#collapse-{{equipment.pk}}">
- {% trans equipment.name %}
+ <a data-toggle="collapse" data-parent="#accordion" href="#collapse-{{equipment.pk}}">
+ {% trans equipment.name %}
</a>
</h4>
</div>
diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.html
index 39022b947..b3c81b51f 100644
--- a/wger/exercises/templates/exercise/overview.html
+++ b/wger/exercises/templates/exercise/overview.html
@@ -24,11 +24,7 @@ function custom_modal_init()
$(document).ready(function() {
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-
-
- console.log(e.target);
var category_id = $(e.target).attr('id').match(/\d+/);
- console.log(category_id);
$(".current-category-name").html($("#category-" + category_id).text());
$("#current-category-edit").attr("href", "/exercise/category/" + category_id + "/edit/");
$("#current-category-delete").attr("href", "/exercise/category/" + category_id + "/delete/");
@@ -77,6 +73,9 @@ $(document).ready(function() {
<div class="list-group">
{% for exercise in item.list|dictsort:"name" %}
<a href="{{ exercise.get_absolute_url }}" class="list-group-item">
+ <div class="visible-xs">
+ <span class="glyphicon glyphicon-chevron-right pull-right"></span>
+ </div>
<div class="media">
<div style="width:60px;height:60px;" class="pull-left">
@@ -124,7 +123,7 @@ $(document).ready(function() {
<h3>{% trans "Add new exercise" %}</h3>
<p>
{% if user.is_authenticated and not user.userprofile.is_temporary %}
- <a href="{% url 'exercise-add' %}">
+ <a href="{% url 'exercise-add' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
@@ -151,7 +150,7 @@ $(document).ready(function() {
{% with exercise=exercises|first %}
<p>
<a href="{% url 'exercisecategory-edit' exercise.category.id %}"
- class="wger-modal-dialog"
+ {% auto_link_css flavour "wger-modal-dialog" %}
id="current-category-edit">
<img src="{% static 'images/icons/edit.svg' %}"
width="32"
@@ -165,7 +164,7 @@ $(document).ready(function() {
<p>
<a href="{% url 'exercisecategory-delete' exercise.category.id %}"
- class="wger-modal-dialog"
+ {% auto_link_css flavour "wger-modal-dialog" %}
id="current-category-delete">
<img src="{% static 'images/icons/trash.svg' %}"
width="32"
@@ -181,7 +180,7 @@ $(document).ready(function() {
<p>
<a href="{% url 'exercisecategory-add' %}"
- class="wger-modal-dialog">
+ {% auto_link_css flavour "wger-modal-dialog" %}>
<img src="{% static 'images/icons/folder-new.svg' %}"
width="32"
height="32"
@@ -194,17 +193,15 @@ $(document).ready(function() {
<h3>{% trans "Search" %}</h3>
- <div class="ui-widget">
- <form action="{% url 'exercise-search' %}"
- method="get"
- id="exercise_search_form">
- {% csrf_token %}
- <input name="term"
- type="search"
- id="exercise-search"
- class="ajax-form-element form-control"
- placeholder="{% trans 'exercise name' %}"
- style="width:100%;">
- </form>
- </div>
+ <form action="{% url 'exercise-search' %}"
+ method="get"
+ id="exercise_search_form">
+ {% csrf_token %}
+ <input name="term"
+ type="search"
+ id="exercise-search"
+ class="ajax-form-element form-control"
+ placeholder="{% trans 'exercise name' %}"
+ >
+ </form>
{% endblock %}
diff --git a/wger/exercises/templates/mobile/exercise/overview.html b/wger/exercises/templates/mobile/exercise/overview.html
index 00029e250..23ae1f284 100644
--- a/wger/exercises/templates/mobile/exercise/overview.html
+++ b/wger/exercises/templates/mobile/exercise/overview.html
@@ -10,6 +10,28 @@
-->
{% block title %}{% trans "Exercises" %}{% endblock %}
+{% block header %}
+<script>
+ $(document).ready(function() {
+
+ // Prevent the form from being submited if JavaScript is enabled
+ $("#exercise_search_form").submit(function() {return false;});
+
+ // Init the autocompleter
+ $("#exercise-search").catcomplete({
+ source: "{% url 'exercise-search' %}",
+ minLength: 2,
+ select: function(event, ui) {
+
+ // Redirect to exercise after clicking on a result
+ // Path is hard coded here, because we can't use the url-tag
+ window.location.href = '/exercise/' + ui.item.id + '/view/'
+ }
+ });
+ });
+</script>
+{% endblock %}
+
<!--
Main Content
@@ -17,22 +39,46 @@
{% block content %}
{% cache cache_timeout exercise-overview-mobile language.id %}
{% regroup exercises by category as exercise_list %}
-<div data-role="collapsible-set" data-theme="c" data-content-theme="c">
+<div class="panel-group" id="accordion">
{% for item in exercise_list %}
- <div data-role="collapsible">
- <h3>{% trans item.grouper.name %}</h3>
-
- <ul data-role="listview">
- {% for exercise in item.list %}
- <li>
- <a href="{{ exercise.get_absolute_url }}" data-ajax="false">
- {% if exercise.main_image.image %}
- <img src="{{ exercise.main_image.image|thumbnail_url:'small' }}">
- {% endif %}
- {{ exercise.name }}</a>
- </li>
- {% endfor %}
- </ul>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4 class="panel-title">
+ <a data-toggle="collapse" data-parent="#accordion" href="#collapse-{{item.grouper.pk}}">
+ {% trans item.grouper.name %}
+ </a>
+ </h4>
+ </div>
+ <div id="collapse-{{item.grouper.pk}}" class="panel-collapse collapse">
+ <div class="panel-body">
+ <div class="list-group">
+ {% for exercise in item.list %}
+ <a href="{{ exercise.get_absolute_url }}" class="list-group-item wger-list-group-item">
+ <div class="media">
+ <span class="glyphicon glyphicon-chevron-right pull-right"></span>
+ <div style="width:60px;height:60px;" class="pull-left">
+ {% if exercise.main_image %}
+ <img alt="{{ exercise.name }}"
+ class="media-object "
+ style="max-width:100%; max-height:100%;"
+ src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}">
+ {% else %}
+ <img alt="{% trans 'Placeholder image for exercise' %}"
+ class="media-object "
+ style="max-width:100%; max-height:100%; opacity: 0.4;"
+ src="{% static 'images/icons/image-placeholder.svg' %}">
+ {% endif %}
+ </div>
+ <div class="media-body">
+ <h4 class="media-heading">{{ exercise.name }}</h4>
+ <span class="text-muted">{{ exercise.equipment.all|join:", " }}</span>
+ </div>
+ </div>
+ </a>
+ {% endfor %}
+ </div>
+ </div>
+ </div>
</div>
{% empty %}
<li>{% trans "No categories." %} {% trans "Use link to create one" %}</li>
@@ -46,37 +92,24 @@
Side bar
-->
{% block sidebar %}
-<h3>{% trans "Search" %}</h3>
-<br>
+ <h3>{% trans "Search" %}</h3>
-{% cache cache_timeout exercise-overview-search language.id %}
-{% regroup exercises by category as exercise_list %}
-<ul data-role="listview"
- data-theme="c"
- data-filter="true"
- data-filter-reveal="true"
- data-inset="true"
- data-filter-placeholder="{% trans 'exercise name' %}"
- id="exercise_search_form">
- {% for item in exercise_list %}
- {% for exercise in item.list %}
- <li>
- <a href="{{ exercise.get_absolute_url }}" data-ajax="false">
- {% if exercise.main_image.image %}
- <img src="{{ exercise.main_image.image|thumbnail_url:'small' }}">
- {% endif %}
- {{ exercise.name }}</a>
- </li>
- {% endfor %}
- {% endfor %}
-</ul>
-{% endcache %}
+ <form action="{% url 'exercise-search' %}"
+ method="get"
+ id="exercise_search_form">
+ {% csrf_token %}
+ <input name="term"
+ type="search"
+ id="exercise-search"
+ class="ajax-form-element form-control"
+ placeholder="{% trans 'exercise name' %}">
+ </form>
<h3>{% trans "Add new exercise" %}</h3>
<p>
{% if user.is_authenticated and not user.userprofile.is_temporary %}
- <a href="{% url 'exercise-add' %}" data-role="button">
+ <a href="{% url 'exercise-add' %}" {% auto_link_css flavour %}>
<img src="{% static 'images/icons/new.svg' %}"
width="32"
height="32"
diff --git a/wger/exercises/tests/test_categories.py b/wger/exercises/tests/test_categories.py
index 11ecf1fe2..bffd03f29 100644
--- a/wger/exercises/tests/test_categories.py
+++ b/wger/exercises/tests/test_categories.py
@@ -83,7 +83,6 @@ class ExerciseCategoryCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))
self.client.get(reverse('exercise-overview'))
self.client.get(reverse('muscle-overview'))
diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.py
index 1d892e016..6d1328fbb 100644
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@ -110,7 +110,6 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
Test the equipment overview cache is correctly generated on visit
'''
if self.is_mobile:
- self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))
self.client.get(reverse('equipment-overview'))
else:
self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
@@ -124,14 +123,12 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
'''
self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))
self.client.get(reverse('equipment-overview'))
self.client.get(reverse('exercise-view', kwargs={'id': 2}))
old_exercise = cache.get(cache_mapper.get_exercise_key(2))
old_overview = cache.get(get_template_cache_name('equipment-overview', 2))
- old_search = cache.get(get_template_cache_name('exercise-overview-search', 2))
exercise = Exercise.objects.get(pk=2)
exercise.name = 'Very cool exercise 2'
@@ -140,14 +137,12 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
exercise.save()
self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))
self.client.get(reverse('equipment-overview'))
self.client.get(reverse('exercise-view', kwargs={'id': 2}))
new_exercise = cache.get(cache_mapper.get_exercise_key(2))
new_overview = cache.get(get_template_cache_name('equipment-overview', 2))
- new_search = cache.get(get_template_cache_name('exercise-overview-search', 2))
self.assertNotEqual(old_exercise.name, new_exercise.name)
self.assertNotEqual(old_overview, new_overview)
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 62238f2b9..b3da67ffa 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -387,10 +387,8 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
'''
if self.is_mobile:
self.assertFalse(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))
self.client.get(reverse('exercise-overview'))
self.assertTrue(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))
- self.assertTrue(cache.get(get_template_cache_name('exercise-overview-search', 2)))
else:
self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))
self.client.get(reverse('exercise-overview'))
@@ -431,8 +429,6 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
old_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))
old_exercise_overview_mobile = cache.get(get_template_cache_name('exercise-overview-mobile',
2))
- old_exercise_overview_search = cache.get(get_template_cache_name('exercise-overview-search',
- 2))
old_detail_header = cache.get(get_template_cache_name('exercise-detail-header', 2, 2))
old_detail_muscles = cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2))
@@ -447,7 +443,6 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
@@ -461,8 +456,6 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
new_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))
new_exercise_overview_mobile = cache.get(get_template_cache_name('exercise-overview-mobile',
2))
- new_exercise_overview_search = cache.get(get_template_cache_name('exercise-overview-search',
- 2))
new_detail_header = cache.get(get_template_cache_name('exercise-detail-header', 2, 2))
new_detail_muscles = cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2))
@@ -475,7 +468,6 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
self.assertNotEqual(old_detail_muscles, new_detail_muscles)
else:
self.assertNotEqual(old_exercise_overview_mobile, new_exercise_overview_mobile)
- self.assertNotEqual(old_exercise_overview_search, new_exercise_overview_search)
class WorkoutCacheTestCase(WorkoutManagerTestCase):