Self hosted FLOSS fitness/workout, nutrition and weight tracker
Serve muscle images from CDN
Scott Peshak7387a3dfa210
diff --git a/wger/exercises/static/js/exercises.js b/wger/exercises/static/js/exercises.jsindex 1811dccc0..83141f8ab 100644--- a/wger/exercises/static/js/exercises.js+++ b/wger/exercises/static/js/exercises.js@@ -43,8 +43,8 @@ function wgerHighlightMuscle(element) {// Set the corresponding background$('#muscle-system').css('background-image',- 'url(/static/images/muscles/main/muscle-' + muscleId + '.svg),' +- 'url(/static/images/muscles/muscular_system_' + isFront + '.svg)');+ 'url({{ STATIC_URL | escapejs }}images/muscles/main/muscle-' + muscleId + '.svg),' ++ 'url({{ STATIC_URL | escapejs }}images/muscles/muscular_system_' + isFront + '.svg)');// Show the corresponding exercises$('.exercise-list').hide();diff --git a/wger/exercises/templates/muscles/overview.html b/wger/exercises/templates/muscles/overview.htmlindex ba73057d8..9711617d1 100644--- a/wger/exercises/templates/muscles/overview.html+++ b/wger/exercises/templates/muscles/overview.html@@ -1,5 +1,5 @@{% extends "base_wide.html" %}-{% load i18n staticfiles cache wger_extras %}+{% load i18n staticfiles cache wger_extras compress %}<!--Title@@ -8,15 +8,23 @@{% block header %}+{% compress js %}<script src="{% static 'js/exercises.js' %}"></script>+{% endcompress %}<script>$(document).ready(function() {//Prefetch the background images+ wgerPrefetchImages([+ '{% static 'images/muscles/muscular_system_back.svg' %}',{% for muscle in muscle_list|first %}- wgerPrefetchImages(['/static/images/muscles/main/muscle-' + {{muscle.id}} + '.svg']);+ {% with muscle_id=muscle.id|stringformat:"s" %}+ {% with muscle_img='images/muscles/main/muscle-'|add:muscle_id|add:'.svg' %}+ '{% static muscle_img %}',+ {% endwith %}+ {% endwith %}{% endfor %}- wgerPrefetchImages(['/static/images/muscles/muscular_system_back.svg']);+ ]);// Hightlight the first element@@ -48,7 +56,7 @@ $(document).ready(function() {<h4 style="padding-bottom:0.5em;">{% trans "Muscles" %}</h4><div id="muscle-system"class="muscle-background"- style="background-image: url('/static/images/muscles/muscular_system_front.svg');">+ style="background-image: url('{% static "images/muscles/muscular_system_front.svg" %}');"></div></div><div class="col-sm-4 col-xs-6">diff --git a/wger/settings_global.py b/wger/settings_global.pyindex 1fb4c61a4..a48ab7104 100644--- a/wger/settings_global.py+++ b/wger/settings_global.py@@ -338,6 +338,10 @@ COMPRESS_CSS_FILTERS = ('compressor.filters.css_default.CssAbsoluteFilter','compressor.filters.cssmin.rCSSMinFilter')+COMPRESS_JS_FILTERS = [+ 'compressor.filters.jsmin.JSMinFilter',+ 'compressor.filters.template.TemplateFilter',+]COMPRESS_ROOT = STATIC_ROOT# BOWER binary