Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' of github.com:wger-project/wger into iss293
Jacob Stoebel55491f9f1ebf
diff --cc wger/core/templates/index.htmlindex baa19e6bc,c42490271..ab79a0639--- a/wger/core/templates/index.html+++ b/wger/core/templates/index.html@@@ -29,21 -28,7 +28,10 @@@ day in your current workout:{% endblock{% for day in current_workout.day_set.all %}<a href="{% url 'manager:day:log' day.pk %}" class="btn btn-block btn-default">{{day.description}}</a>{% endfor %}-- {% else %}- <p>- <em>{% trans "No workouts found." %}</em>- </p>- <p>- <a href="{% url 'manager:workout:add' %}" class="btn btn-success btn-sm">- {% trans "Add workout" %}- </a>- </p>- {% endif %}</div>+ <div class="modal-footer">+ <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>+ </div></div></div></div>diff --cc wger/manager/templates/mobile/schedule/view.htmlindex 680bfff2d,66904e887..aecda9983--- a/wger/manager/templates/mobile/schedule/view.html+++ b/wger/manager/templates/mobile/schedule/view.html@@@ -31,15 -29,10 +29,13 @@@<a href="{% url 'manager:step:delete' step.id %}"title="{% trans 'Delete' %}"class="btn btn-default btn-block">- <img src="{% static 'images/icons/trash.svg' %}"- width="22"- height="22"- alt="{% trans 'Delete' %}">{% trans 'Delete' %}</a>+ <span class="{% fa_class 'trash' %}"></span>+ {% trans 'Delete' %}</a></p></div>+ <div class="modal-footer">+ <button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>+ </div></div></div></div>