Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Right-align some of the edit menus so they can be used on mobile

Roland Geidera34d12a4cde5
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 4c799d2ec..063b03560 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -76,9 +76,9 @@
rel="nofollow">{% trans "Nutrition" %} <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a class="dropdown-item" href="{% url 'nutrition:plan:overview' %}" rel="nofollow">{% trans "Nutrition plans" %}</a></li>
- <li><a class="dropdown-item" href="{% url 'nutrition:ingredient:list' %}">{% trans "Ingredient overview" %}</a></li>
<li><a class="dropdown-item" href="{% url 'nutrition:bmi:view' %}" rel="nofollow">{% trans "BMI calculator" %}</a></li>
<li><a class="dropdown-item" href="{% url 'nutrition:calories:view' %}" rel="nofollow">{% trans "Daily calories calculator" %}</a></li>
+ <li><a class="dropdown-item" href="{% url 'nutrition:ingredient:list' %}">{% trans "Ingredient overview" %}</a></li>
{% if perms.nutrition %}
<li class="dropdown-divider"></li>
<li class="dropdown-header">{% trans "Administration" %}</li>
diff --git a/wger/nutrition/templates/ingredient/view.html b/wger/nutrition/templates/ingredient/view.html
index 5d5bb4b40..246b1e39f 100644
--- a/wger/nutrition/templates/ingredient/view.html
+++ b/wger/nutrition/templates/ingredient/view.html
@@ -131,7 +131,7 @@ the search.{% endblocktrans %}
<tbody>
<tr>
<td style="width:80%;">{% trans "Fibres" %}</td>
- <td itemprop="fiberContent" id="value-fibres">
+ <td itemprop="fiberContent">
{% if ingredient.fibres %}
<span id="value-fibres">{{ingredient.fibres}}</span> {% trans "g" context "weight unit, i.e. grams" %}
{% else %}
@@ -141,9 +141,9 @@ the search.{% endblocktrans %}
</tr>
<tr>
<td>{% trans "Sodium" %}</td>
- <td itemprop="sodiumContent" id="value-sodium">
+ <td itemprop="sodiumContent">
{% if ingredient.sodium %}
- <span id="value-fibres">{{ingredient.sodium}}</span> {% trans "g" context "weight unit, i.e. grams" %}
+ <span id="value-sodium">{{ingredient.sodium}}</span> {% trans "g" context "weight unit, i.e. grams" %}
{% else %}
{% trans "n.A." %}
{% endif %}
@@ -193,7 +193,7 @@ the search.{% endblocktrans %}
<button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
- <div class="dropdown-menu" role="menu">
+ <div class="dropdown-menu dropdown-menu-right" role="menu">
<a href="{% url 'nutrition:unit_ingredient:edit' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a>
<a href="{% url 'nutrition:unit_ingredient:delete' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>
</div>
diff --git a/wger/nutrition/templates/units/list.html b/wger/nutrition/templates/units/list.html
index 6419e8ef1..2d552483b 100644
--- a/wger/nutrition/templates/units/list.html
+++ b/wger/nutrition/templates/units/list.html
@@ -14,7 +14,7 @@
<button type="button" class="btn btn-default dropdown-toggle btn-sm" data-toggle="dropdown">
<span class="{% fa_class 'cog' %}"></span>
</button>
- <div class="dropdown-menu" role="menu">
+ <div class="dropdown-menu dropdown-menu-right" role="menu">
<a href="{% url 'nutrition:weight_unit:edit' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Edit' %}</a>
<div class="dropdown-divider"></div>
<a href="{% url 'nutrition:weight_unit:delete' unit.id %}" class="wger-modal-dialog dropdown-item">{% trans 'Delete' %}</a>