Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix modal dialogs

Roland44b4c5de6c0f
diff --git a/wger/core/templates/index.html b/wger/core/templates/index.html
index 6044ed2c4..b56e29ab1 100644
--- a/wger/core/templates/index.html
+++ b/wger/core/templates/index.html
@@ -18,8 +18,8 @@
<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 'Add log to day' %}</h4>
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body">
<p>{% blocktrans %}Click to add weight logs to a training
diff --git a/wger/core/templates/misc/fragments/shariff_modal.html b/wger/core/templates/misc/fragments/shariff_modal.html
index 19e944838..f82ebff3a 100644
--- a/wger/core/templates/misc/fragments/shariff_modal.html
+++ b/wger/core/templates/misc/fragments/shariff_modal.html
@@ -7,8 +7,8 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{% trans "Share this page" %}</h4>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
<div class="shariff {% if is_owner and not owner_user.userprofile.ro_access %}hidden{% endif %}" data-lang="{{language.short_name}}"></div>
diff --git a/wger/core/templates/template.html b/wger/core/templates/template.html
index 2f56cf735..418407bd4 100644
--- a/wger/core/templates/template.html
+++ b/wger/core/templates/template.html
@@ -133,22 +133,30 @@
</div>
</div>
</div>
-
-
</header>
+
+{# #}
+{# Navigation #}
+{# #}
{% include 'navigation.html' %}
+
+
+{# #}
+{# Main content #}
+{# #}
<div id="main">
<div class="container" style="padding-bottom: 1em;">
<div class="modal fade" id="wger-ajax-info" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
+ <h4 class="modal-title" id="ajax-info-title">Modal title</h4>
<button type="button"
class="close"
data-dismiss="modal"
aria-hidden="true"
style="padding-left: 0.5em;">&times;</button>
- <h4 class="modal-title" id="ajax-info-title">Modal title</h4>
+
</div>
<div class="modal-body" id="ajax-info-content">
</div>
diff --git a/wger/core/templates/user/overview.html b/wger/core/templates/user/overview.html
index 726baedd2..443b68287 100644
--- a/wger/core/templates/user/overview.html
+++ b/wger/core/templates/user/overview.html
@@ -233,8 +233,8 @@
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
- <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title">{% trans 'Password reset confirmation' %}</h4>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
<p>{% trans 'Do you really want to change this user&#39;s password?' %}</p>
diff --git a/wger/manager/templates/calendar/month.html b/wger/manager/templates/calendar/month.html
index 63a63f82b..9a2ca7072 100644
--- a/wger/manager/templates/calendar/month.html
+++ b/wger/manager/templates/calendar/month.html
@@ -114,8 +114,8 @@ $(document).ready(function() {
<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 'Add log to day' %}</h4>
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body">
{% if current_workout %}
diff --git a/wger/manager/templates/schedule/view.html b/wger/manager/templates/schedule/view.html
index 01fc16422..3681f37e1 100644
--- a/wger/manager/templates/schedule/view.html
+++ b/wger/manager/templates/schedule/view.html
@@ -228,8 +228,8 @@ than once.{% endblocktrans %}</p>
<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 "Export calendar file" %}</h4>
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body">
<p>{% trans "Export this schedule as a calendar file." %}</p>
diff --git a/wger/manager/templates/workout/view.html b/wger/manager/templates/workout/view.html
index d28acfa49..ebd595529 100644
--- a/wger/manager/templates/workout/view.html
+++ b/wger/manager/templates/workout/view.html
@@ -123,8 +123,8 @@ $(document).ready(function () {
<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 "Export calendar file" %}</h4>
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
</div>
<div class="modal-body">
<p>{% trans "Export this workout as a calendar file." %}</p>