From 161aee7951f0254f8352bbb761daf76f75600177 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda.001@student.uni.lu>
Date: Thu, 26 Jan 2017 15:57:19 +0100
Subject: [PATCH] Corrections
---
smash/web/templates/doctors/add.html | 4 +-
smash/web/templates/doctors/availdex.html | 385 ++++++++++++----------
smash/web/templates/subjects/add.html | 4 +-
smash/web/templates/visits/index.html | 6 +-
4 files changed, 209 insertions(+), 190 deletions(-)
diff --git a/smash/web/templates/doctors/add.html b/smash/web/templates/doctors/add.html
index 93c3fb9d..d4d50c45 100644
--- a/smash/web/templates/doctors/add.html
+++ b/smash/web/templates/doctors/add.html
@@ -37,11 +37,11 @@
<div class="col-sm-6">
{% for field in form %}
<div class="form-group {% if field.errors %}has-error{% endif %}">
- <label for="{# TODO #}" class="col-sm-2 control-label">
+ <label for="{# TODO #}" class="col-sm-4 control-label">
{{ field.label }}
</label>
- <div class="col-sm-10">
+ <div class="col-sm-8">
{{ field|add_class:'form-control' }}
</div>
diff --git a/smash/web/templates/doctors/availdex.html b/smash/web/templates/doctors/availdex.html
index d012f87f..b8a7922c 100644
--- a/smash/web/templates/doctors/availdex.html
+++ b/smash/web/templates/doctors/availdex.html
@@ -22,7 +22,7 @@
<div class="box-header with-border">
<h3 class="box-title">To be implemented</h3>
- <div class="box-tools pull-right">
+ <div class="box-tools center">
<button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
</div>
<!-- /.box-tools -->
@@ -35,209 +35,230 @@
<!-- /.box-body -->
</div>
+ <div>
+ <h3>Monday</h3>
- <h3>Monday</h3>
- {% if avmon %}
- <table id="tabmon" class="table table-bordered table-striped">
- <thead>
- <tr>
- <th>No.</th>
- <th>From</th>
- <th>Until</th>
- <th>Remove</th>
- </tr>
- </thead>
- <tbody>
- {% for record in avmon %}
- <tr>
- <td> {{forloop.counter}} </td>
- <td> {{record.availFro}} </td>
- <td> {{record.availTil}} </td>
- <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
-
-
- {% else %}
- <p>No avaibilities on Monday.</p>
- {% endif %}
+ <div class="new-availability">
+ <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
+ <i class="fa fa-plus"></i>
+ Add new avaibility</a>
+ </div>
- <div>
- <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
- <i class="fa fa-plus"></i>
- Add new avaibility</a>
+ {% if avmon %}
+ <table id="tabmon" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>No.</th>
+ <th>From</th>
+ <th>Until</th>
+ <th>Remove</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for record in avmon %}
+ <tr>
+ <td> {{forloop.counter}} </td>
+ <td> {{record.availFro}} </td>
+ <td> {{record.availTil}} </td>
+ <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+ {% else %}
+ <p>No avaibilities on Monday.</p>
+ {% endif %}
</div>
- <h3>Tuesday</h3>
- {% if avtue %}
- <table id="tabtue" class="table table-bordered table-striped">
- <thead>
- <tr>
- <th>No.</th>
- <th>From</th>
- <th>Until</th>
- <td> Remove </td>
- </tr>
- </thead>
- <tbody>
- {% for record in avtue %}
- <tr>
- <td> {{forloop.counter}} </td>
- <td> {{record.availFro}} </td>
- <td> {{record.availTil}} </td>
- <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
-
-
- {% else %}
- <p>No avaibilities on Tuesday.</p>
- {% endif %}
+ <hr />
<div>
- <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
- <i class="fa fa-plus"></i>
- Add new avaibility</a>
+ <h3>Tuesday</h3>
+
+ <div class="new-availability">
+ <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
+ <i class="fa fa-plus"></i>
+ Add new avaibility</a>
+ </div>
+
+ {% if avtue %}
+ <table id="tabtue" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>No.</th>
+ <th>From</th>
+ <th>Until</th>
+ <td> Remove </td>
+ </tr>
+ </thead>
+ <tbody>
+ {% for record in avtue %}
+ <tr>
+ <td> {{forloop.counter}} </td>
+ <td> {{record.availFro}} </td>
+ <td> {{record.availTil}} </td>
+ <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+ {% else %}
+ <p>No avaibilities on Tuesday.</p>
+ {% endif %}
</div>
- <h3>Wednesday</h3>
- {% if avwed %}
- <table id="tabwed" class="table table-bordered table-striped">
- <thead>
- <tr>
- <th>No.</th>
- <th>From</th>
- <th>Until</th>
- <td> Remove </td>
- </tr>
- </thead>
- <tbody>
- {% for record in avwed %}
- <tr>
- <td> {{forloop.counter}} </td>
- <td> {{record.availFro}} </td>
- <td> {{record.availTil}} </td>
- <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
-
-
- {% else %}
- <p>No avaibilities on Wednesday.</p>
- {% endif %}
+ <hr />
<div>
- <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
- <i class="fa fa-plus"></i>
- Add new avaibility</a>
+ <h3>Wednesday</h3>
+
+ <div class="new-availability">
+ <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
+ <i class="fa fa-plus"></i>
+ Add new avaibility</a>
+ </div>
+
+ {% if avwed %}
+ <table id="tabwed" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>No.</th>
+ <th>From</th>
+ <th>Until</th>
+ <td> Remove </td>
+ </tr>
+ </thead>
+ <tbody>
+ {% for record in avwed %}
+ <tr>
+ <td> {{forloop.counter}} </td>
+ <td> {{record.availFro}} </td>
+ <td> {{record.availTil}} </td>
+ <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+ {% else %}
+ <p>No avaibilities on Wednesday.</p>
+ {% endif %}
</div>
- <h3>Thursday</h3>
- {% if avthu %}
- <table id="tabmon" class="table table-bordered table-striped">
- <thead>
- <tr>
- <th>No.</th>
- <th>From</th>
- <th>Until</th>
- <td> Remove </td>
- </tr>
- </thead>
- <tbody>
- {% for record in avthu %}
- <tr>
- <td> {{forloop.counter}} </td>
- <td> {{record.availFro}} </td>
- <td> {{record.availTil}} </td>
- <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
-
-
- {% else %}
- <p>No avaibilities on Thursday.</p>
- {% endif %}
+ <hr />
<div>
- <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
- <i class="fa fa-plus"></i>
- Add new avaibility</a>
+ <h3>Thursday</h3>
+
+ <div class="new-availability">
+ <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
+ <i class="fa fa-plus"></i>
+ Add new avaibility</a>
+ </div>
+
+ {% if avthu %}
+ <table id="tabmon" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>No.</th>
+ <th>From</th>
+ <th>Until</th>
+ <td> Remove </td>
+ </tr>
+ </thead>
+ <tbody>
+ {% for record in avthu %}
+ <tr>
+ <td> {{forloop.counter}} </td>
+ <td> {{record.availFro}} </td>
+ <td> {{record.availTil}} </td>
+ <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+ {% else %}
+ <p>No avaibilities on Thursday.</p>
+ {% endif %}
</div>
- <h3>Friday</h3>
- {% if avfri %}
- <table id="tabmon" class="table table-bordered table-striped">
- <thead>
- <tr>
- <th>No.</th>
- <th>From</th>
- <th>Until</th>
- <td> Remove </td>
- </tr>
- </thead>
- <tbody>
- {% for record in avfri %}
- <tr>
- <td> {{forloop.counter}} </td>
- <td> {{record.availFro}} </td>
- <td> {{record.availTil}} </td>
- <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
-
-
- {% else %}
- <p>No avaibilities on Friday.</p>
- {% endif %}
+ <hr />
<div>
- <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
- <i class="fa fa-plus"></i>
- Add new avaibility</a>
+ <h3>Friday</h3>
+
+ <div class="new-availability">
+ <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
+ <i class="fa fa-plus"></i>
+ Add new avaibility</a>
+ </div>
+
+ {% if avfri %}
+ <table id="tabmon" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>No.</th>
+ <th>From</th>
+ <th>Until</th>
+ <td> Remove </td>
+ </tr>
+ </thead>
+ <tbody>
+ {% for record in avfri %}
+ <tr>
+ <td> {{forloop.counter}} </td>
+ <td> {{record.availFro}} </td>
+ <td> {{record.availTil}} </td>
+ <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+ {% else %}
+ <p>No avaibilities on Friday.</p>
+ {% endif %}
</div>
- <h3>Saturday</h3>
- {% if avsat %}
- <table id="tabmon" class="table table-bordered table-striped">
- <thead>
- <tr>
- <th>No.</th>
- <th>From</th>
- <th>Until</th>
- <th>Remove</th>
- </tr>
- </thead>
- <tbody>
- {% for record in avsat %}
- <tr>
- <td> {{forloop.counter}} </td>
- <td> {{record.availFro}} </td>
- <td> {{record.availTil}} </td>
- <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
-
-
- {% else %}
- <p>No avaibilities on Saturday.</p>
- {% endif %}
+ <hr />
<div>
- <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
- <i class="fa fa-plus"></i>
- Add new avaibility</a>
+ <h3>Saturday</h3>
+
+ <div class="new-availability">
+ <a href="{% url 'web.views.doctoradd' %}" class="btn btn-app">
+ <i class="fa fa-plus"></i>
+ Add new avaibility</a>
+ </div>
+
+ {% if avsat %}
+ <table id="tabmon" class="table table-bordered table-striped">
+ <thead>
+ <tr>
+ <th>No.</th>
+ <th>From</th>
+ <th>Until</th>
+ <th>Remove</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for record in avsat %}
+ <tr>
+ <td> {{forloop.counter}} </td>
+ <td> {{record.availFro}} </td>
+ <td> {{record.availTil}} </td>
+ <td><a href="{% url 'web.views.availdelete' id record.id %}" type="button" class="btn btn-block btn-default">Delete</a></td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+
+ {% else %}
+ <p>No avaibilities on Saturday.</p>
+ {% endif %}
</div>
</div>
diff --git a/smash/web/templates/subjects/add.html b/smash/web/templates/subjects/add.html
index bce72c6d..240ccf60 100644
--- a/smash/web/templates/subjects/add.html
+++ b/smash/web/templates/subjects/add.html
@@ -37,11 +37,11 @@
<div class="col-sm-6">
{% for field in form %}
<div class="form-group {% if field.errors %}has-error{% endif %}">
- <label for="inputEmail3" class="col-sm-2 control-label">
+ <label for="inputEmail3" class="col-sm-4 control-label">
{{ field.label }}
</label>
- <div class="col-sm-10">
+ <div class="col-sm-8">
{{ field|add_class:'form-control' }}
</div>
diff --git a/smash/web/templates/visits/index.html b/smash/web/templates/visits/index.html
index fa9fb90c..b83917eb 100644
--- a/smash/web/templates/visits/index.html
+++ b/smash/web/templates/visits/index.html
@@ -22,10 +22,8 @@
{% endblock breadcrumb %}
{% block maincontent %}
-<div class="row">
- <div class="col-md-5">
- <h3>Visits</h3>
-
+<div>
+ <div>
{% if visit_list %}
<table id="visit_table" class="table table-bordered table-striped">
<thead>
--
GitLab