Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix dashboard cards

Roland Geidereebaa9aecd4c
diff --git a/wger/core/templates/index.html b/wger/core/templates/index.html
index 61f2d667a..11571b30f 100644
--- a/wger/core/templates/index.html
+++ b/wger/core/templates/index.html
@@ -13,203 +13,228 @@
{% block content %}
-{% if current_workout %}
-<div class="modal fade" id="calendar-day-select-popup">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <h4 class="modal-title">{% translate 'Add log to day' %}</h4>
- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
- </div>
- <div class="modal-body">
- <p>{% blocktranslate %}Click to add weight logs to a training
-day in your current workout:{% endblocktranslate %} <strong>{{current_workout}}</strong></p>
-
- {% for day in current_workout.day_set.all %}
- <a href="{% url 'manager:day:log' day.pk %}" class="btn btn-block btn-light">{{day.description}}</a>
- {% endfor %}
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button>
- </div>
- </div>
- </div>
-</div>
-{% endif %}
-{% if plan %}
-<div class="modal fade" id="nutrition-diary-popup">
- <div class="modal-dialog">
- <div class="modal-content">
- <div class="modal-header">
- <h4 class="modal-title">{% translate 'Add new diary entry' %}</h4>
- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
- </div>
- <div class="modal-body">
- <p>
- {% blocktranslate trimmed %}Click to add an entry to your nutrition diary for
- today. You can either log a meal as you defined it, or entry any number of
- custom entries.{% endblocktranslate %}
- </p>
-
- {% for meal in plan.meal_set.all %}
- <a href="{% url 'nutrition:log:log_meal' meal.pk %}" class="btn btn-block btn-light">
- {{meal.time}}
- - {{meal.get_nutritional_values.energy|floatformat:0}}{% translate "kcal" %}
- <br>
- <small>
- {% for item in meal.mealitem_set.select_related %}
- {{ item.ingredient }}
- {% if not forloop.last %} / {% endif %}
- {% endfor %}
- </small>
- </a>
- {% endfor %}
-
- <a href="{% url 'nutrition:log:add' plan.pk %}" class="btn btn-block btn-light">
- {% translate "Add custom diary entry" %}
- </a>
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-light" data-dismiss="modal">{% translate "Close" %}</button>
+ {% if current_workout %}
+ <div class="modal fade" id="calendar-day-select-popup">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h4 class="modal-title">{% translate 'Add log to day' %}</h4>
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+ </div>
+ <div class="modal-body">
+ <p>{% blocktranslate %}Click to add weight logs to a training
+ day in your current workout:{% endblocktranslate %} <strong>{{ current_workout }}</strong>
+ </p>
+
+ {% for day in current_workout.day_set.all %}
+ <a href="{% url 'manager:day:log' day.pk %}"
+ class="btn btn-block btn-light">{{ day.description }}</a>
+ {% endfor %}
+ </div>
+ <div class="modal-footer">
+ <button type="button"
+ class="btn btn-light"
+ data-dismiss="modal">
+ {% translate "Close" %}
+ </button>
+ </div>
+ </div>
</div>
</div>
- </div>
-</div>
-{% endif %}
-
-
-<div class="card-deck">
- <div class="card">
- <div class="card-body">
- <h5 class="card-title">{% translate "Workout"%}</h5>
- <div class="card-text">
- {% if current_workout %}
- <p>
- <a href="{{ current_workout.get_absolute_url }}">
- {% if current_workout.comment %}
- {{ current_workout.comment }}
- {% else %}
- {% translate "Workout" %}
- {% endif %}
+ {% endif %}
+ {% if plan %}
+ <div class="modal fade" id="nutrition-diary-popup">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h4 class="modal-title">{% translate 'Add new diary entry' %}</h4>
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+ </div>
+ <div class="modal-body">
+ <p>
+ {% blocktranslate trimmed %}Click to add an entry to your nutrition diary for
+ today. You can either log a meal as you defined it, or entry any number of
+ custom entries.{% endblocktranslate %}
+ </p>
+
+ {% for meal in plan.meal_set.all %}
+ <a href="{% url 'nutrition:log:log_meal' meal.pk %}" class="btn btn-block btn-light">
+ {{ meal.time }}
+ - {{ meal.get_nutritional_values.energy|floatformat:0}}{% translate "kcal" %}
+ <br>
+ <small>
+ {% for item in meal.mealitem_set.select_related %}
+ {{ item.ingredient }}
+ {% if not forloop.last %} / {% endif %}
+ {% endfor %}
+ </small>
+ </a>
+ {% endfor %}
+
+ <a href="{% url 'nutrition:log:add' plan.pk %}" class="btn btn-block btn-light">
+ {% translate "Add custom diary entry" %}
</a>
- </p>
- <p>
- – {{ current_workout.creation_date }}
- <p>
- {% endif %}
-
- <table class="table table-hover table-sm">
- {% for day, exercise, is_workout in weekdays %}
- <tr>
- <td>
- {{ day }}
- </td>
- <td>
- {% if not is_workout %}<span class="text-muted">{% endif%}
- {{ exercise }}
- {% if not is_workout %}</span>{% endif%}
- </td>
- </tr>
- {% endfor %}
- </table>
-
- {% if schedule %}
- <p>
- → {% translate "This workout is part of a schedule:" %}
- <a href="{{schedule.get_absolute_url}}">{{schedule.name}}</a>
- </p>
- {% endif %}
- <p><em>
- {% blocktranslate trimmed %}The current workout is selected from your active
- schedule or, if you don't have one, simply by date.{% endblocktranslate %}
- </em></p>
+ </div>
+ <div class="modal-footer">
+ <button type="button"
+ class="btn btn-light"
+ data-dismiss="modal">
+ {% translate "Close" %}
+ </button>
+ </div>
+ </div>
</div>
</div>
- <div class="card-footer">
- {% if current_workout %}
- {% if current_workout.day_set.all %}
- <a href="#" id="logging-popup-link" data-toggle="modal" data-target="#calendar-day-select-popup" class="btn btn-success btn-sm btn-block">
- {% translate "Add new log" %}
- </a>
- {% endif %}
- {% else %}
- <a href="{% url 'manager:workout:add' %}" class="btn btn-sm btn-block btn-success btn-block">
- {% translate "No workouts found." %} {% translate "Add one now." %}
- </a>
- {% endif %}
- </div>
- </div>
+ {% endif %}
+
+
+ <div class="container">
+ <div class="row">
+ <div class="col-sm-6 col-md-4">
+ <div class="card">
+ <div class="card-body">
+ <h5 class="card-title">{% translate "Workout" %}</h5>
+ <div class="card-text">
+ {% if current_workout %}
+ <p>
+ <a href="{{ current_workout.get_absolute_url }}">
+ {% if current_workout.comment %}
+ {{ current_workout.comment }}
+ {% else %}
+ {% translate "Workout" %}
+ {% endif %}
+ </a>
+ </p>
+ <p>
+ – {{ current_workout.creation_date }}
+ <p>
+ {% endif %}
+ <table class="table table-hover table-sm">
+ {% for day, exercise, is_workout in weekdays %}
+ <tr>
+ <td>
+ {{ day }}
+ </td>
+ <td>
+ {% if not is_workout %}<span class="text-muted">{% endif %}
+ {{ exercise }}
+ {% if not is_workout %}</span>{% endif %}
+ </td>
+ </tr>
+ {% endfor %}
+ </table>
+
+ {% if schedule %}
+ <p>
+ → {% translate "This workout is part of a schedule:" %}
+ <a href="{{ schedule.get_absolute_url }}">{{ schedule.name }}</a>
+ </p>
+ {% endif %}
+ <p><em>
+ {% blocktranslate trimmed %}The current workout is selected from your active
+ schedule or, if you don't have one, simply by date.{% endblocktranslate %}
+ </em></p>
+ </div>
+ </div>
+ <div class="card-footer">
+ {% if current_workout %}
+ {% if current_workout.day_set.all %}
+ <a href="#"
+ id="logging-popup-link"
+ data-bs-toggle="modal"
+ data-bs-target="#calendar-day-select-popup"
+ class="btn btn-success btn-sm btn-block">
+ {% translate "Add new log" %}
+ </a>
+ {% endif %}
+ {% else %}
+ <a href="{% url 'manager:workout:add' %}" class="btn btn-sm btn-success">
+ {% translate "No workouts found." %} {% translate "Add one now." %}
+ </a>
+ {% endif %}
+ </div>
+ </div>
+ </div>
- <div class="card">
- <div class="card-body">
- <h5 class="card-title">{% translate "Nutrition plan"%}</h5>
- <div class="card-text">
- {% if plan %}
- <p>
- <a href="{{ plan.get_absolute_url }}">{{ plan }}</a>
- </p>
- <p>
- – {{ plan.creation_date }}
- </p>
- {% endif %}
- <table class="table table-hover table-sm">
- <tr>
- <td>{% translate "Energy" %}</td>
- <td>
- {{nutritional_info.total.energy|floatformat|default:"-/-"}} {% translate "kcal" %}
- </td>
- </tr>
- <tr>
- <td>{% translate "Protein" %}</td>
- <td>
- {{nutritional_info.total.protein|floatformat|default:"-/-"}} {% trans_weight_unit 'g' user %}
- </td>
- </tr>
- <tr>
- <td>{% translate "Carbohydrates" %}</td>
- <td>
- {{nutritional_info.total.carbohydrates|floatformat|default:"-/-"}} {% trans_weight_unit 'g' user %}
- </td>
- </tr>
- <tr>
- <td>{% translate "Fat" %}</td>
- <td>
- {{nutritional_info.total.fat|floatformat|default:"-/-"}} {% trans_weight_unit 'g' user %}
- </td>
- </tr>
- </table>
+ <div class="col-sm-6 col-md-4">
+ <div class="card">
+ <div class="card-body">
+ <h5 class="card-title">{% translate "Nutrition plan" %}</h5>
+ <div class="card-text">
+ {% if plan %}
+ <p>
+ <a href="{{ plan.get_absolute_url }}">{{ plan }}</a>
+ </p>
+ <p>
+ – {{ plan.creation_date }}
+ </p>
+ {% endif %}
+ <table class="table table-hover table-sm">
+ <tr>
+ <td>{% translate "Energy" %}</td>
+ <td>
+ {{ nutritional_info.total.energy|floatformat|default:"-/-"}} {% translate "kcal" %}
+ </td>
+ </tr>
+ <tr>
+ <td>{% translate "Protein" %}</td>
+ <td>
+ {{ nutritional_info.total.protein|floatformat|default:"-/-"}} {% trans_weight_unit 'g' user %}
+ </td>
+ </tr>
+ <tr>
+ <td>{% translate "Carbohydrates" %}</td>
+ <td>
+ {{ nutritional_info.total.carbohydrates|floatformat|default:"-/-"}} {% trans_weight_unit 'g' user %}
+ </td>
+ </tr>
+ <tr>
+ <td>{% translate "Fat" %}</td>
+ <td>
+ {{ nutritional_info.total.fat|floatformat|default:"-/-"}} {% trans_weight_unit 'g' user %}
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div id="nutrition_diary_chart"></div>
+ </div>
+ <div class="card-footer">
+ {% if not plan %}
+ <a href="{% url 'nutrition:plan:add' %}" class="btn btn-sm btn-block btn-success">
+ {% translate "No nutrition plans." %} {% translate "Add one now." %}
+ </a>
+ {% else %}
+ <a href="#"
+ id="nutrition-diary-link"
+ data-bs-toggle="modal"
+ data-bs-target="#nutrition-diary-popup"
+ class="btn btn-success btn-sm">
+ {% translate "Add new diary entry" %}
+ </a>
+ {% endif %}
+ </div>
+ </div>
</div>
- <div id="nutrition_diary_chart"></div>
- </div>
- <div class="card-footer">
- {% if not plan %}
- <a href="{% url 'nutrition:plan:add' %}" class="btn btn-sm btn-block btn-success">
- {% translate "No nutrition plans." %} {% translate "Add one now." %}
- </a>
- {% else %}
- <a href="#" id="nutrition-diary-link" data-toggle="modal" data-target="#nutrition-diary-popup" class="btn btn-success btn-sm btn-block">
- {% translate "Add new diary entry" %}
- </a>
- {% endif %}
- </div>
- </div>
-
- <div class="card">
- <div class="card-body">
- <h5 class="card-title">{% translate "Weight"%}</h5>
- <div class="card-text">
- <div id="react-weight-dashboard"></div>
+ <div class="col-sm-12 col-md-4">
+ <div class="card">
+ <div class="card-body">
+ <h5 class="card-title">{% translate "Weight" %}</h5>
+ <div class="card-text">
+ <div id="react-weight-dashboard"></div>
+ </div>
+ </div>
+ <div class="card-footer">
+ <a href="{% url 'weight:add' %}" class="btn btn-success btn-sm wger-modal-dialog" role="button">
+ {% translate "Add weight entry" %}
+ </a>
+ </div>
+ </div>
</div>
</div>
- <div class="card-footer">
- <a href="{% url 'weight:add' %}" class="btn btn-success btn-block btn-sm wger-modal-dialog">
- {% translate "Add weight entry" %}
- </a>
- </div>
</div>
-</div>
+
{% endblock %}
diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
index 62cc82534..a319670d7 100644
--- a/wger/core/templates/navigation.html
+++ b/wger/core/templates/navigation.html
@@ -1,5 +1,5 @@
{% load static i18n wger_extras %}
-<nav class="navbar navbar-expand-md bg-wger-primary">
+<nav class="navbar navbar-expand-md bg-primary">
<div class="container-fluid">
<div class="container-lg" style="display: flex;">
<a class="navbar-brand" href="{% url 'core:index' %}">
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index 28a80c642..5db417b63 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -157,7 +157,7 @@
</div>
-<footer id="main-footer" class="bg-wger-light border-top">
+<footer id="main-footer" class="bg-light border-top">
<div class="container bg-wger-light">
<div class="row">
<div class="col-xl-2 col-md-3">
@@ -190,7 +190,7 @@
{% if not is_api_path %} {# Don't show language switcher in the generated API views #}
<div class="dropdown float-end">
<button
- class="btn btn-secondary dropdown-toggle"
+ class="btn btn-light dropdown-toggle"
type="button"
data-bs-toggle="dropdown"
aria-expanded="false">