From aee94ae85ba0e2661047191bd1c97722dbf8e44b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20Grou=C3=A8s?= <valentin.groues@uni.lu>
Date: Wed, 17 May 2017 13:41:50 +0200
Subject: [PATCH] add link from appointment to corresponding visit - fixes #111
---
smash/web/templates/appointments/edit.html | 14 ++++++++++----
smash/web/templates/subjects/details.html | 5 ++---
smash/web/templates/subjects/edit.html | 6 +++---
smash/web/templates/subjects/visitdetails.html | 3 +--
smash/web/templates/visits/details.html | 5 ++---
5 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/smash/web/templates/appointments/edit.html b/smash/web/templates/appointments/edit.html
index c74b9c98..11e0a476 100644
--- a/smash/web/templates/appointments/edit.html
+++ b/smash/web/templates/appointments/edit.html
@@ -23,11 +23,17 @@
{% block maincontent %}
{% block content %}
+ <div class="row">
+ <p class="col-lg-3 pull-left">
+ <a href="javascript:history.back(1)" class="btn btn-block btn-default">Go
+ back (discard changes)</a>
+ </p>
+ <p class="col-md-2 pull-right">
+ <a href="{% url 'web.views.visit_details' appointment.visit.id %}" type="button"
+ class="btn btn-block btn-default">View corresponding visit</a>
+ </p>
+ </div>
<div class="box box-info">
- <div class="box-header with-border">
- <a href="{% url 'web.views.appointments' %}" class="btn btn-block btn-default" onclick="history.back()">Go
- back (without changes)</a>
- </div>
{% comment %} <div class="box-header with-border">
<h3 class="box-title">Details of appointment</h3>
diff --git a/smash/web/templates/subjects/details.html b/smash/web/templates/subjects/details.html
index 4187da02..d3cd52aa 100644
--- a/smash/web/templates/subjects/details.html
+++ b/smash/web/templates/subjects/details.html
@@ -23,8 +23,7 @@
{% block content %}
<div class="box box-info">
<div class="box-header with-border">
- <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default"
- onclick="history.back()">Back</a>
+ <a href="javascript:history.back(1)" class="btn btn-block btn-default">Back</a>
</div>
{% comment %} <div class="box-header with-border">
@@ -57,7 +56,7 @@
<div class="box-footer">
- <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default" onclick="history.back()">Back</a>
+ <a href="javascript:history.back(1)" class="btn btn-block btn-default">Back</a>
</div><!-- /.box-footer -->
</form>
</div>
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index 22c88550..95682314 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -26,9 +26,9 @@
{% block content %}
<div class="row">
<p class="col-lg-3 pull-left">
- <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default"
- onclick="history.back()">Go
- back (discard changes)</a>
+ <a href="javascript:history.back(1)" class="btn btn-block btn-default"
+ ">Go
+ back (discard changes)</a>
</p>
<p class="col-md-2 pull-right">
<a href="{% url 'web.views.subject_visit_details' subject.id %}" type="button"
diff --git a/smash/web/templates/subjects/visitdetails.html b/smash/web/templates/subjects/visitdetails.html
index 3901572f..8ec7b079 100644
--- a/smash/web/templates/subjects/visitdetails.html
+++ b/smash/web/templates/subjects/visitdetails.html
@@ -23,8 +23,7 @@
{% block content %}
<div class="box box-info">
<div class="box-header with-border">
- <a href="{% url 'web.views.visits' %}" class="btn btn-block btn-default"
- onclick="history.back()">Back</a>
+ <a href="javascript:history.back(1)" class="btn btn-block btn-default">Back</a>
<a href="{% url 'web.views.visit_add' id %}" type="button" class="btn btn-block btn-default">Add
visit</a>
</div>
diff --git a/smash/web/templates/visits/details.html b/smash/web/templates/visits/details.html
index db9aaab5..2f0e96d0 100644
--- a/smash/web/templates/visits/details.html
+++ b/smash/web/templates/visits/details.html
@@ -25,8 +25,7 @@
{% block content %}
<div class="box box-info">
<div class="box-header with-border">
- <a href="{% url 'web.views.visits' %}" class="btn btn-block btn-default"
- onclick="history.back()">Back</a>
+ <a href="javascript:history.back(1)" class="btn btn-block btn-default">Back</a>
<a href="{% url 'web.views.subject_visit_details' visit.subject.id %}" type="button"
class="btn btn-block btn-default">Subject's visits</a>
</div>
@@ -177,7 +176,7 @@
<div class="box-footer">
<td><a href="{% url 'web.views.subject_edit' visit.subject.id %}" type="button"
class="btn btn-block btn-default">Edit subject</a></td>
- <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default" onclick="history.back()">Back</a>
+ <a href="javascript:history.back(1)" class="btn btn-block btn-default">Back</a>
</div><!-- /.box-footer -->
</form>
</div>
--
GitLab