Self hosted FLOSS fitness/workout, nutrition and weight tracker
Migrate more CSS classes to bootstrap 4
Roland Geider05324b526ebf
diff --git a/wger/manager/templates/calendar/day.html b/wger/manager/templates/calendar/day.htmlindex 340bd2b97..0eb1d0417 100644--- a/wger/manager/templates/calendar/day.html+++ b/wger/manager/templates/calendar/day.html@@ -40,7 +40,6 @@{% include 'calendar/partial_overview_table.html' %}-{% for exercise, logs in value.logs.items %}<table class="table table-hover table-bordered" style="margin-top: 2em;"><tr class="active">@@ -57,23 +56,19 @@{{log.weight}} {% trans log.weight_unit.name %}{% if is_owner %}- <span class="editoptions">- <div class="btn-group pull-right">+ <span class="editoptions dropdown">+ <div class="pull-right"><button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown"><span class="{% fa_class 'cog' %}"></span></button>- <ul class="dropdown-menu" role="menu">- <li>- <a href="{% url 'manager:log:edit' log.pk %}"- title="{% trans 'Edit' %}"- class="wger-modal-dialog">{% trans 'Edit' %}</a>- </li>- <li>- <a href="{% url 'manager:log:delete' log.pk %}"- title="{% trans 'Delete' %}"- class="wger-modal-dialog">{% trans 'Delete' %}</a>- </li>- </ul>+ <div class="dropdown-menu">+ <a href="{% url 'manager:log:edit' log.pk %}"+ title="{% trans 'Edit' %}"+ class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a>+ <a href="{% url 'manager:log:delete' log.pk %}"+ title="{% trans 'Delete' %}"+ class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>+ </div></div></span>{% endif %}diff --git a/wger/manager/templates/calendar/month.html b/wger/manager/templates/calendar/month.htmlindex 9e2fe0828..3be6006b6 100644--- a/wger/manager/templates/calendar/month.html+++ b/wger/manager/templates/calendar/month.html@@ -49,56 +49,56 @@ $(document).ready(function() {<h3>{{date}}- <small><a href="{% url 'manager:workout:calendar-day' owner_user date.year date.month date.day %}">{% trans 'Detail page' %}</a></small>+ <small>+ <a href="{% url 'manager:workout:calendar-day' owner_user date.year date.month date.day %}">{% trans 'Detail page' %}</a>+ </small></h3>{% include 'calendar/partial_overview_table.html' %}- <div class="row" style="margin-top: 2em;">+ <div class="row row-cols-1 row-cols-md-3">{% for exercise, logs in value.logs.items %}- <div class="col-sm-4">- <div class="panel panel-default">- <div class="panel-heading" style="min-height: 4em;">+ <div class="col-sm-4 mb-4">+ <div class="card h-100 ">+ <div class="card-header"><a href="{{ exercise.get_absolute_url }}">{{ exercise }}</a></div>- <ul class="list-group" style="min-height: 10em;">- {% for log in logs %}- <li class="list-group-item">- {{log.reps}}- {% if not log.repetition_unit.is_repetition %}- {% trans log.repetition_unit.name %}- {% endif %}- ×- {{log.weight}} {% trans log.weight_unit.name %}-- {% if is_owner %}- <span class="editoptions">- <div class="btn-group pull-right">- <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">- <span class="{% fa_class 'cog' %}"></span>- </button>- <ul class="dropdown-menu" role="menu">- <li>+ <div class="card-body">+ <ul class="list-group list-group-flush">+ {% for log in logs %}+ <li class="list-group-item">+ {{log.reps}}+ {% if not log.repetition_unit.is_repetition %}+ {% trans log.repetition_unit.name %}+ {% endif %}+ ×+ {{log.weight}} {% trans log.weight_unit.name %}++ {% if is_owner %}+ <span class="editoptions">+ <div class="dropdown pull-right">+ <button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">+ <span class="{% fa_class 'cog' %}"></span>+ </button>+ <div class="dropdown-menu" role="menu"><a href="{% url 'manager:log:edit' log.pk %}"title="{% trans 'Edit' %}"- class="wger-modal-dialog">{% trans 'Edit' %}</a>- </li>- <li>+ class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a><a href="{% url 'manager:log:delete' log.pk %}"title="{% trans 'Delete' %}"- class="wger-modal-dialog">{% trans 'Delete' %}</a>- </li>- </ul>- </div>- </span>- {% endif %}- </li>- {% endfor %}- </ul>+ class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>+ </div>+ </div>+ </span>+ {% endif %}+ </li>+ {% endfor %}+ </ul></div></div>+ </div>{% endfor %}</div></div>diff --git a/wger/manager/templates/calendar/partial_overview_table.html b/wger/manager/templates/calendar/partial_overview_table.htmlindex 33eacafbd..7ef9d78e4 100644--- a/wger/manager/templates/calendar/partial_overview_table.html+++ b/wger/manager/templates/calendar/partial_overview_table.html@@ -6,7 +6,7 @@{% if is_owner %}{% if value.session %}- <div class="btn-group"">+ <div class="btn-group"><div class="btn-group" role="group"><button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{% trans "Workout session" %}