Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Replace tabs and other navigation items from jQueryUI with bootstrap

Roland Geiderb3640ee8d4f4
diff --git a/wger/exercises/templates/equipment/overview.html b/wger/exercises/templates/equipment/overview.html
index ac7fb24a2..8142341d9 100644
--- a/wger/exercises/templates/equipment/overview.html
+++ b/wger/exercises/templates/equipment/overview.html
@@ -19,12 +19,6 @@
</style>
<script>
$(function() {
- $("#accordion").accordion({
- collapsible: true,
- heightStyle: "content",
- active: false
- });
-
// Init the autocompleter
$("#exercise-search").catcomplete({
source: "{% url 'wger.exercises.views.exercises.search' %}",
@@ -46,41 +40,44 @@ $(function() {
-->
{% block content %}
{% cache cache_timeout equipment-overview language.id %}
-<div id="accordion">
+<div class="panel-group" id="accordion">
{% for equipment in equipment_list %}
- <h3>{% trans equipment.name %}</h3>
-
- <div>
- <table class="narrow">
- <tbody>
- {% for exercise in equipment.exercise_set.all %}
- {% if exercise.language in exercise_languages %}
- <tr>
- <td style="padding-left:0px;">
- {% if exercise.main_image %}
- <div style="width:60px;height:60px;text-align:center;float:left;">
- <img src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}"
- alt=""
- style="vertical-align:middle;max-width:100%; max-height:100%;">
- </div>
- {% endif %}
-
- <a href="{{ exercise.get_absolute_url }}">
- {{ exercise.name }}</a>
- </td>
- </tr>
- {% endif %}
- {% empty %}
- <tr>
- <td>
- <p>
- {% trans "No exercises for this equipment. Add or edit an exercise and set the equipment." %}
- </p>
- </td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
+ <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>
+ </h4>
+ </div>
+ <div id="collapse-{{equipment.pk}}" class="panel-collapse collapse {% if forloop.first %}in{% endif %}">
+ <div class="panel-body">
+ <div class="list-group">
+ {% for exercise in equipment.exercise_set.all %}
+ {% if exercise.language in exercise_languages %}
+ <a href="{{ exercise.get_absolute_url }}" class="list-group-item">
+ <div class="row">
+ <div class="col-md-1">
+ {% if exercise.main_image %}
+ <span class="pull-left" style="width:60px;height:60px;">
+ <img src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}"
+ alt=""
+ style="max-width:100%; max-height:100%;">
+ </span>
+ {% endif %}
+ </div>
+ <div class="col-md-10" >
+ {{ exercise.name }}
+ </div>
+ </div>
+ </a>
+ {% endif %}
+ {% empty %}
+ {% trans "No exercises for this equipment. Add or edit an exercise and set the equipment." %}
+ {% endfor %}
+ </div>
+ </div>
+ </div>
</div>
{% endfor %}
</div>
diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.html
index a5c98ba7e..7c803d9a6 100644
--- a/wger/exercises/templates/exercise/overview.html
+++ b/wger/exercises/templates/exercise/overview.html
@@ -22,17 +22,18 @@ function custom_modal_init()
}
$(document).ready(function() {
- // Init the tabs for the exercises
- $( "#tabs" ).tabs({
-
- // On selecting a category, set the values to edit it
- activate: function(event, ui) {
- category_id = ui.newTab.attr('id').match(/\d+/);
- $(".current-category-name").html($("#cat-" + category_id).text());
- $("#current-category-edit").attr("href", "/exercise/category/" + category_id + "/edit/");
- $("#current-category-delete").attr("href", "/exercise/category/" + category_id + "/delete/");
- }
- });
+
+ $('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/");
+ })
+
// Prevent the form from being submited if JavaScript is enabled
$("#exercise_search_form").submit(function() {return false;});
@@ -60,50 +61,42 @@ $(document).ready(function() {
{% cache cache_timeout exercise-overview language.id %}
{% regroup exercises by category as exercise_list %}
-<div id="tabs">
- <ul>
- {% for item in exercise_list %}
- <li id="cat-{{ item.grouper.id }}">
- <a href="#cat{{ item.grouper.id }}">{% trans item.grouper.name %}</a>
- </li>
- {% empty %}
- <li>{% trans "No categories." %} {% trans "Use link to create one" %}</li>
- {% endfor %}
- </ul>
+<ul class="nav nav-tabs">
+ {% for item in exercise_list %}
+ <li {% if forloop.first %}class="active"{% endif %}>
+ <a href="#tab-{{ item.grouper.id }}" id="category-{{ item.grouper.id }}" data-toggle="tab">{% trans item.grouper.name %}</a>
+ </li>
+ {% endfor %}
+</ul>
+<div class="tab-content">
{% for item in exercise_list %}
- <div id="cat{{ item.grouper.id }}">
- <table class="narrow">
- <tbody>
+ <div class="tab-pane {% if forloop.first %}active{% endif %}" id="tab-{{ item.grouper.id }}">
+ <div class="list-group">
{% for exercise in item.list %}
- <tr>
- <td style="padding-left:0px;">
- {% if exercise.main_image %}
- <div style="width:60px;height:60px;text-align:center;float:left;">
- <img src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}"
- alt=""
- style="vertical-align:middle;max-width:100%; max-height:100%;">
- </div>
- {% endif %}
-
- <a href="{{ exercise.get_absolute_url }}">
- {{ exercise.name }}</a>
- </td>
- </tr>
- {% empty %}
- <tr>
- <td>
- <p>
- {% trans "No exercises in this category. Add or edit an exercise and set its category" %}
- </p>
- </td>
- </tr>
+ <a href="{{ exercise.get_absolute_url }}" class="list-group-item">
+ <div class="row">
+ <div class="col-md-1">
+ {% if exercise.main_image %}
+ <span class="pull-left" style="width:60px;height:60px;">
+ <img src="{{ exercise.main_image.image|thumbnail_url:'thumbnail' }}"
+ alt=""
+ style="max-width:100%; max-height:100%;">
+ </span>
+ {% endif %}
+ </div>
+ <div class="col-md-10" >
+ {{ exercise.name }}
+ </div>
+ </div>
+ </a>
{% endfor %}
- </tbody>
- </table>
+ </div>
</div>
{% endfor %}
</div>
+
+
{% endcache %}