Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use local version of jquery UI

Roland Geider68ab5650395a
diff --git a/wger/core/static/css/jquery-ui-1.10.4.custom.min.css b/wger/core/static/css/jquery-ui.css
similarity index 100%
rename from wger/core/static/css/jquery-ui-1.10.4.custom.min.css
rename to wger/core/static/css/jquery-ui.css
diff --git a/wger/core/static/js/jquery-ui-1.10.4.custom.min.js b/wger/core/static/js/jquery-ui.js
similarity index 100%
rename from wger/core/static/js/jquery-ui-1.10.4.custom.min.js
rename to wger/core/static/js/jquery-ui.js
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index b7adc515b..858ebcbde 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -47,7 +47,7 @@
{% compress css %}
<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/jquery-ui/themes/smoothness/jquery-ui.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'css/jquery-ui.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/jquery-ui-custom.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 'css/bootstrap-custom.css' %}">
@@ -59,7 +59,7 @@
{% compress js %}
<script src="{% static 'bower_components/jquery/dist/jquery.js' %}"></script>
- <script src="{% static 'bower_components/jquery-ui/jquery-ui.js' %}"></script>
+ <script src="{% static 'js/jquery-ui.js' %}"></script>
<script src="{% static 'bower_components/d3/d3.js' %}"></script>
<script src="{% static 'js/workout-manager.js' %}"></script>
<script src="{% static 'js/ubuntu-unity.js' %}"></script>
diff --git a/wger/settings_global.py b/wger/settings_global.py
index 7865ca5dc..f836f1e7c 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -94,7 +94,6 @@ INSTALLED_APPS = (
BOWER_INSTALLED_APPS = (
'jquery',
'bootstrap',
- 'jquery-ui',
'bootstrap-datepicker',
'd3',
'shariff',
diff --git a/wger/utils/context_processor.py b/wger/utils/context_processor.py
index d9f4ec3fc..090e1e806 100644
--- a/wger/utils/context_processor.py
+++ b/wger/utils/context_processor.py
@@ -53,8 +53,8 @@ def processor(request):
'i18n_path': i18n_path,
# Translation links
- 'datepicker_i18n_path': 'js/bootstrap-datepicker/locales/bootstrap-datepicker.{0}.js'.
- format(language.short_name),
+ 'datepicker_i18n_path': 'bower_components/bootstrap-datepicker/dist/locales'
+ '/bootstrap-datepicker.{0}.min.js'.format(language.short_name),
# Flag for guest users
'has_demo_data': request.session.get('has_demo_data', False),