Self hosted FLOSS fitness/workout, nutrition and weight tracker
Start using consistent GUI elements
Roland Geider79c78de15768
diff --git a/wger/config/templates/language/overview.html b/wger/config/templates/language/overview.htmlindex 0ca326cf4..f9e3e6930 100644--- a/wger/config/templates/language/overview.html+++ b/wger/config/templates/language/overview.html@@ -27,14 +27,8 @@{% block sidebar %}-<h4>{% trans "Options" %}</h4><p>- <a href="{% url 'config:language:add' %}" {% auto_link_css flavour "wger-modal-dialog" %}>- <img src="{% static 'images/icons/folder-new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add' %}"- >+ <a href="{% url 'config:language:add' %}" class="btn btn-success btn-sm wger-modal-dialog">{% trans "Add" %}</a></p>diff --git a/wger/core/templates/license/list.html b/wger/core/templates/license/list.htmlindex dd3466e06..88c34fdfa 100644--- a/wger/core/templates/license/list.html+++ b/wger/core/templates/license/list.html@@ -52,17 +52,10 @@{% block sidebar %}{% if perms.core.add_license %}-<h4>{% trans "Options" %}</h4><p>- <a href="{% url 'core:license:add' %}"- {% auto_link_css flavour "wger-modal-dialog" %}>- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add' %}"- title="{% trans 'Add' %}">- {% trans "Add" %}- </a>+ <a href="{% url 'core:license:add' %}" class="btn btn-success btn-sm wger-modal-dialog">+ {% trans "Add" %}+ </a></p><p>{% blocktrans %}If a license has been localized, e.g. the Creative Commonsdiff --git a/wger/exercises/templates/equipment/list.html b/wger/exercises/templates/equipment/list.htmlindex e9b7bbb00..dbb2ce898 100644--- a/wger/exercises/templates/equipment/list.html+++ b/wger/exercises/templates/equipment/list.html@@ -53,17 +53,10 @@{% block sidebar %}{% if perms.exercises.add_equipment %}-<h4>{% trans "Options" %}</h4><p>- <a href="{% url 'exercise:equipment:add' %}"- {% auto_link_css flavour "wger-modal-dialog" %}>- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add new equipment' %}"- title="{% trans 'Add new equipment' %}">- {% trans "Add new equipment" %}- </a>+ <a href="{% url 'exercise:equipment:add' %}" class="btn btn-success btn-sm wger-modal-dialog">+ {% trans "Add new equipment" %}+ </a></p>{% endif %}{% endblock %}diff --git a/wger/exercises/templates/equipment/overview.html b/wger/exercises/templates/equipment/overview.htmlindex cf81e7b6b..9056a16b6 100644--- a/wger/exercises/templates/equipment/overview.html+++ b/wger/exercises/templates/equipment/overview.html@@ -97,26 +97,18 @@ $(function() {Side bar-->{% block sidebar %}-<h4>{% trans "Add new exercise" %}</h4><p>{% if user.is_authenticated and not user.userprofile.is_temporary %}- <a href="{% url 'exercise:exercise:add' %}" {% auto_link_css flavour %}>- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add new exercise' %}"- title="{% trans 'Add new exercise' %}">- {% trans "Add new exercise" %}+ <a href="{% url 'exercise:exercise:add' %}" class="btn btn-success btn-sm">+ {% trans "Add new exercise" %}</a>{% else %}- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add new exercise' %}"- title="{% trans 'Add new exercise' %}">- <span>- {% trans "Only registered users can do this" %}- </span>+ <a href="#" class="btn btn-success btn-sm disabled">+ {% trans "Add new exercise" %}<br>+ <small>+ {% trans "Only registered users can do this" %}+ </small>+ </a>{% endif %}</p>diff --git a/wger/exercises/templates/exercise/overview.html b/wger/exercises/templates/exercise/overview.htmlindex 07a726ea0..81fd2b671 100644--- a/wger/exercises/templates/exercise/overview.html+++ b/wger/exercises/templates/exercise/overview.html@@ -118,26 +118,18 @@ $(document).ready(function() {Side bar-->{% block sidebar %}-<h4>{% trans "Add new exercise" %}</h4><p>{% if user.is_authenticated and not user.userprofile.is_temporary %}- <a href="{% url 'exercise:exercise:add' %}" {% auto_link_css flavour %}>- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add new exercise' %}"- title="{% trans 'Add new exercise' %}">- {% trans "Add new exercise" %}+ <a href="{% url 'exercise:exercise:add' %}" class="btn btn-success btn-sm">+ {% trans "Add new exercise" %}</a>{% else %}- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add new exercise' %}"- title="{% trans 'Add new exercise' %}">- <span>- {% trans "Only registered users can do this" %}- </span>+ <a href="#" class="btn btn-success btn-sm disabled">+ {% trans "Add new exercise" %}<br>+ <small>+ {% trans "Only registered users can do this" %}+ </small>+ </a>{% endif %}</p>diff --git a/wger/exercises/templates/mobile/exercise/overview.html b/wger/exercises/templates/mobile/exercise/overview.htmlindex 71cf52e73..1cebf5415 100644--- a/wger/exercises/templates/mobile/exercise/overview.html+++ b/wger/exercises/templates/mobile/exercise/overview.html@@ -112,26 +112,18 @@</form>-<h4>{% trans "Add new exercise" %}</h4><p>{% if user.is_authenticated and not user.userprofile.is_temporary %}- <a href="{% url 'exercise:exercise:add' %}" {% auto_link_css flavour %}>- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add new exercise' %}"- title="{% trans 'Add new exercise' %}">- {% trans "Add new exercise" %}+ <a href="{% url 'exercise:exercise:add' %}" class="btn btn-success btn-sm">+ {% trans "Add new exercise" %}</a>{% else %}- <span data-role="button" class="ui-disabled">- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add new exercise' %}"- title="{% trans 'Add new exercise' %}">- {% trans "Only registered users can do this" %}- </span>+ <a href="#" class="btn btn-success btn-sm disabled">+ {% trans "Add new exercise" %}<br>+ <small>+ {% trans "Only registered users can do this" %}+ </small>+ </a>{% endif %}</p>{% endblock %}diff --git a/wger/exercises/templates/muscles/overview.html b/wger/exercises/templates/muscles/overview.htmlindex 07d8ad989..5c923db0b 100644--- a/wger/exercises/templates/muscles/overview.html+++ b/wger/exercises/templates/muscles/overview.html@@ -97,19 +97,11 @@ $(document).ready(function() {{% endcache %}{% if perms.exercises %}-<h4>{% trans "Options" %}</h4><p>-<a href="{% url 'exercise:muscle:add' %}"- title="{% trans 'Add muscle' %}"- {% auto_link_css flavour "wger-modal-dialog" %}>- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add muscle' %}"- title="{% trans 'Add muscle' %}">- {% trans 'Add muscle' %}-</a>+ <a href="{% url 'exercise:muscle:add' %}" class="btn btn-success btn-sm">+ {% trans "Add muscle" %}+ </a></p><p>{% blocktrans %}<strong>Important:</strong> After adding a muscle, you need@@ -117,6 +109,7 @@ to create a new SVG image with the contours of the muscle and place it in thefolder <em>images/muscles</em>.{% endblocktrans %}</p>+<h4>{% trans "Options" %}</h4><div id="muscle-edit-box" style="display:none;"><p><a href="{% url 'exercise:muscle:edit' 1 %}"diff --git a/wger/manager/templates/mobile/workout/overview.html b/wger/manager/templates/mobile/workout/overview.htmlindex a99d32e39..bf1384c10 100644--- a/wger/manager/templates/mobile/workout/overview.html+++ b/wger/manager/templates/mobile/workout/overview.html@@ -29,14 +29,9 @@{% block sidebar %}-<h4>{% trans "Options" %}</h4><p>- <a href="{% url 'manager:workout:add' %}" {% auto_link_css flavour %}>- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add workout' %}"- title="{% trans 'Add workout' %}">- {% trans "Add workout" %}</a>+ <a href="{% url 'manager:workout:add' %}" class="btn btn-success btn-sm">+ {% trans "Add workout" %}</a>+ </a></p>{% endblock %}diff --git a/wger/manager/templates/schedule/overview.html b/wger/manager/templates/schedule/overview.htmlindex 74b058519..cec16198d 100644--- a/wger/manager/templates/schedule/overview.html+++ b/wger/manager/templates/schedule/overview.html@@ -46,7 +46,12 @@{% block sidebar %}-<h4>{% trans "Your schedules" %}</h4>+<p>+ <a href="{% url 'manager:schedule:add' %}" class="btn btn-success btn-sm wger-modal-dialog">+ {% trans "Add schedule" %}</a>+ </a>+</p>+<p>{% blocktrans %}Schedules are collections of workouts that you do insuccession.{% endblocktrans %}</p>@@ -57,16 +62,4 @@ always do the same workouts in succession, e.g. A > B > C > A > B > C and so on.<p>{% blocktrans %}The currently active schedule will remain active (and beshown e.g. in your dashboard) till it reaches the last workout or till youdeactivate it, if it is a loop.{% endblocktrans %}</p>--<h4>{% trans "Add schedule" %}</h4>-<p>-<a href="{% url 'manager:schedule:add' %}"- class="wger-modal-dialog">-<img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add schedule' %}"- title="{% trans 'Add schedule' %}">-{% trans "Add schedule" %}</a>-</p>{% endblock %}diff --git a/wger/manager/templates/workout/overview.html b/wger/manager/templates/workout/overview.htmlindex 4a1a92790..e23e85c88 100644--- a/wger/manager/templates/workout/overview.html+++ b/wger/manager/templates/workout/overview.html@@ -44,14 +44,9 @@{% block sidebar %}-<h4>{% trans "Options" %}</h4><p>- <a href="{% url 'manager:workout:add' %}">- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add workout' %}"- title="{% trans 'Add workout' %}">- {% trans "Add workout" %}</a>+ <a href="{% url 'manager:workout:add' %}" class="btn btn-success btn-sm">+ {% trans "Add workout" %}</a>+ </a></p>{% endblock %}diff --git a/wger/nutrition/templates/ingredient/overview.html b/wger/nutrition/templates/ingredient/overview.htmlindex 2029e7648..a6f48a537 100644--- a/wger/nutrition/templates/ingredient/overview.html+++ b/wger/nutrition/templates/ingredient/overview.html@@ -54,24 +54,18 @@ $(document).ready(function() {{% endblock %}{% block sidebar %}-<h4>{% trans "Add ingredient" %}</h4><p>{% if user.is_authenticated and not user.userprofile.is_temporary %}- <a href="{% url 'nutrition:ingredient:add' %}" {% auto_link_css flavour %}>- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add ingredient' %}"- title="{% trans 'Add ingredient' %}">- {% trans "Add ingredient" %}- </a>+ <a href="{% url 'nutrition:ingredient:add' %}" class="btn btn-success btn-sm">+ {% trans "Add ingredient" %}+ </a>{% else %}- <img src="{% static 'images/icons/new.svg' %}"- width="32"- height="32"- alt="{% trans 'Add ingredient' %}"- title="{% trans 'Add ingredient' %}">- {% trans "Only registered users can do this" %}+ <a href="#" class="btn btn-success btn-sm disabled">+ {% trans "Add ingredient" %}<br>+ <small>+ {% trans "Only registered users can do this" %}+ </small>+ </a>{% endif %}</p>