Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Reduce differences between base template heads

Scott Peshak7cde67b68466
diff --git a/wger/core/templates/mobile/template.html b/wger/core/templates/mobile/template.html
index 998d85db3..933802632 100644
--- a/wger/core/templates/mobile/template.html
+++ b/wger/core/templates/mobile/template.html
@@ -16,12 +16,11 @@
along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
-->
-
{% load i18n staticfiles wger_extras compress django_bootstrap_breadcrumbs %}
{% block breadcrumbs %}
{% clear_breadcrumbs %}
{% endblock %}
-<html>
+<html lang="{{language.short_name}}">
{% spaceless_config %}
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -46,9 +45,6 @@
{% endif %}
{% endblock %}
- <title>{% block title %}{% endblock %}</title>
-
- <link rel="icon" href="{% static 'images/favicon.png' %}" type="image/png">
{% compress css %}
<link rel="stylesheet" type="text/css" href="{% static 'bower_components/bootstrap/dist/css/bootstrap.min.css' %}">
@@ -61,22 +57,27 @@
<link rel="stylesheet" type="text/css" href="{% static 'css/metricsgraphics-custom.css' %}">
{% endcompress %}
+ <link rel="icon" href="{% static 'images/favicon.png' %}" type="image/png">
+
{% compress js %}
<script src="{% static 'bower_components/jquery/dist/jquery.js' %}"></script>
<script src="{% static 'bower_components/bootstrap/dist/js/bootstrap.min.js' %}"></script>
+ <script src="{% static 'bower_components/Sortable/Sortable.min.js' %}"></script>
<script src="{% static 'bower_components/d3/d3.js' %}"></script>
<script src="{% static 'bower_components/metrics-graphics/dist/metricsgraphics.min.js' %}"></script>
<script src="{% static 'bower_components/devbridge-autocomplete/dist/jquery.autocomplete.min.js' %}"></script>
<script src="{% static 'js/wger-core.js' %}"></script>
- <script src="{% static 'js/wger-core-mobile.js' %}"></script>
<script src="{% static 'js/exercises.js' %}"></script>
<script src="{% static 'js/nutrition.js' %}"></script>
{% endcompress %}
+ {% compress js %}
+ <script src="{% static 'js/wger-core-mobile.js' %}"></script>
+ {% endcompress %}
{% block header %}{% endblock %}
<script>
- $(document).ready(function () {
+ $(document).ready(function() {
$('[data-toggle=offcanvas]').click(function () {
$('.row-offcanvas').toggleClass('active')
});
@@ -94,6 +95,8 @@
});
</script>
+
+ <title>{% block title %}{% endblock %}</title>
</head>
<body>
<header>
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index 4baaaf04e..b2c194b28 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -89,7 +89,7 @@
// Check for RO-access before allowing sharing
wgerToggleReadOnlyAccess();
- });
+ });
</script>