Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Move more templates to bootstrap 4

Rolandd641970c48d1
diff --git a/wger/core/static/css/bootstrap-custom.css b/wger/core/static/css/bootstrap-custom.css
index 40b315b49..41b78da8a 100644
--- a/wger/core/static/css/bootstrap-custom.css
+++ b/wger/core/static/css/bootstrap-custom.css
@@ -31,86 +31,3 @@ body {
font-family: "Open Sans Light", Arial, Helvetica, sans-serif;
background-color: #204a87;
}
-
-@media (min-width: 992px) {
- #main-content {
- min-height: 40em;
- }
-}
-
-
-.close {
- float: right;
- opacity: 0.2;
- font-weight: bold;
-}
-
-.carousel a:hover,
-.carousel a:focus {
- background-color: transparent;
-}
-
-.wger-list-group-item {
- background-color: #f5f5f5;
-}
-
-.page-header {
- margin-top: 10px;
-}
-
-.navbar-brand {
- font-family: "Open Sans Bold", Arial, Helvetica, sans-serif;
- font-weight: bold;
-}
-
-
-/**************************************************************
- * Alerts
- **************************************************************/
-
-.label,
-.badge {
- font-weight: normal;
-}
-
-/*
- * Make the 'close' button on alerts more prominent
- */
-.alert .close {
- opacity: 0.8;
- text-decoration: none;
-}
-
-/**************************************************************
- * Buttons
- **************************************************************/
-.btn {
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
-
-
-/**************************************************************
- * Headers in sidebar
- **************************************************************/
-#main-sidebar h4,
-#main-sidebar .h4,
-#main-sidebar h5,
-#main-sidebar .h5,
-#main-sidebar h6,
-#main-sidebar .h6 {
- margin-top: 0;
-}
-
-/**************************************************************
- * Fix issue with body shifting
- *
- * Opening modal dialogs shifted the whole body by 15px to the left.
- * While this appears to be https://github.com/twbs/bootstrap/issues/9855
- * it doesn't seem to be fixed here. When it does, these fixes can be removed
- **************************************************************/
-body.modal-open {
- padding-right: 0 !important;
-}
-
diff --git a/wger/core/static/js/wger-core.js b/wger/core/static/js/wger-core.js
index ab6292a30..a00cc1a4e 100644
--- a/wger/core/static/js/wger-core.js
+++ b/wger/core/static/js/wger-core.js
@@ -679,7 +679,7 @@ $(document).ready(function () {
e.preventDefault();
downloadInfo = $('#pdf-download-info');
- downloadType = $('input[name="pdf_type"]:checked').val();
+ downloadType = $('select[name="pdf_type"]').val();
downloadImages = $('#id_images').is(':checked') ? 1 : 0;
downloadComments = $('#id_comments').is(':checked') ? 1 : 0;
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index 0bf12a587..6aa07d6f0 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -123,10 +123,11 @@
{% for language in languages %}
{% language_select language %}
{% endfor %}
- <a href="https://www.transifex.com/rge/wger-workout-manager/" class="dropdown-item">
- <span class="{% fa_class 'plus' %}"></span>
- {% trans "Translate" %}
- </a>
+ <div class="dropdown-divider"></div>
+ <a href="https://www.transifex.com/rge/wger-workout-manager/" class="dropdown-item" target="_blank">
+ <span class="{% fa_class 'plus' %}"></span>
+ {% trans "Translate" %}
+ </a>
</div>
</div>
</div>
diff --git a/wger/manager/forms.py b/wger/manager/forms.py
index d37c3d349..2e0e78327 100644
--- a/wger/manager/forms.py
+++ b/wger/manager/forms.py
@@ -20,7 +20,9 @@ This file contains forms used in the application
# Django
from django.forms import (
+ BooleanField,
CharField,
+ ChoiceField,
DecimalField,
Form,
IntegerField,
@@ -29,7 +31,10 @@ from django.forms import (
MultipleHiddenInput,
widgets
)
-from django.utils.translation import ugettext as _
+from django.utils.translation import (
+ ugettext as _,
+ ugettext_lazy
+)
# Third Party
from captcha.fields import ReCaptchaField
@@ -37,7 +42,8 @@ from crispy_forms.helper import FormHelper
from crispy_forms.layout import (
Column,
Layout,
- Row
+ Row,
+ Submit
)
# wger
@@ -213,6 +219,43 @@ class WorkoutSessionForm(ModelForm):
model = WorkoutSession
exclude = ('user', 'workout', 'date')
+ def __init__(self, *args, **kwargs):
+ super(WorkoutSessionForm, self).__init__(*args, **kwargs)
+ self.helper = FormHelper()
+ self.helper.layout = Layout(
+ 'impression',
+ 'notes',
+ Row(
+ Column('time_start', css_class='form-group col-6 mb-0'),
+ Column('time_end', css_class='form-group col-6 mb-0'),
+ css_class='form-row'
+ ),
+ )
+
+
+class WorkoutScheduleDownloadForm(Form):
+ """
+ Form for the workout schedule download
+ """
+ pdf_type = ChoiceField(
+ label = ugettext_lazy(u"Type"),
+ choices=(("log", ugettext_lazy("Log")),
+ ("table", ugettext_lazy("Table"))
+ ),
+ )
+ images = BooleanField(label = ugettext_lazy("with images"),
+ required=False)
+ comments = BooleanField(label = ugettext_lazy("with comments"),
+ required=False)
+
+ def __init__(self):
+ super(WorkoutScheduleDownloadForm, self).__init__()
+ self.helper = FormHelper()
+ self.helper.form_tag = False
+ self.helper.add_input(Submit('submit', _("Download"),
+ css_class='btn-success btn-block',
+ css_id="download-pdf-button-schedule"))
+
class WorkoutSessionHiddenFieldsForm(ModelForm):
'''
diff --git a/wger/manager/templates/schedule/overview.html b/wger/manager/templates/schedule/overview.html
index 6ac3b9a68..0b0f3b19d 100644
--- a/wger/manager/templates/schedule/overview.html
+++ b/wger/manager/templates/schedule/overview.html
@@ -15,8 +15,8 @@
<span class="glyphicon glyphicon-chevron-right pull-right"></span>
{% if schedule.is_active %}
- <span class="badge">
- <em>{% trans "active" %}</em>
+ <span class="badge badge-pill badge-primary">
+ {% trans "active" %}
</span>
{% endif %}
diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.html
index c3a9bed4f..95e3e47b9 100644
--- a/wger/manager/templates/schedule/view.html
+++ b/wger/manager/templates/schedule/view.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% load i18n %}
-{% load static wger_extras %}
+{% load static wger_extras crispy_forms_tags %}
{# #}
{# Opengraph #}
@@ -177,22 +177,22 @@
{% with step_dates=step.get_dates %}
<div class="row">
<div class="col-md-3">
- <div class="panel panel-default">
- <div class="panel-heading">
- <h4 class="panel-title">
+ <div class="card">
+ <div class="card-body">
+ <h4 class="card-title">
{% blocktrans count weeks=step.duration %}{{ weeks }} Week
{% plural %}{{ weeks }} Weeks
{% endblocktrans %}
</h4>
- {% if active_workout == step %}
- <span class="label label-info">{% trans "active" %}</span>
- {% endif %}
- </div>
- <div class="panel-body">
- <span>{{step_dates.0}} <br> {{step_dates.1}}</span>
+ <span class="card-text">
+ {% if active_workout == step %}
+ <span class="badge badge-pill badge-primary">{% trans "active" %}</span><br>
+ {% endif %}
+ <span>{{step_dates.0}} <br> {{step_dates.1}}</span>
+ </span>
</div>
- <div class="panel-footer">
+ <div class="card-footer">
<a href="{{ step.workout.get_absolute_url }}"
class="btn btn-default btn-block btn-sm"
style="white-space: normal;">
@@ -253,56 +253,14 @@ an appointment for each training day with the appropriate exercises.{% endblockt
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title">{% trans "Download as PDF" %}</h4>
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body">
<form class="wger-form">
+ {% crispy download_form %}
<div id="pdf-download-info" data-schedule-id="{{ schedule.id }}" data-uid="{{ uid }}" data-token="{{ token }}"></div>
- <div class="form-group">
- <div>
- <label for="id_images" class="col-md-3 control-label">
- {% trans "Type" %}
- </label>
- </div>
- <div class="col-md-9" style="padding-left: 35px;">
- <div class="radio">
- <input type="radio" name="pdf_type" id="id_type_log" value="log" checked>
- {% trans "Log" %}
- </div>
- <div class="radio">
- <input type="radio" name="pdf_type" id="id_type_table" value="table">
- {% trans "Table" %}
- </div>
- </div>
- </div>
- <div class="form-group">
- <div>
- <label for="id_images" class="col-md-3 control-label">
- {% trans "with images" %}
- </label>
- </div>
- <div class="col-md-9">
- <input type="checkbox" class="checkbox" name="images" id="id_images" checked>
- </div>
- </div>
- <div class="form-group">
- <div>
- <label for="id_comments" class="col-md-3 control-label">
- {% trans "with comments" %}
- </label>
- </div>
- <div class="col-md-9">
- <input type="checkbox" class="checkbox" name="comments" id="id_comments" checked>
- </div>
- </div>
</form>
-
- <p>
- <a href="" class="btn btn-block btn-default" id="download-pdf-button-schedule">
- {% trans "Download" %}
- </a>
- </p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{% trans "Close" %}</button>
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 3245fab66..00e19e6ff 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -197,9 +197,7 @@ patterns_schedule = [
url(r'^(?P<pk>\d+)/ical$',
ical.export_schedule,
name='ical'),
-
- url(
- r'^(?P<pk>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',
+ url(r'^(?P<pk>\d+)/pdf/log/(?P<images>[01]+)/(?P<comments>[01]+)/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',
schedule.export_pdf_log,
name='pdf-log'), # JS!
url(r'^(?P<pk>\d+)/pdf/log/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$',
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index 81d3e2f29..ce95ca315 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -55,6 +55,7 @@ from reportlab.platypus import (
)
# wger
+from wger.manager.forms import WorkoutScheduleDownloadForm
from wger.manager.helpers import render_workout_day
from wger.manager.models import Schedule
from wger.utils.generic_views import (
@@ -115,6 +116,7 @@ def view(request, pk):
template_data['is_owner'] = is_owner
template_data['owner_user'] = user
template_data['show_shariff'] = is_owner
+ template_data['download_form'] = WorkoutScheduleDownloadForm()
return render(request, 'schedule/view.html', template_data)
diff --git a/wger/software/templates/api.html b/wger/software/templates/api.html
index b8db6c9a2..20cd7253a 100644
--- a/wger/software/templates/api.html
+++ b/wger/software/templates/api.html
@@ -383,7 +383,7 @@ curl -H "Authorization: Token 123456..." \
{% block sidebar %}
<div class="alert alert-info" style="margin-top:1em;">
This is also new for us, if you plan on using the API,
- <a href="https://groups.google.com/group/wger" class="alert-link">we'd love to hear from you</a>.
+ <a href="https://github.com/wger-project/wger" class="alert-link">we'd love to hear from you</a>.
</div>
<p><a href="/api/v2/" class="btn btn-block btn-default" rel="nofollow">Browse the API</a></p>
diff --git a/wger/urls.py b/wger/urls.py
index a430b8fee..66d93ae99 100644
--- a/wger/urls.py
+++ b/wger/urls.py
@@ -30,27 +30,17 @@ from django.contrib.sitemaps.views import sitemap
from rest_framework import routers
# wger
-from wger.core.api import (
- views as core_api_views
-)
-from wger.exercises.api import (
- views as exercises_api_views
-)
+from wger.core.api import views as core_api_views
+from wger.exercises.api import views as exercises_api_views
from wger.exercises.sitemap import ExercisesSitemap
-from wger.manager.api import (
- views as manager_api_views
-)
-from wger.nutrition.api import (
- views as nutrition_api_views
-)
+from wger.manager.api import views as manager_api_views
+from wger.nutrition.api import views as nutrition_api_views
from wger.nutrition.sitemap import NutritionSitemap
from wger.utils.generic_views import (
TextTemplateView,
WebappManifestView
)
-from wger.weight.api import (
- views as weight_api_views
-)
+from wger.weight.api import views as weight_api_views
#admin.autodiscover()