Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Merge branch 'master' into fork/Frenzy-code/timer

Roland Geider1688c3e8c4e3
diff --cc wger/core/templates/template.html
index 371a6a4b5,dd4d7f2e0..cb87d46a5
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@@ -44,33 -46,18 +46,20 @@@
{% endif %}
{% endblock %}
-
- {% compress css %}
- <link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'bootstrap-compiled.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'css/bootstrap-custom.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'fontawesomefree/css/all.min.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'css/countdown-timer.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'node/@wger-project/react-components/build/assets/index.css' %}" id="react-css">
- {% endcompress %}
-
- <link rel="stylesheet" href="{% static 'css/language-menu.css' %}">
-
- <link rel="icon" href="{% static 'images/favicon.png' %}" type="image/png">
-
- {% compress js %}
- <script src="{% static 'node/jquery/dist/jquery.js' %}"></script>
- <script src="{% static 'node/bootstrap/dist/js/bootstrap.bundle.min.js' %}"></script>
- <script src="{% static 'node/htmx.org/dist/htmx.min.js' %}"></script>
- <script src="{% static 'node/@popperjs/core/dist/umd/popper.js' %}"></script>
- <script src="{% static 'node/devbridge-autocomplete/dist/jquery.autocomplete.min.js' %}">
- </script>
- <script src="{% static 'node/masonry-layout/dist/masonry.pkgd.min.js' %}"></script>
- <script src="{% static 'js/nutrition.js' %}"></script>
- <script src="{% static 'js/countdown-timer.js' %}"></script>
- {% endcompress %}
-
- {# this needs to be outside of the compress block! #}
+ <link rel="stylesheet" type="text/css" href="{% static 'css/workout-manager.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'bootstrap-compiled.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'css/bootstrap-custom.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'fontawesomefree/css/all.min.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'node/@wger-project/react-components/build/assets/index.css' %}" id="react-css">
+ <link rel="stylesheet" type="text/css" href="{% static 'css/language-menu.css' %}">
++<link rel="stylesheet" type="text/css" href="{% static 'css/countdown-timer.css' %}">
+
+ <script src="{% static 'node/bootstrap/dist/js/bootstrap.bundle.min.js' %}"></script>
+ <script src="{% static 'node/htmx.org/dist/htmx.min.js' %}"></script>
+ <script src="{% static 'node/@popperjs/core/dist/umd/popper.js' %}"></script>
+ <script src="{% static 'js/nutrition.js' %}"></script>
+ <script src="{% static 'js/language.js' %}"></script>
++<script src="{% static 'js/countdown-timer.js' %}"></script>
<script src="{% static 'node/@wger-project/react-components/build/main.js' %}" type="module" defer="defer"></script>
{% block header %}{% endblock %}
@@@ -204,10 -182,23 +184,23 @@@
<span class="caret"></span>
</button>
- <ul class="dropdown-menu language-menu" aria-labelledby="btnGroupLanguages">
+ <ul class="dropdown-menu language-menu" aria-labelledby="btnGroupLanguages">
- {% for language in languages %}
- {% language_select language %}
- {% endfor %}
+ <li>
+ <a class="dropdown-item" href="{% url 'core:language:browser_language' %}?next={{ request.path }}">
+ <span class="{% fa_class 'globe' %}"></span>
+ <span>{% translate "Browser language" %}</span>
+ </a>
+ </li>
+
+ <form id="language-form" action="{% url 'set_language' %}" method="post">
+ {% csrf_token %}
+ <input name="next" type="hidden" value="{{ redirect_to }}">
+ <input type="hidden" name="language" id="language-input">
+ {% for language in languages %}
+ {% language_select language %}
+ {% endfor %}
+ </form>
+
<li>
<hr class="dropdown-divider"></hr>
</li>