diff --git a/smash/web/templates/subjects/breadcrumb.html b/smash/web/templates/subjects/breadcrumb.html
new file mode 100644
index 0000000000000000000000000000000000000000..858db1a0d6db9eb6281d157d4f70bf38f540bc76
--- /dev/null
+++ b/smash/web/templates/subjects/breadcrumb.html
@@ -0,0 +1,4 @@
+ <li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+ <li class="active">
+ <a href="{% url 'web.views.subjects' %}">Subjects</a>
+ </li>
\ No newline at end of file
diff --git a/smash/web/templates/subjects/delete.html b/smash/web/templates/subjects/delete.html
index e10a3e29704cccd5f3cbb8d1aa93bf771129bd4d..043b1dac710a9fffb18d1a20612d2fe5bbe94d85 100644
--- a/smash/web/templates/subjects/delete.html
+++ b/smash/web/templates/subjects/delete.html
@@ -7,30 +7,65 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block page_title %}'deletesubject'{% endblock page_title %}
-{% block page_header %}Delete subject{% endblock page_header %}
-{% block page_description %}deleting{% endblock page_description %}
+{% block page_title %}'subjects'{% endblock page_title %}
+{% block page_header %}Are you sure you want to remove information concerning this subject?{% endblock page_header %}
+{% block page_description %}{% endblock page_description %}
+
+{% block title %}{{ block.super }} - Delete subject information{% endblock %}
{% block breadcrumb %}
- <li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
- <li class="active">Workers</li>
+{% include "subjects/breadcrumb.html" %}
{% endblock breadcrumb %}
{% block maincontent %}
-<h3>Are you sure you want to remove information concerning this subject? </h3>
-
-{% block title %}{{object_name}} Form{% endblock %}
{% block content %}
-<form method="post" action="">
- {{ form.as_ul }}
- {% csrf_token %}
+<div class="box box-info">
+ <div class="box-header with-border">
+ <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default">Go back (without change)</a>
+ </div>
+
+ {% comment %} <div class="box-header with-border">
+ <h3 class="box-title">Details of subject</h3>
+ </div>{% endcomment %}
+
+ <form method="post" action="" class="form-horizontal">
+ {% csrf_token %}
+
+ <div class="box-body">
+ {% for field in form %}
+ <div class="form-group">
+ <label for="inputEmail3" class="col-sm-2 control-label">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-10">
+ <!--
+ <input class="form-control" id="inputEmail3" placeholder="Email" type="email">
+ -->
+ {{ field }}
+ </div>
- <button type="submit" class="btn btn-block btn-danger">Delete</button>
- <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default">Back</a>
+ {% if field.help_text %}
+ <span class="help-block">
+ {{ field.help_text }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div><!-- /.box-body -->
-</form>
+ <div class="box-footer">
+ <div class="col-sm-6">
+ <button type="submit" class="btn btn-block btn-danger">Delete</button>
+ </div>
+ <div class="col-sm-6">
+ <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default">Cancel</a>
+ </div>
+ </div><!-- /.box-footer -->
+ </form>
+</div>
{% endblock %}
diff --git a/smash/web/templates/subjects/details.html b/smash/web/templates/subjects/details.html
index b2a71afbf79be5164a053a8ea0a6d0fe1f666d6f..38e98ec5a421203ac7abae86f38ef17ee8cb148b 100644
--- a/smash/web/templates/subjects/details.html
+++ b/smash/web/templates/subjects/details.html
@@ -7,27 +7,26 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block page_title %}'newsubject'{% endblock page_title %}
-{% block page_header %}Details of the patient{% endblock page_header %}
+{% block page_title %}'subjects'{% endblock page_title %}
+{% block page_header %}Details of the subject{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
-{% block title %}{{ block.super }} - Details of patient {% endblock %}
+{% block title %}{{ block.super }} - Details of subject {% endblock %}
{% block breadcrumb %}
- <li>
- <a href=""><i class="fa fa-dashboard"></i> Dashboard</a>
- </li>
- <li class="active">
- <a href="{% url 'web.views.subjects' %}">Subjects</a>
- </li>
+{% include "subjects/breadcrumb.html" %}
{% endblock breadcrumb %}
{% block maincontent %}
{% 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">Back</a>
+ </div>
+
{% comment %} <div class="box-header with-border">
- <h3 class="box-title">Details of patient</h3>
+ <h3 class="box-title">Details of subject</h3>
</div>{% endcomment %}
<form class="form-horizontal">
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index f2781f1e15db57965ca1dceeb46e2b87f144d1e5..00c939ef3dc2b15d5d2a1ffd328f3e06925b2d46 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -7,27 +7,65 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block page_title %}'editsubject'{% endblock page_title %}
+{% block page_title %}'subjects'{% endblock page_title %}
{% block page_header %}Edit subject{% endblock page_header %}
-{% block page_description %}editing{% endblock page_description %}
+{% block page_description %}{% endblock page_description %}
+
+{% block title %}{{ block.super }} - Edit subject information{% endblock %}
{% block breadcrumb %}
- <li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
- <li class="active">Workers</li>
+{% include "subjects/breadcrumb.html" %}
{% endblock breadcrumb %}
{% block maincontent %}
-{% block title %}{{object_name}} Form{% endblock %}
-
{% block content %}
-<form method="post" action="">
- {{ form.as_ul }}
- {% csrf_token %}
+<div class="box box-info">
+ <div class="box-header with-border">
+ <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default">Go back (without change)</a>
+ </div>
+
+ {% comment %} <div class="box-header with-border">
+ <h3 class="box-title">Details of subject</h3>
+ </div>{% endcomment %}
+
+ <form method="post" action="" class="form-horizontal">
+ {% csrf_token %}
+
+ <div class="box-body">
+ {% for field in form %}
+ <div class="form-group">
+ <label for="inputEmail3" class="col-sm-2 control-label">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-10">
+ <!--
+ <input class="form-control" id="inputEmail3" placeholder="Email" type="email">
+ -->
+ {{ field }}
+ </div>
+
+ {% if field.help_text %}
+ <span class="help-block">
+ {{ field.help_text }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div><!-- /.box-body -->
+
+ <div class="box-footer">
+ <div class="col-sm-6">
+ <button type="submit" class="btn btn-block btn-success">Save</button>
+ </div>
+ <div class="col-sm-6">
+ <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default">Cancel</a>
+ </div>
+ </div><!-- /.box-footer -->
+ </form>
+</div>
- <button type="submit" class="btn btn-block btn-success">Save</button>
- <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default">Cancel</a>
-</form>
{% endblock %}