Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix dropdowns
Rolandf27e7e82cae2
diff --git a/wger/config/templates/language/view.html b/wger/config/templates/language/view.htmlindex 2cd3f01d2..a326930d2 100644--- a/wger/config/templates/language/view.html+++ b/wger/config/templates/language/view.html@@ -85,24 +85,22 @@ in A).{% endblocktrans %}</p>{# #}{% block options %}<div class="btn-group">- <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}- </button>- <ul class="dropdown-menu">- <li>- <a href="{% url 'core:language:edit' view_language.id %}" class="wger-modal-dialog">+ <div class="btn-group">+ <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+ <span class="{% fa_class 'cog' %}"></span>+ {% trans "Options" %}+ </button>+ <div class="dropdown-menu">+ <a href="{% url 'core:language:edit' view_language.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'pencil-square-o' %}"></span>{% trans "Edit" %}</a>- </li>- <li role="separator" class="divider"></li>- <li>- <a href="{% url 'core:language:delete' view_language.id %}" class="wger-modal-dialog">+ <div role="separator" class="dropdown-divider"></div>+ <a href="{% url 'core:language:delete' view_language.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'trash' %}"></span>{% trans "Delete" %}</a>- </li>- </ul>+ </div>+ </div></div>{% endblock %}diff --git a/wger/core/templates/template.html b/wger/core/templates/template.htmlindex 1324e78d4..0bf12a587 100644--- a/wger/core/templates/template.html+++ b/wger/core/templates/template.html@@ -121,7 +121,7 @@</button><div class="dropdown-menu" aria-labelledby="btnGroupLanguages">{% for language in languages %}- {% language_select language %}+ {% language_select language %}{% endfor %}<a href="https://www.transifex.com/rge/wger-workout-manager/" class="dropdown-item"><span class="{% fa_class 'plus' %}"></span>diff --git a/wger/core/templates/user/preferences.html b/wger/core/templates/user/preferences.htmlindex 899772b76..315e60a17 100644--- a/wger/core/templates/user/preferences.html+++ b/wger/core/templates/user/preferences.html@@ -118,36 +118,30 @@ $(function() {{# #}{% block options %}<div class="btn-group">- <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}- </button>- <ul class="dropdown-menu">- <li>- <a href="{% url 'core:user:logout' %}">+ <div class="btn-group" role="group">+ <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+ <span class="{% fa_class 'cog' %}"></span>+ {% trans "Options" %}+ </button>+ <div class="dropdown-menu">+ <a href="{% url 'core:user:logout' %}" class="dropdown-item"><span class="{% fa_class 'sign-out' %}"></span>{% trans "Logout" %}</a>- </li>- <li>- <a href="{% url 'core:user:change-password' %}" class="wger-modal-dialog">+ <a href="{% url 'core:user:change-password' %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'key' %}"></span>{% trans "Change password" %}</a>- </li>- <li>- <a href="{% url 'core:user:api-key' %}">+ <a href="{% url 'core:user:api-key' %}" class="dropdown-item"><span class="{% fa_class 'globe' %}"></span>{% trans "API key" %}</a>- </li>- <li role="separator" class="divider"></li>- <li>- <a href="{% url 'core:user:delete' %}" class="wger-modal-dialog">+ <div role="separator" class="dropdown-divider"></div>+ <a href="{% url 'core:user:delete' %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'trash' %}"></span>{% trans "Delete account" %}</a>- </li>- </ul>+ </div>+ </div></div>{% endblock %}diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.htmlindex 0b2855ebf..f6cbb452c 100644--- a/wger/exercises/templates/exercise/view.html+++ b/wger/exercises/templates/exercise/view.html@@ -357,24 +357,24 @@ $(document).ready(function() {{% block options %}{% if perms.exercises.change_exercise %}<div class="btn-group">- <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}- </button>- <ul class="dropdown-menu">- <li>- <a href="{% url 'exercise:exercise:edit' exercise.id %}">+ <div class="btn-group">+ <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+ <span class="{% fa_class 'cog' %}"></span>+ {% trans "Options" %}+ </button>+ <div class="dropdown-menu">+ <a href="{% url 'exercise:exercise:edit' exercise.id %}" class="dropdown-item"><span class="{% fa_class 'pencil-square-o' %}"></span>{% trans "Edit" %}</a>- </li>- <li>- <a href="{% url 'exercise:exercise:delete' exercise.id %}" class="wger-modal-dialog">+ <div role="separator" class="dropdown-divider"></div>+ <a href="{% url 'exercise:exercise:delete' exercise.id %}" class="wger-modal-dialog dropdown-item"><span class="{% fa_class 'trash' %}"></span>{% trans "Delete" %}</a>- </li>- </ul>+ </li>+ </div>+ </div></div>{% endif %}{% endblock %}diff --git a/wger/weight/templates/overview.html b/wger/weight/templates/overview.htmlindex c13eb3ae1..8883f31b6 100644--- a/wger/weight/templates/overview.html+++ b/wger/weight/templates/overview.html@@ -93,24 +93,23 @@{% block options %}{% if is_owner %}<div class="btn-group">- <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">- <span class="{% fa_class 'cog' %}"></span>- {% trans "Options" %}- </button>- <ul class="dropdown-menu">- <li>- <a href="{% url 'weight:export-csv' %}" target="_blank">+ <div class="btn-group" role="group">+ <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">+ <span class="{% fa_class 'cog' %}"></span>+ {% trans "Options" %}+ </button>++ <div class="dropdown-menu">+ <a href="{% url 'weight:export-csv' %}" target="_blank" class="dropdown-item"><span class="{% fa_class 'download' %}"></span>{% trans "Export as CSV" %}</a>- </li>- <li>- <a href="{% url 'weight:import-csv' %}" {% auto_link_css request.user_agent.is_mobile %}>+ <a href="{% url 'weight:import-csv' %}" class="dropdown-item"><span class="{% fa_class 'upload' %}"></span>{% trans "Import from spreadsheet" %}</a>- </li>- </ul>+ </div>+ </div></div><a href="{% url 'weight:add' %}" class="btn btn-success btn-sm wger-modal-dialog">{% trans "Add" %}