Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Change further templates to use new icons

Roland Geider3254e031d44a
diff --git a/wger/core/templates/mobile/index.html b/wger/core/templates/mobile/index.html
index 72c17efde..9b777f67a 100644
--- a/wger/core/templates/mobile/index.html
+++ b/wger/core/templates/mobile/index.html
@@ -141,11 +141,7 @@ its default duration in your settings.{% endblocktrans %}
<a href="#timer-current-workout"
data-toggle="modal"
class="btn btn-default btn-block">
- <img src="{% static 'images/icons/play.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Start current workout' %}"
- title="{% trans 'Start current workout' %}">
+ <span class="{% fa_class 'play' 'lg' %}"></span>
<br>
{% trans "Start current workout" %}
</a>
@@ -157,21 +153,13 @@ its default duration in your settings.{% endblocktrans %}
data-toggle="modal"
class="btn btn-default btn-block"
style="white-space: normal;">
- <img src="{% static 'images/icons/list.svg' %}"
- width="32"
- height="32"
- alt="{{current_workout}}"
- title="{{current_workout}}">
+ <span class="{% fa_class 'list' 'lg' %}"></span>
<br>
{{current_workout}}
</a>
{% else %}
<a href="{% url 'manager:workout:add' %}" class="btn btn-default btn-block">
- <img src="{% static 'images/icons/add.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Workout' %}"
- title="{% trans 'Workout' %}">
+ <span class="{% fa_class 'plus' 'lg' %}"></span>
<br>
{% trans "Workout" %}
</a>
@@ -181,11 +169,7 @@ its default duration in your settings.{% endblocktrans %}
<a href="{% url 'manager:workout:calendar' %}"
class="btn btn-default btn-block"
style="white-space: normal;">
- <img src="{% static 'images/icons/calendar.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Calendar' %}"
- title="{% trans 'Calendar' %}">
+ <span class="{% fa_class 'calendar' 'lg' %}"></span>
<br>
{% trans "Calendar" %}
</a>
@@ -200,21 +184,13 @@ its default duration in your settings.{% endblocktrans %}
data-toggle="modal"
class="btn btn-default btn-block"
style="white-space: normal;">
- <img src="{% static 'images/icons/list.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Nutrition' %}"
- title="{% trans 'Nutrition' %}">
+ <span class="{% fa_class 'list' 'lg' %}"></span>
<br>
{{plan}}
</a>
{% else %}
<a href="{% url 'nutrition:plan:add' %}" class="btn btn-default btn-block">
- <img src="{% static 'images/icons/add.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Workouts' %}"
- title="{% trans 'Workouts' %}">
+ <span class="{% fa_class 'plus' 'lg' %}"></span>
<br>
{% trans "Nutrition plan" %}
</a>
@@ -222,11 +198,7 @@ its default duration in your settings.{% endblocktrans %}
</div>
<div class="col-xs-6" style="padding-left: 7px;">
<a href="{% url 'weight:overview' user.username %}" class="btn btn-default btn-block">
- <img src="{% static 'images/icons/statistics.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Weight overview' %}"
- title="{% trans 'Weight overview' %}">
+ <span class="{% fa_class 'line-chart' 'lg' %}"></span>
<br>
{% trans "Weight overview" %}
</a>
@@ -237,11 +209,7 @@ its default duration in your settings.{% endblocktrans %}
<div class="row" style="margin-top: 1em;">
<div class="col-xs-6" style="padding-right: 7px;">
<a href="{% url 'core:user:preferences' %}" class="btn btn-default btn-block">
- <img src="{% static 'images/icons/preferences.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Preferences' %}"
- title="{% trans 'Preferences' %}">
+ <span class="{% fa_class 'cogs' 'lg' %}"></span>
<br>
{% trans "Preferences" %}
</a>
@@ -249,11 +217,7 @@ its default duration in your settings.{% endblocktrans %}
<div class="col-xs-6" style="padding-left: 7px;">
<a href="{% url 'core:contact' %}" class="btn btn-default btn-block">
- <img src="{% static 'images/icons/mail.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Get in touch' %}"
- title="{% trans 'Get in touch' %}">
+ <span class="{% fa_class 'envelope-o' 'lg' %}"></span>
<br>
{% trans "Get in touch" %}
</a>
diff --git a/wger/manager/templates/mobile/schedule/view.html b/wger/manager/templates/mobile/schedule/view.html
index b34e23672..d9b8164cd 100644
--- a/wger/manager/templates/mobile/schedule/view.html
+++ b/wger/manager/templates/mobile/schedule/view.html
@@ -24,17 +24,13 @@
<a href="{% url 'manager:step:edit' step.id %}"
title="{% trans 'Edit' %}"
class="btn btn-default btn-block wger-modal-dialog">
- <img src="{% static 'images/icons/edit.svg' %}"
- width="22"
- height="22"
- alt="{% trans 'Edit' %}">{% trans 'Edit' %}</a>
+ <span class="{% fa_class 'pencil-square-o' %}"></span>
+ {% trans 'Edit' %}</a>
<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>
@@ -52,9 +48,9 @@
<th>{% trans "Schedule active" %}</th>
<td>
{% if schedule.is_active %}
- <span class="glyphicon glyphicon-ok"></span>
+ <span class="{% fa_class 'check' %}"></span>
{% else %}
- <span class="glyphicon glyphicon-remove"></span>
+ <span class="{% fa_class 'times' %}"></span>
{% endif %}
</td>
</tr>
@@ -62,10 +58,10 @@
<th>{% trans "Is a loop" %}</th>
<td>
{% if schedule.is_loop %}
- <span class="glyphicon glyphicon-ok"></span>
- <em>{% trans "This schedule is a loop and will go through the workouts above till you deactivate it" %}</em>
+ <span class="{% fa_class 'check' %}"></span>
+ <small>{% trans "This schedule is a loop and will go through the workouts above till you deactivate it" %}</small>
{% else %}
- <span class="glyphicon glyphicon-remove"></span>
+ <span class="{% fa_class 'times' %}"></span>
{% endif %}
</td>
</tr>
@@ -73,7 +69,7 @@
<tr>
<td colspan="2">
<a href="{% url 'manager:schedule:start' schedule.pk %}" class="btn btn-success btn-sm">
- <span class="glyphicon glyphicon-play"></span>
+ <span class="{% fa_class 'play' %}"></span>
{% trans "Start schedule" %}
</a>
</td>
@@ -106,6 +102,12 @@
{% trans "Add workout" %}
</a>
</div>
+<p><small>{% blocktrans %}Add as many workouts to the schedule as you want. You can
+edit the order by dragging and dropping them. It's also possible to add one workout more
+than once.{% endblocktrans %}</small></p>
+
+
+
{% for step in schedule.schedulestep_set.select_related %}
{% with step_dates=step.get_dates %}
@@ -155,58 +157,6 @@
{% block sidebar %}
-<h4>{% trans "Adding workouts" %}</h4>
-
-<p>{% blocktrans %}Add as many workouts to the schedule as you want. You can
-edit the order by dragging and dropping them. It's also possible to add one workout more
-than once.{% endblocktrans %}</p>
-
-<h4>{% trans "Options" %}</h4>
-
-
-<a href="#download-pdf-popup" data-toggle="modal" {% auto_link_css flavour %}>
- <img src="{% static 'images/icons/save.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Download as PDF' %}"
- title="{% trans 'Download as PDF' %}">
- {% trans "Download as PDF" %}
-</a>
-
-<p>
-<a href="#export-ical-link"
- class="btn btn-default btn-block"
- data-toggle="modal">
-<img src="{% static 'images/icons/calendar.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Export calendar file' %}"
- title="{% trans 'Export calendar file' %}">
-{% trans "Export calendar file" %}</a>
-</p>
-
-<p>
-<a href="{% url 'manager:schedule:edit' schedule.id %}"
- class="btn btn-default btn-block wger-modal-dialog">
-<img src="{% static 'images/icons/edit.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Edit schedule' %}"
- title="{% trans 'Edit schedule' %}">
-{% trans "Edit schedule" %}</a>
-</p>
-
-<p>
-<a href="{% url 'manager:schedule:delete' schedule.id %}"
- class="btn btn-default btn-block wger-modal-dialog">
-<img src="{% static 'images/icons/trash.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Delete schedule' %}"
- title="{% trans 'Delete schedule' %}">
-{% trans "Delete schedule" %}</a>
-</p>
-
<div class="modal fade" id="export-ical-link">
<div class="modal-dialog">
<div class="modal-content">
@@ -221,11 +171,6 @@ application for example google calendar, outlook or iCal. This will create
an appointment for each training day with the appropriate exercises.{% endblocktrans %}</p>
<p>
<a href="{% url 'manager:schedule:ical' schedule.id uid token %}" {% auto_link_css flavour %}>
- <img src="{% static 'images/icons/calendar.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Export calendar file' %}"
- title="{% trans 'Export calendar file' %}">
{% trans "Export calendar file" %}
</a>
</p>
@@ -285,11 +230,6 @@ an appointment for each training day with the appropriate exercises.{% endblockt
<p>
<a href="" class="btn btn-block btn-default" id="download-pdf-button">
- <img src="{% static 'images/icons/save.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Download' %}"
- title="{% trans 'Download' %}">
{% trans "Download" %}
</a>
</p>
@@ -298,3 +238,46 @@ an appointment for each training day with the appropriate exercises.{% endblockt
</div>
</div>
{% endblock %}
+
+
+
+{# #}
+{# Options #}
+{# #}
+{% block options %}
+ <div class="btn-group">
+ <button type="button" class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <span class="glyphicon glyphicon-cog"></span>
+ {% trans "Options" %}
+ </button>
+ <ul class="dropdown-menu">
+ <li>
+ <a href="#" data-toggle="modal" data-target="#export-ical-popup">
+ <span class="{% fa_class 'calendar' %}"></span>
+ {% trans "Export calendar file" %}
+ </a>
+ </li>
+ <li>
+ <a data-toggle="modal" data-target="#download-pdf-popup">
+ <span class="{% fa_class 'download' %}"></span>
+ {% trans "Download as PDF" %}
+ </a>
+ </li>
+ {% if is_owner %}
+ <li>
+ <a href="{% url 'manager:schedule:edit' schedule.id %}" class="wger-modal-dialog">
+ <span class="{% fa_class 'pencil-square-o' %}"></span>
+ {% trans "Edit schedule" %}
+ </a>
+ </li>
+ <li role="separator" class="divider"></li>
+ <li>
+ <a href="{% url 'manager:schedule:delete' schedule.id %}" class="wger-modal-dialog">
+ <span class="{% fa_class 'trash' %}"></span>
+ {% trans "Delete schedule" %}
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+ </div>
+{% endblock %}
\ No newline at end of file
diff --git a/wger/manager/templates/mobile/tags/render_day.html b/wger/manager/templates/mobile/tags/render_day.html
index e6ceaacaf..9f0f033cd 100644
--- a/wger/manager/templates/mobile/tags/render_day.html
+++ b/wger/manager/templates/mobile/tags/render_day.html
@@ -183,7 +183,7 @@
{% if day.set_list %}
{% if editable %}
<a href="{% url 'manager:set:add' day.obj.id %}" class="list-group-item list-group-item-success wger-modal-dialog">
- <span class="glyphicon glyphicon-plus"></span>
+ <span class="{% fa_class 'plus' %}"></span>
{% trans "Add exercises to this workout day" %}
</a>
{% endif %}
diff --git a/wger/manager/templates/mobile/workout/view.html b/wger/manager/templates/mobile/workout/view.html
index 786dbf696..c1a3a90a3 100644
--- a/wger/manager/templates/mobile/workout/view.html
+++ b/wger/manager/templates/mobile/workout/view.html
@@ -125,66 +125,6 @@ $(document).ready(function() {
-<h4>{% trans "Options" %}</h4>
-
-<a href="#download-pdf-popup" data-toggle="modal" {% auto_link_css flavour %}>
- <img src="{% static 'images/icons/save.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Download as PDF' %}"
- title="{% trans 'Download as PDF' %}">
- {% trans "Download as PDF" %}
-</a>
-
-<a href="{% url 'manager:log:log' workout.id %}" {% auto_link_css flavour %}>
- <img src="{% static 'images/icons/statistics.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'View weight log' %}"
- title="{% trans 'View weight log' %}">
- {% trans "View weight log" %}
-</a>
-
-{% if is_owner %}
-<a href="{% url 'manager:workout:edit' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}>
- <img src="{% static 'images/icons/edit.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Edit workout' %}"
- title="{% trans 'Edit workout' %}">
- {% trans "Edit workout" %}
-</a>
-{% endif %}
-
-<a href="#export-ical-link" data-toggle="modal" {% auto_link_css flavour %}>
- <img src="{% static 'images/icons/calendar.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Export calendar file' %}"
- title="{% trans 'Export calendar file' %}">
- {% trans "Export calendar file" %}
-</a>
-
-{% if is_owner %}
-<a href="{% url 'manager:workout:copy' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}>
- <img src="{% static 'images/icons/copy.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Make a copy of this workout' %}"
- title="{% trans 'Make a copy of this workout' %}">
- {% trans "Make a copy of this workout" %}
-</a>
-
-<a href="{% url 'manager:workout:delete' workout.id %}" {% auto_link_css flavour "wger-modal-dialog" %}>
- <img src="{% static 'images/icons/trash.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Delete this workout' %}">
- {% trans "Delete this workout" %}
-</a>
-{% endif %}
-
-
<div class="modal fade" id="export-ical-link">
<div class="modal-dialog">
<div class="modal-content">
@@ -199,11 +139,6 @@ application for example google calendar, outlook or iCal. This will create
an appointment for each training day with the appropriate exercises.{% endblocktrans %}</p>
<p>
<a href="{% url 'manager:workout:ical' workout.id uid token %}" {% auto_link_css flavour %}>
- <img src="{% static 'images/icons/calendar.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Export calendar file' %}"
- title="{% trans 'Export calendar file' %}">
{% trans "Export calendar file" %}
</a>
</p>
@@ -264,11 +199,6 @@ an appointment for each training day with the appropriate exercises.{% endblockt
<p>
<a href="" class="btn btn-block btn-default" id="download-pdf-button">
- <img src="{% static 'images/icons/save.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Download' %}"
- title="{% trans 'Download' %}">
{% trans "Download" %}
</a>
</p>
@@ -277,3 +207,58 @@ an appointment for each training day with the appropriate exercises.{% endblockt
</div>
</div>
{% endblock %}
+
+{# #}
+{# Options #}
+{# #}
+{% block options %}
+<div class="btn-group">
+ <button type="button" class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <span class="glyphicon glyphicon-cog"></span>
+ {% trans "Options" %}
+ </button>
+ <ul class="dropdown-menu">
+ <li>
+ <a data-toggle="modal" data-target="#download-pdf-popup">
+ <span class="{% fa_class 'download' %}"></span>
+ {% trans "Download as PDF" %}
+ </a>
+ </li>
+ <li>
+ <a href="{% url 'manager:log:log' workout.id %}">
+ <span class="{% fa_class 'line-chart' %}"></span>
+ {% trans "View weight log" %}
+ </a>
+ </li>
+ {% if is_owner %}
+ <li>
+ <a href="{% url 'manager:workout:edit' workout.id %}" class="wger-modal-dialog">
+ <span class="{% fa_class 'pencil-square-o' %}"></span>
+ {% trans "Edit workout" %}
+ </a>
+ </li>
+ {% endif %}
+ <li>
+ <a data-toggle="modal" data-target="#export-ical-popup">
+ <span class="{% fa_class 'calendar' %}"></span>
+ {% trans "Export calendar file" %}
+ </a>
+ </li>
+ <li>
+ <a href="{% url 'manager:workout:copy' workout.id %}" class="wger-modal-dialog">
+ <span class="{% fa_class 'clone' %}"></span>
+ {% trans "Make a copy of this workout" %}
+ </a>
+ </li>
+ {% if is_owner %}
+ <li role="separator" class="divider"></li>
+ <li>
+ <a href="{% url 'manager:workout:delete' workout.id %}" class="wger-modal-dialog">
+ <span class="{% fa_class 'trash' %}"></span>
+ {% trans "Delete this workout" %}
+ </a>
+ </li>
+ </ul>
+</div>
+{% endif %}
+{% endblock %}
diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.html
index 415bce5e4..1b85b4adb 100644
--- a/wger/manager/templates/schedule/view.html
+++ b/wger/manager/templates/schedule/view.html
@@ -70,9 +70,9 @@
<th>{% trans "Schedule active" %}</th>
<td>
{% if schedule.is_active %}
- <span class="glyphicon glyphicon-ok"></span>
+ <span class="{% fa_class 'check' %}"></span>
{% else %}
- <span class="glyphicon glyphicon-remove"></span>
+ <span class="{% fa_class 'times' %}"></span>
{% endif %}
</td>
</tr>
@@ -80,10 +80,10 @@
<th>{% trans "Is a loop" %}</th>
<td>
{% if schedule.is_loop %}
- <span class="glyphicon glyphicon-ok"></span>
- <em>{% trans "This schedule is a loop and will go through the workouts above till you deactivate it" %}</em>
+ <span class="{% fa_class 'check' %}"></span>
+ <small>{% trans "This schedule is a loop and will go through the workouts above till you deactivate it" %}</small>
{% else %}
- <span class="glyphicon glyphicon-remove"></span>
+ <span class="{% fa_class 'times' %}"></span>
{% endif %}
</td>
</tr>
@@ -150,13 +150,13 @@
<td colspan="4">
{% if not schedule.is_active %}
<a href="{% url 'manager:schedule:start' schedule.pk %}" class="btn btn-success btn-sm">
- <span class="glyphicon glyphicon-play"></span>
+ <span class="{% fa_class 'play' %}"></span>
{% trans "Start schedule" %}
</a>
{% endif %}
<a href="{% url 'manager:step:add' schedule.id %}" class="wger-modal-dialog btn btn-default btn-sm">
- <span class="glyphicon glyphicon-plus"></span>
+ <span class="{% fa_class 'plus' %}"></span>
{% trans "Add workout" %}
</a>
</td>
diff --git a/wger/nutrition/templates/ingredient/view.html b/wger/nutrition/templates/ingredient/view.html
index 518f91010..8c623ddf3 100644
--- a/wger/nutrition/templates/ingredient/view.html
+++ b/wger/nutrition/templates/ingredient/view.html
@@ -34,17 +34,11 @@ the search.{% endblocktrans %}
{% if perms.nutrition.add_ingredient %}
<div class="btn-group btn-group-justified" role="group">
<a href="{% url 'nutrition:ingredient:accept' ingredient.id %}" class="btn btn-default">
- <img src="{% static 'images/icons/status-on.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Accept' %}">
+ <span class="{% fa_class 'check' %}"></span>
{% trans "Accept" %}
</a>
<a href="{% url 'nutrition:ingredient:decline' ingredient.id %}" class="btn btn-default">
- <img src="{% static 'images/icons/status-off.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Decline' %}">
+ <span class="{% fa_class 'times' %}"></span>
{% trans "Decline" %}
</a>
</div>
@@ -188,34 +182,6 @@ the search.{% endblocktrans %}
{% if perms.nutrition.delete_ingredient %}
-<h4>{% trans "Options" %}</h4>
-
-<p>
-<a href="{% url 'nutrition:ingredient:delete' ingredient.id %}"
- title="{% trans 'Delete ingredient' %}"
- {% auto_link_css flavour "wger-modal-dialog" %}>
- <img src="{% static 'images/icons/trash.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Delete ingredient' %}"
- title="{% trans 'Delete ingredient' %}">
- {% trans 'Delete ingredient' %}
-</a>
-</p>
-
-<p>
-<a href="{% url 'nutrition:ingredient:edit' ingredient.id %}"
- title="{% trans 'Edit ingredient' %}"
- {% auto_link_css flavour %}>
- <img src="{% static 'images/icons/edit.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Edit ingredient' %}"
- title="{% trans 'Edit ingredient' %}">
-{% trans 'Edit ingredient' %}
-</a>
-</p>
-
<h4>{% trans "Weight units" %}</h4>
<p>
<a href="{% url 'nutrition:unit_ingredient:add' ingredient.id %}" class="btn btn-success btn-xs wger-modal-dialog">
@@ -259,3 +225,36 @@ the search.{% endblocktrans %}
{% license_sidebar ingredient.license author %}
{% endblock %}
+
+
+
+
+{# #}
+{# Options #}
+{# #}
+{% block options %}
+{% if perms.nutrition.delete_ingredient %}
+<div class="btn-group">
+ <button type="button" class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <span class="glyphicon glyphicon-cog"></span>
+ {% trans "Options" %}
+ </button>
+ <ul class="dropdown-menu">
+ <li>
+ <a href="{% url 'nutrition:ingredient:delete' ingredient.id %}"
+ title="{% trans 'Delete ingredient' %}" {% auto_link_css flavour "wger-modal-dialog" %}>
+ <span class="{% fa_class 'trash' %}"></span>
+ {% trans 'Delete' %}</a>
+ </li>
+ <li role="separator" class="divider"></li>
+ <li>
+ <a href="{% url 'nutrition:ingredient:edit' ingredient.id %}"
+ title="{% trans 'Edit ingredient' %}"
+ {% auto_link_css flavour %}>
+ <span class="{% fa_class 'pencil-square-o' %}"></span>
+ {% trans 'Edit ingredient' %}</a>
+ </li>
+ </ul>
+</div>
+{% endif %}
+{% endblock %}
\ No newline at end of file
diff --git a/wger/nutrition/templates/mobile/plan/view.html b/wger/nutrition/templates/mobile/plan/view.html
index 0419cde2f..62e8413c8 100644
--- a/wger/nutrition/templates/mobile/plan/view.html
+++ b/wger/nutrition/templates/mobile/plan/view.html
@@ -64,31 +64,16 @@ $(document).ready(function() {
<a href="{% url 'nutrition:meal:delete' meal.id %}"
title="{% trans 'Delete' %}"
{% auto_link_css flavour %}>
- <img src="{% static 'images/icons/trash.svg' %}"
- width="22"
- height="22"
- alt="{% trans 'Delete meal' %}"
- title="{% trans 'Delete meal' %}">
{% trans "Delete meal" %}
</a>
<a href="{% url 'nutrition:meal:edit' meal.id %}"
title="{% trans 'Edit' %}"
{% auto_link_css flavour "wger-modal-dialog" %}>
- <img src="{% static 'images/icons/edit.svg' %}"
- width="22"
- height="22"
- alt="{% trans 'Edit meal' %}"
- title="{% trans 'Edit meal' %}">
{% trans "Edit meal" %}
</a>
<a href="{% url 'nutrition:meal_item:add' meal.id %}"
title="{% trans 'Add' %}"
{% auto_link_css flavour %}>
- <img src="{% static 'images/icons/add.svg' %}"
- width="22"
- height="22"
- alt="{% trans 'Add item to meal' %}"
- title="{% trans 'Add item to meal' %}">
{% trans "Add item to meal" %}
</a>
</div>
@@ -148,19 +133,11 @@ $(document).ready(function() {
<a href="{% url 'nutrition:meal_item:delete' item.id %}"
title="{% trans 'Delete' %}"
{% auto_link_css flavour %}>
- <img src="{% static 'images/icons/trash.svg' %}"
- width="16"
- height="16"
- alt="{% trans 'Delete' %}">
{% trans "Delete" %}
</a>
<a href="{% url 'nutrition:meal_item:edit' item.id %}"
title="{% trans 'Edit' %}"
{% auto_link_css flavour %}>
- <img src="{% static 'images/icons/edit.svg' %}"
- width="16"
- height="16"
- alt="{% trans 'Edit' %}">
{% trans "Edit" %}
</a>
</div>
@@ -239,19 +216,9 @@ $(document).ready(function() {
{% trans "If you find the ingredient list too short, you might want to activate the preference to also show English ingredients." %}
<a href="{% url 'core:user:preferences' %}" id="ajax-english-ingredients">{% trans "That's done here" %}</a>:
{% if owner_user.userprofile.show_english_ingredients %}
- <img src="{% static 'images/icons/status-on.svg' %}"
- width="20"
- height="20"
- alt=""
- id="english-ingredients-status"
- data-show-ingredients="true">
+ <span class="{% fa_class 'check' %}" data-show-ingredients="true"></span>
{% else %}
- <img src="{% static 'images/icons/status-off.svg' %}"
- width="20"
- height="20"
- alt=""
- id="english-ingredients-status"
- data-show-ingredients="false">
+ <span class="{% fa_class 'times' %}" data-show-ingredients="false"></span>
{% endif %}
</p>
{% endif %}
@@ -365,46 +332,47 @@ $(document).ready(function() {
</tr>
</tbody>
</table>
+{% endblock %}
-<h4>{% trans "Options" %}</h4>
-<a href="{% url 'nutrition:plan:export-pdf' plan.id uid token %}"
- {% auto_link_css flavour %}>
- <img src="{% static 'images/icons/save.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Download as PDF' %}"
- title="{% trans 'Download as PDF' %}">
- {% trans "Download as PDF" %}
-</a>
-
-{% if is_owner %}
-<a href="{% url 'nutrition:plan:edit' plan.id %}"
- {% auto_link_css flavour "wger-modal-dialog" %}>
- <img src="{% static 'images/icons/edit.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Edit nutrition plan' %}">
- {% trans "Edit nutrition plan" %}
-</a>
-
-<a href="{% url 'nutrition:plan:copy' plan.id %}"
- {% auto_link_css flavour %}>
- <img src="{% static 'images/icons/copy.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Make a copy of this nutrition plan' %}">
- {% trans "Make a copy of this nutrition plan" %}
-</a>
-
-<a href="{% url 'nutrition:plan:delete' plan.id %}"
- {% auto_link_css flavour "wger-modal-dialog" %}>
- <img src="{% static 'images/icons/trash.svg' %}"
- width="32"
- height="32"
- alt="{% trans 'Delete nutrition plan' %}">
- {% trans "Delete nutrition plan" %}
-</a>
-{% endif %}
-{% endblock %}
+{# #}
+{# Options #}
+{# #}
+{% block options %}
+<div class="btn-group">
+ <button type="button" class="btn btn-primary btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+ <span class="glyphicon glyphicon-cog"></span>
+ {% trans "Options" %}
+ </button>
+ <ul class="dropdown-menu">
+ <li>`
+ <a href="{% url 'nutrition:plan:export-pdf' plan.id uid token %}" target="_blank">
+ <span class="{% fa_class 'download' %}"></span>
+ {% trans "Download as PDF" %}
+ </a>
+ </li>
+ {% if is_owner %}
+ <li>
+ <a href="{% url 'nutrition:plan:edit' plan.id %}" class="wger-modal-dialog">
+ <span class="{% fa_class 'pencil-square-o' %}"></span>
+ {% trans "Edit nutrition plan" %}
+ </a>
+ </li>
+ <li>
+ <a href="{% url 'nutrition:plan:copy' plan.id %}">
+ <span class="{% fa_class 'clone' %}"></span>
+ {% trans "Make a copy of this nutrition plan" %}
+ </a>
+ </li>
+ <li role="separator" class="divider"></li>
+ <li>
+ <a href="{% url 'nutrition:plan:delete' plan.id %}" class="wger-modal-dialog">
+ <span class="{% fa_class 'trash' %}"></span>
+ {% trans "Delete nutrition plan" %}
+ </a>
+ </li>
+ {% endif %}
+ </ul>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/wger/software/templates/issues.html b/wger/software/templates/issues.html
index d9da75699..f0e81dc35 100644
--- a/wger/software/templates/issues.html
+++ b/wger/software/templates/issues.html
@@ -7,11 +7,6 @@
{% block content %}
-<img src="{% static 'images/icons/bug.svg' %}"
- width="48"
- height="48"
- alt=""
- class="float-left">
<p>{% blocktrans %}
No software is perfect. For some severe errors, an email will be automatically sent, but
not always, so I depend on you reporting everything that didn't behave as expected.