Self hosted FLOSS fitness/workout, nutrition and weight tracker
Merge branch 'master' into metrics-graphics
Roland Geider5ab6d5b6bebe
diff --cc wger/settings_global.pyindex b2a6b5794,7864780e6..5440e9ebc--- a/wger/settings_global.py+++ b/wger/settings_global.py@@@ -100,7 -98,7 +98,8 @@@ BOWER_INSTALLED_APPS ='tinymce-dist','DataTables','components-font-awesome',+ 'tinymce',+ 'metrics-graphics')diff --cc wger/weight/templates/overview.htmlindex 38a5387ff,602a01877..082cc4fc1--- a/wger/weight/templates/overview.html+++ b/wger/weight/templates/overview.html@@@ -122,11 -83,20 +117,15 @@@ $(document).ready(function ()Side bar-->{% block sidebar %}+<h3>{% trans "Filter options" %}</h3>+<p>{% blocktrans %}You can zoom in by clicking and dragging the selection.+Clicking on the background resets it.{% endblocktrans %}</p>-+ <p>+ <a href="{% url 'weight:add' %}" class="btn btn-success btn-sm wger-modal-dialog">+ {% trans "Add weight entry" %}+ </a>+ </p>--<h4>{% trans "Filter options" %}</h4>-<p>{% blocktrans %}-Use the second chart to pan or zoom by clicking and dragging the selection. Clicking-on the background resets it.-{% endblocktrans %}</p>--{% if is_owner %}<h4>{% trans "Options" %}</h4><p>