Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Ùpdate font awesome to 5.13

Roland Geider254e49bab7b5
diff --git a/docs/changelog.rst b/docs/changelog.rst
index c518567fc..c51148fdc 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,15 +7,18 @@ Changelog
Upgrade steps from 1.9:
+* Update python libraries ``pip install -r requirements.txt``
+* Update CSS and JS libraries ``python manage.py bower install``
* Update static files (only production): ``python manage.py collectstatic``
+
New features:
* TBA
Improvements:
-* TBA
+* Updated many libraries to last version (bootstrap, font awesome, etc.)
1.9
diff --git a/wger/config/templates/language/view.html b/wger/config/templates/language/view.html
index a326930d2..6059d90de 100644
--- a/wger/config/templates/language/view.html
+++ b/wger/config/templates/language/view.html
@@ -92,7 +92,7 @@ in A).{% endblocktrans %}</p>
</button>
<div class="dropdown-menu">
<a href="{% url 'core:language:edit' view_language.id %}" class="wger-modal-dialog dropdown-item">
- <span class="{% fa_class 'pencil-square-o' %}"></span>
+ <span class="{% fa_class 'edit' %}"></span>
{% trans "Edit" %}
</a>
<div role="separator" class="dropdown-divider"></div>
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index a6e52117b..9852fe68e 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -198,7 +198,7 @@
<li class="dropdown-divider"></li>
<li>
<a class="dropdown-item" href="{% url 'core:user:logout' %}">
- <span class="{% fa_class 'sign-out' %}"></span>
+ <span class="{% fa_class 'sign-out-alt' %}"></span>
{% trans "Logout" %}
</a>
</li>
diff --git a/wger/core/templates/tags/render_day.html b/wger/core/templates/tags/render_day.html
index 7a9e40ab2..c4ccc5701 100644
--- a/wger/core/templates/tags/render_day.html
+++ b/wger/core/templates/tags/render_day.html
@@ -27,10 +27,10 @@ $(document).ready(function() {
<a href="{% url 'manager:day:edit' day.obj.id %}"
title="{% trans 'Edit' %}"
class="wger-modal-dialog">
- <span class="{% fa_class 'pencil-square-o' %}"></span></a>
+ <span class="{% fa_class 'edit' %}"></span></a>
<a href="{% url 'manager:day:log' day.obj.id %}"
title="{% trans 'Add weight log to this day' %}">
- <span class="{% fa_class 'line-chart' %}"></span></a>
+ <span class="{% fa_class 'chart-line' %}"></span></a>
</span>
{% endif %}
</th>
@@ -51,7 +51,7 @@ $(document).ready(function() {
<a href="{% url 'manager:set:edit' set.obj.id %}"
title="{% trans 'Edit' %}"
class="wger-modal-dialog">
- <span class="{% fa_class 'pencil-square-o' %}"></span></a>
+ <span class="{% fa_class 'edit' %}"></span></a>
<br>
<a href="{% url 'manager:set:delete' set.obj.id %}"
title="{% trans 'Delete' %}">
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index 414473c6c..3a755fa31 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -50,7 +50,7 @@
<link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager-common.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'bower_components/bootstrap/dist/css/bootstrap.min.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'bower_components/components-font-awesome/css/font-awesome.min.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'bower_components/components-font-awesome/css/all.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/bootstrap-custom.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'bower_components/shariff/build/shariff.min.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'bower_components/metrics-graphics/dist/metricsgraphics.css' %}">
diff --git a/wger/core/templates/template_features.html b/wger/core/templates/template_features.html
index 114da255b..4c703e50a 100644
--- a/wger/core/templates/template_features.html
+++ b/wger/core/templates/template_features.html
@@ -47,7 +47,7 @@
{% compress css %}
<link rel="stylesheet" type="text/css" href="{% static 'bower_components/bootstrap/dist/css/bootstrap.min.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'bower_components/components-font-awesome/css/font-awesome.min.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'bower_components/components-font-awesome/css/all.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/agency.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'bower_components/shariff/build/shariff.min.css' %}">
{% endcompress %}
@@ -91,12 +91,12 @@
<ul class="list-inline social-buttons">
<li class="list-inline-item">
<a href="https://github.com/wger-project/wger" title="Github">
- <span class="{% fa_class 'github' %}"></span>
+ <span class="{% fa_class 'github' 'fab' %}"></span>
</a>
</li>
<li class="list-inline-item">
<a href="https://twitter.com/wger_de" title="Twitter">
- <span class="{% fa_class 'twitter' %}"></span>
+ <span class="{% fa_class 'twitter' 'fab' %}"></span>
</a>
</li>
<li class="list-inline-item">
diff --git a/wger/core/templates/user/login.html b/wger/core/templates/user/login.html
index 65ea08dec..ef097ee75 100644
--- a/wger/core/templates/user/login.html
+++ b/wger/core/templates/user/login.html
@@ -16,7 +16,7 @@
<h4>{% trans "No account?" %}</h4>
<p>
<a href="{% url 'core:user:registration' %}" class="btn btn-block btn-default">
- <span class="{% fa_class 'sign-in' %}"></span>
+ <span class="{% fa_class 'sign-in-alt' %}"></span>
{% trans "Register" %}
</a>
</p>
diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.html
index 62e7b19a9..d1be7879e 100644
--- a/wger/core/templates/user/preferences.html
+++ b/wger/core/templates/user/preferences.html
@@ -29,7 +29,7 @@
</button>
<div class="dropdown-menu">
<a href="{% url 'core:user:logout' %}" class="dropdown-item">
- <span class="{% fa_class 'sign-out' %}"></span>
+ <span class="{% fa_class 'sign-out-alt' %}"></span>
{% trans "Logout" %}
</a>
<a href="{% url 'core:user:change-password' %}" class="wger-modal-dialog dropdown-item">
diff --git a/wger/core/templatetags/wger_extras.py b/wger/core/templatetags/wger_extras.py
index 0d26daba6..32b4bf8b4 100644
--- a/wger/core/templatetags/wger_extras.py
+++ b/wger/core/templatetags/wger_extras.py
@@ -149,12 +149,11 @@ def auto_link_css(mobile=False, css=''):
@register.simple_tag
-def fa_class(class_name='', size='', fixed_width=True):
+def fa_class(class_name='', icon_type='fas', fixed_width=True):
'''
Helper function to help add font awesome classes to elements
:param class_name: the CSS class name, without the "fa-" prefix
- :param size: the size of the icon
:param fixed_width: toggle for fixed icon width
:return: the complete CSS classes
'''
@@ -162,9 +161,7 @@ def fa_class(class_name='', size='', fixed_width=True):
if not class_name:
return css
- css += 'fa fa-{}'.format(class_name)
- if size:
- css += ' fa-{}'.format(size)
+ css += '{} fa-{}'.format(icon_type, class_name)
if fixed_width:
css += ' fa-fw'
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index 0ce76e8ad..dc30dce93 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -142,7 +142,7 @@ $(document).ready(function() {
<a href="{% url 'exercise:image:edit' image.pk %}"
class="no-hover"
title="{% trans 'Edit' %}">
- <span class="{% fa_class 'pencil-square-o' %}"></span></a>
+ <span class="{% fa_class 'edit' %}"></span></a>
{% endif %}
<p class="card-text">
@@ -203,7 +203,7 @@ $(document).ready(function() {
<a href="{% url 'exercise:comment:edit' comment.id %}"
title="{% trans 'Edit' %}"
class="wger-modal-dialog">
- <span class="{% fa_class 'pencil-square-o' %}"></span></a>
+ <span class="{% fa_class 'edit' %}"></span></a>
</span>
{% endif %}
</li>
@@ -316,7 +316,7 @@ $(document).ready(function() {
<h4>{% trans "Options" %}</h4>
<p>
<a href="{% url 'exercise:exercise:correct' exercise.id %}" {% auto_link_css request.user_agent.is_mobile %}>
- <span class="{% fa_class 'pencil-square-o' %}"></span>
+ <span class="{% fa_class 'edit' %}"></span>
{% trans "Submit a correction" %}
</a>
</p>
@@ -340,7 +340,7 @@ $(document).ready(function() {
</button>
<div class="dropdown-menu">
<a href="{% url 'exercise:exercise:edit' exercise.id %}" class="dropdown-item">
- <span class="{% fa_class 'pencil-square-o' %}"></span>
+ <span class="{% fa_class 'edit' %}"></span>
{% trans "Edit" %}
</a>
<div role="separator" class="dropdown-divider"></div>
diff --git a/wger/manager/templates/calendar/partial_overview_table.html b/wger/manager/templates/calendar/partial_overview_table.html
index 7ef9d78e4..db2448433 100644
--- a/wger/manager/templates/calendar/partial_overview_table.html
+++ b/wger/manager/templates/calendar/partial_overview_table.html
@@ -14,7 +14,7 @@
</button>
<div class="dropdown-menu">
<a href="{% url 'manager:session:edit' value.session.pk %}" class="wger-modal-dialog dropdown-item">
- <span class="{% fa_class 'pencil-square-o' %}"></span>
+ <span class="{% fa_class 'edit-o' %}"></span>
{% trans "Edit" %}
</a>
<a href="{% url 'manager:session:delete' value.session.pk %}" class="wger-modal-dialog dropdown-item">
diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.html
index 16d6d82cf..121616cc1 100644
--- a/wger/manager/templates/schedule/view.html
+++ b/wger/manager/templates/schedule/view.html
@@ -120,7 +120,7 @@
<a href="{% url 'manager:step:edit' step.id %}"
title="{% trans 'Edit' %}"
class="wger-modal-dialog">
- <span class="{% fa_class 'pencil-square-o' %}"></span></a>
+ <span class="{% fa_class 'edit' %}"></span></a>
<a href="{% url 'manager:step:delete' step.id %}"
title="{% trans 'Delete' %}"
class="wger-modal-dialog">
@@ -291,7 +291,7 @@ an appointment for each training day with the appropriate exercises.{% endblockt
</a>
{% if is_owner %}
<a href="{% url 'manager:schedule:edit' schedule.id %}" class="wger-modal-dialog dropdown-item">
- <span class="{% fa_class 'pencil-square-o' %}"></span>
+ <span class="{% fa_class 'edit' %}"></span>
{% trans "Edit schedule" %}
</a>
<div role="separator" class="dropdown-divider"></div>
diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html
index abb1e3e7a..16967ab2e 100644
--- a/wger/manager/templates/workout/view.html
+++ b/wger/manager/templates/workout/view.html
@@ -230,7 +230,7 @@ an appointment for each training day with the appropriate exercises.{% endblockt
</a>
{% if is_owner %}
<a href="{% url 'manager:workout:edit' workout.id %}" class="dropdown-item wger-modal-dialog">
- <span class="{% fa_class 'pencil-square-o' %}"></span>
+ <span class="{% fa_class 'edit' %}"></span>
{% trans "Edit workout" %}
</a>
{% endif %}
diff --git a/wger/nutrition/templates/ingredient/view.html b/wger/nutrition/templates/ingredient/view.html
index 3c83c001b..18686c788 100644
--- a/wger/nutrition/templates/ingredient/view.html
+++ b/wger/nutrition/templates/ingredient/view.html
@@ -240,7 +240,7 @@ the search.{% endblocktrans %}
<a href="{% url 'nutrition:ingredient:edit' ingredient.id %}"
title="{% trans 'Edit ingredient' %}"
class="dropdown-item">
- <span class="{% fa_class 'pencil-square-o' %}"></span>
+ <span class="{% fa_class 'edit' %}"></span>
{% trans 'Edit ingredient' %}
</a>
<div role="separator" class="dropdown-divider"></div>
diff --git a/wger/nutrition/templates/plan/view.html b/wger/nutrition/templates/plan/view.html
index d58282b10..7681a86a5 100644
--- a/wger/nutrition/templates/plan/view.html
+++ b/wger/nutrition/templates/plan/view.html
@@ -81,7 +81,7 @@ function wgerCustomModalInit()
<a href="{% url 'nutrition:meal:edit' meal.id %}"
title="{% trans 'Edit' %}"
class="wger-modal-dialog">
- <span class="{% fa_class 'pencil-square-o' %}"></span></a>
+ <span class="{% fa_class 'edit' %}"></span></a>
<a href="{% url 'nutrition:meal_item:add' meal.id %}"
title="{% trans 'Add' %}"
class="wger-modal-dialog edit-meal">
@@ -106,7 +106,7 @@ function wgerCustomModalInit()
<a href="{% url 'nutrition:meal_item:edit' item.id %}"
title="{% trans 'Edit' %}"
class="wger-modal-dialog edit-meal edit-mealitem">
- <span class="{% fa_class 'pencil-square-o' %}"></span></a>
+ <span class="{% fa_class 'edit' %}"></span></a>
</span>
{% endif %}
</td>
@@ -295,7 +295,7 @@ function wgerCustomModalInit()
</a>
{% if is_owner %}
<a href="{% url 'nutrition:plan:edit' plan.id %}" class="wger-modal-dialog dropdown-item">
- <span class="{% fa_class 'pencil-square-o' %}"></span>
+ <span class="{% fa_class 'edit' %}"></span>
{% trans "Edit nutrition plan" %}
</a>
<a href="{% url 'nutrition:plan:copy' plan.id %}" class="dropdown-item">
diff --git a/wger/settings_global.py b/wger/settings_global.py
index 7de482fc5..b1fff2752 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -95,7 +95,7 @@ INSTALLED_APPS = (
# added list of external libraries to be installed by bower
BOWER_INSTALLED_APPS = (
'bootstrap#4.x',
- 'components-font-awesome#4.7.x',
+ 'components-font-awesome#5.13.x',
'd3',
'DataTables',
'devbridge-autocomplete#1.2.x',
diff --git a/wger/software/templates/features.html b/wger/software/templates/features.html
index c631bd07f..218954cb9 100644
--- a/wger/software/templates/features.html
+++ b/wger/software/templates/features.html
@@ -66,8 +66,8 @@
<div class="row text-center">
<div class="col-md-4">
<span class="fa-stack fa-4x">
- <i class="fa fa-circle fa-stack-2x text-primary"></i>
- <i class="fa fa-user fa-stack-1x fa-inverse"></i>
+ <i class="fas fa-circle fa-stack-2x text-primary"></i>
+ <i class="fas fa-user fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading text-light">{% trans "Workouts" %}</h4>
<p class="text-muted">
@@ -81,8 +81,8 @@
</div>
<div class="col-md-4">
<span class="fa-stack fa-4x">
- <i class="fa fa-circle fa-stack-2x text-primary"></i>
- <i class="fa fa-cutlery fa-stack-1x fa-inverse"></i>
+ <i class="fas fa-circle fa-stack-2x text-primary"></i>
+ <i class="fas fa-utensils fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading text-light">{% trans "Nutrition" %}</h4>
<p class="text-muted">
@@ -96,8 +96,8 @@
</div>
<div class="col-md-4">
<span class="fa-stack fa-4x">
- <i class="fa fa-circle fa-stack-2x text-primary"></i>
- <i class="fa fa-line-chart fa-stack-1x fa-inverse"></i>
+ <i class="fas fa-circle fa-stack-2x text-primary"></i>
+ <i class="fas fa-chart-line fa-stack-1x fa-inverse"></i>
</span>
<h4 class="service-heading text-light">{% trans 'Diary' %}</h4>
<p class="text-muted">