From d2a12f706a15f93d7e3d1db7f0d700fe90235bf8 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda.001@student.uni.lu>
Date: Thu, 12 Jan 2017 20:44:10 +0100
Subject: [PATCH] Subject information subpages corrected
---
smash/web/templates/subjects/add.html | 62 ++++++++++++++++----
smash/web/templates/subjects/breadcrumb.html | 2 +-
smash/web/templates/subjects/delete.html | 3 -
smash/web/templates/subjects/edit.html | 3 -
smash/web/templates/subjects/index.html | 10 ++--
5 files changed, 56 insertions(+), 24 deletions(-)
diff --git a/smash/web/templates/subjects/add.html b/smash/web/templates/subjects/add.html
index b604dab6..7add549e 100644
--- a/smash/web/templates/subjects/add.html
+++ b/smash/web/templates/subjects/add.html
@@ -7,31 +7,67 @@
<link rel="stylesheet" href="{% static 'AdminLTE/plugins/datatables/dataTables.bootstrap.css' %}">
{% endblock styles %}
-{% block page_title %}'newsubject'{% endblock page_title %}
+{% block page_title %}'subjects'{% endblock page_title %}
{% block page_header %}New subject{% endblock page_header %}
-{% block page_description %}adding{% endblock page_description %}
+{% block page_description %}{% endblock page_description %}
+
+{% block title %} - Add new subject{% 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="">
- {{ formset.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">Cancel</a>
+ </div>
+ {% comment %} <div class="box-header with-border">
+ <h3 class="box-title">Details of subject</h3>
+ </div>{% endcomment %}
- <button type="submit" class="btn btn-block btn-success">Add</button>
- <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default">Cancel</a>
-</form>
-{% endblock %}
+ <form method="post" action="" class="form-horizontal">
+ {% csrf_token %}
+
+ {% for form in formset %}
+
+ <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">
+ {{ field }}
+ </div>
+ {% if field.help_text %}
+ <span class="help-block">
+ {{ field.help_text }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div><!-- /.box-body -->
+
+ {% endfor %}
+
+ <div class="box-footer">
+ <div class="col-sm-6">
+ <button type="submit" class="btn btn-block btn-success">Add</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 %}
{% endblock maincontent %}
diff --git a/smash/web/templates/subjects/breadcrumb.html b/smash/web/templates/subjects/breadcrumb.html
index 858db1a0..3c3a7dcd 100644
--- a/smash/web/templates/subjects/breadcrumb.html
+++ b/smash/web/templates/subjects/breadcrumb.html
@@ -1,4 +1,4 @@
- <li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
+ <li><a href="{% url 'web.views.assignments' %}"><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 043b1dac..91edd282 100644
--- a/smash/web/templates/subjects/delete.html
+++ b/smash/web/templates/subjects/delete.html
@@ -41,9 +41,6 @@
</label>
<div class="col-sm-10">
- <!--
- <input class="form-control" id="inputEmail3" placeholder="Email" type="email">
- -->
{{ field }}
</div>
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index 00c939ef..2ad479d3 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -40,9 +40,6 @@
</label>
<div class="col-sm-10">
- <!--
- <input class="form-control" id="inputEmail3" placeholder="Email" type="email">
- -->
{{ field }}
</div>
diff --git a/smash/web/templates/subjects/index.html b/smash/web/templates/subjects/index.html
index d4b608d8..fc634674 100644
--- a/smash/web/templates/subjects/index.html
+++ b/smash/web/templates/subjects/index.html
@@ -11,17 +11,19 @@
{% block page_header %}Subjects{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
+{% block title %}{{ block.super }} - Subjects{% endblock %}
+
{% block breadcrumb %}
- <li><a href="#"><i class="fa fa-dashboard"></i> Dashboard</a></li>
- <li class="active">Subjects</li>
+{% include "subjects/breadcrumb.html" %}
{% endblock breadcrumb %}
{% block maincontent %}
<div>
- <a href="{% url 'web.views.subjectadd' %}" class="btn btn-app">
+ <a href="{% url 'web.views.subjectadd' %}" class="btn btn-app">
<i class="fa fa-plus"></i>
- Add new subject</a>
+ Add new subject
+ </a>
</div>
<div class="box-body">
--
GitLab