Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Render real language menu

Roland Geider3556f9779aa4
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index bfee76535..39cabf8fd 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -50,7 +50,6 @@
<link rel="stylesheet" type="text/css" href="{% static 'css/bootstrap-custom.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'yarn/shariff/dist/shariff.min.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'fontawesomefree/css/all.min.css' %}">
-
<link rel="stylesheet" type="text/css" href="{% static 'yarn/metrics-graphics/dist/metricsgraphics.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/metricsgraphics-custom.css' %}">
{% endcompress %}
@@ -187,7 +186,7 @@
{# #}
<div class="col-md-4">
{% if not is_api_path %} {# Don't show language switcher in the generated API views #}
- <div class="dropdown float-end">
+ <div class="dropup float-end">
<button
class="btn btn-light dropdown-toggle"
type="button"
@@ -197,13 +196,11 @@
<img src="{% static flagname %}"
width="18"
alt="{% translate language.full_name %}"
- title="{% translate language.full_name %}"
- style="">
+ title="{% translate language.full_name %}">
{{ language.full_name }} <span class="caret"></span>
{% endwith %}
</button>
-
<div class="dropdown-menu" aria-labelledby="btnGroupLanguages">
{% for language in languages %}
{% language_select language %}
diff --git a/wger/core/templates/template_features.html b/wger/core/templates/template_features.html
index bc68429f7..430610637 100644
--- a/wger/core/templates/template_features.html
+++ b/wger/core/templates/template_features.html
@@ -45,18 +45,17 @@
{% compress css %}
- <link rel="stylesheet" type="text/css" href="{% static 'yarn/bootstrap/dist/css/bootstrap.min.css' %}">
+ <link rel="stylesheet" type="text/css" href="{% static 'yarn/bootstrap-compiled.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'yarn/components-font-awesome/css/all.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/landing_page.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'fontawesomefree/css/all.min.css' %}">
- <link rel="stylesheet" type="text/css" href="{% static 'yarn/shariff/dist/shariff.min.css' %}">
{% endcompress %}
<link rel="icon" href="{% static 'images/favicon.png' %}" type="image/png">
{% compress js %}
<script src="{% static 'yarn/jquery/dist/jquery.js' %}"></script>
- <script src="{% static 'yarn/bootstrap/dist/js/bootstrap.min.js' %}"></script>
+ <script src="{% static 'yarn/bootstrap/dist/js/bootstrap.bundle.min.js' %}"></script>
+ <script src="{% static 'yarn/popper.js/dist/umd/popper.js' %}"></script>
{% endcompress %}
<title>wger Workout Manager - {% translate "Features" %}</title>
diff --git a/wger/software/static/css/landing_page.css b/wger/software/static/css/landing_page.css
index 38f9cd597..f1e6d7cc3 100644
--- a/wger/software/static/css/landing_page.css
+++ b/wger/software/static/css/landing_page.css
@@ -162,9 +162,6 @@ main {
min-height: 100vh;
}
-.empty-space {
- min-height: 20vh;
-}
.main-section {
width: 100%;
@@ -220,10 +217,6 @@ footer a:hover {
min-height: 70vh;
}
- .empty-space {
- min-height: 30vh;
- }
-
header {
min-height: 80vh;
}
diff --git a/wger/software/templates/features.html b/wger/software/templates/features.html
index a8d08cc89..465d3abd2 100644
--- a/wger/software/templates/features.html
+++ b/wger/software/templates/features.html
@@ -219,6 +219,7 @@
</section>
</div>
+
<!-- button -->
<div class="row w-100 p-5 d-flex justify-content-center">
<button type="button" class="btn btn-primary rounded-1 bg-dark-blue w-auto px-5">
@@ -226,7 +227,7 @@
</button>
</div>
- <!-- third last section -->
+ <!-- community section -->
<section class="main-section p-4" style="background-color:#EAF0FE;">
<div class="container-xl">
<div class="row w-100 gy-3">
@@ -301,7 +302,7 @@
</div>
</section>
- <!-- last section -->
+ <!-- not enough section -->
<section class="bg-bottom-menu p-5">
<div class="container-xl">
<h1 class="w-100 display-4 text-white text-center text-uppercase heading-h6 py-4">
@@ -367,7 +368,7 @@
<div class="col-lg-3 col-sm-12">
<ul class="list-group">
<li class="list-group-item bg-transparent border-0 text-light">
- <h1 class="fs-5 text-white">Account</h1>
+ <h1 class="fs-5 text-white">{% translate "Account" %}</h1>
</li>
<li class="list-group-item bg-transparent border-0 text-light fw-lighter">
<a href="{% url 'core:user:registration' %}">
@@ -404,7 +405,7 @@
<div class="col-lg-3 col-sm-12">
<ul class="list-group">
<li class="list-group-item bg-transparent border-0 text-light">
- <h1 class="fs-5 text-white">Community</h1>
+ <h1 class="fs-5 text-white">{% translate "Community" %}</h1>
</li>
<li class="list-group-item bg-transparent border-0 text-light fw-lighter">
<a href="{% url 'exercise:exercise:overview' %}">
@@ -428,7 +429,7 @@
<div class="col-lg-3 col-sm-12">
<ul class="list-group">
<li class="list-group-item bg-transparent border-0 text-light">
- <h1 class="fs-5 text-white">Software</h1>
+ <h1 class="fs-5 text-white">{% translate "Software" %}</h1>
</li>
<li class="list-group-item bg-transparent border-0 text-light">
<a href="https://github.com/wger-project/wger/issues/new/choose"
@@ -484,10 +485,33 @@
</div>
<div class="d-flex justify-content-between py-3">
- <button type="button" class="btn btn-outline-light">
- English
- <i class="fa fa-pencil px-2" aria-hidden="true"></i>
- </button>
+ <div class="dropup">
+ <button
+ class="btn btn-outline-light dropdown-toggle"
+ type="button"
+ data-bs-toggle="dropdown"
+ aria-expanded="false">
+ {% with 'images/icons/flag-'|add:language.short_name|add:'.svg' as flagname %}
+ <img src="{% static flagname %}"
+ width="18"
+ alt="{% translate language.full_name %}"
+ title="{% translate language.full_name %}">
+ {{ language.full_name }} <span class="caret"></span>
+ {% endwith %}
+ </button>
+
+ <div class="dropdown-menu" aria-labelledby="btnGroupLanguages">
+ {% for language in languages %}
+ {% language_select language %}
+ {% endfor %}
+ <div class="dropdown-divider"></div>
+ <a href="https://hosted.weblate.org/engage/wger/" class="dropdown-item" target="_blank">
+ <span class="{% fa_class 'plus' %}"></span>
+ {% translate "Translate" %}
+ </a>
+ </div>
+ </div>
+
<a href="https://play.google.com/store/apps/details?id=de.wger.flutter">
<img src="{% static 'images/logos/play-store/google-play-badge.svg' %}" height="55"/>
</a>