From c2b81735ac50a2abaaf99cc58ce4ac3f0c70efdf Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda.001@student.uni.lu>
Date: Thu, 26 Jan 2017 13:59:15 +0100
Subject: [PATCH] Made edit boxes look more bootstrapy
---
smash/web/templates/doctors/add.html | 37 +++++++++++----------
smash/web/templates/doctors/details.html | 37 +++++++++++----------
smash/web/templates/doctors/edit.html | 37 +++++++++++----------
smash/web/templates/subjects/add.html | 37 +++++++++++----------
smash/web/templates/subjects/details.html | 40 +++++++++++------------
smash/web/templates/subjects/edit.html | 37 +++++++++++----------
smash/web/views.py | 3 --
7 files changed, 120 insertions(+), 108 deletions(-)
diff --git a/smash/web/templates/doctors/add.html b/smash/web/templates/doctors/add.html
index ae0fe52b..7dbda725 100644
--- a/smash/web/templates/doctors/add.html
+++ b/smash/web/templates/doctors/add.html
@@ -1,5 +1,6 @@
{% extends "_base.html" %}
{% load static %}
+{% load filters %}
{% block styles %}
{{ block.super }}
@@ -33,23 +34,25 @@
{% csrf_token %}
<div class="box-body">
- {% for field in form %}
- <div class="form-group">
- <label for="{# TODO #}" 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 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">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-10">
+ {{ field|add_class:'form-control disabled' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block">
+ {{ field.errors }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div>
</div><!-- /.box-body -->
<div class="box-footer">
diff --git a/smash/web/templates/doctors/details.html b/smash/web/templates/doctors/details.html
index b6c7ba95..2441c3f1 100644
--- a/smash/web/templates/doctors/details.html
+++ b/smash/web/templates/doctors/details.html
@@ -1,5 +1,6 @@
{% extends "_base.html" %}
{% load static %}
+{% load filters %}
{% block styles %}
{{ block.super }}
@@ -33,23 +34,25 @@
{% csrf_token %}
<div class="box-body">
- {% for field in form %}
- <div class="form-group">
- <label for="{# TODO #}" 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 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">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-10">
+ {{ field|add_class:'form-control' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block">
+ {{ field.errors }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div>
</div><!-- /.box-body -->
<div class="box-footer">
diff --git a/smash/web/templates/doctors/edit.html b/smash/web/templates/doctors/edit.html
index 02cd4fc0..69c9bd0c 100644
--- a/smash/web/templates/doctors/edit.html
+++ b/smash/web/templates/doctors/edit.html
@@ -1,5 +1,6 @@
{% extends "_base.html" %}
{% load static %}
+{% load filters %}
{% block styles %}
{{ block.super }}
@@ -33,23 +34,25 @@
{% csrf_token %}
<div class="box-body">
- {% for field in form %}
- <div class="form-group">
- <label for="{# TODO #}" 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 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">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-10">
+ {{ field|add_class:'form-control' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block">
+ {{ field.errors }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div>
</div><!-- /.box-body -->
<div class="box-footer">
diff --git a/smash/web/templates/subjects/add.html b/smash/web/templates/subjects/add.html
index 6936737a..bce72c6d 100644
--- a/smash/web/templates/subjects/add.html
+++ b/smash/web/templates/subjects/add.html
@@ -1,5 +1,6 @@
{% extends "_base.html" %}
{% load static %}
+{% load filters %}
{% block styles %}
{{ block.super }}
@@ -33,23 +34,25 @@
{% 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">
- {{ field }}
- </div>
-
- {% if field.help_text %}
- <span class="help-block">
- {{ field.help_text }}
- </span>
- {% endif %}
- </div>
- {% endfor %}
+ <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">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-10">
+ {{ field|add_class:'form-control' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block">
+ {{ field.errors }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div>
</div><!-- /.box-body -->
<div class="box-footer">
diff --git a/smash/web/templates/subjects/details.html b/smash/web/templates/subjects/details.html
index 11df9435..220bfb19 100644
--- a/smash/web/templates/subjects/details.html
+++ b/smash/web/templates/subjects/details.html
@@ -1,5 +1,6 @@
{% extends "_base.html" %}
{% load static %}
+{% load filters %}
{% block styles %}
{{ block.super }}
@@ -31,26 +32,25 @@
<form class="form-horizontal">
<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 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">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-10">
+ {{ field|add_class:'form-control' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block">
+ {{ field.errors }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div>
</div><!-- /.box-body -->
<div class="box-footer">
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index 13556f9f..a7007538 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -1,5 +1,6 @@
{% extends "_base.html" %}
{% load static %}
+{% load filters %}
{% block styles %}
{{ block.super }}
@@ -33,23 +34,25 @@
{% 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">
- {{ field }}
- </div>
-
- {% if field.help_text %}
- <span class="help-block">
- {{ field.help_text }}
- </span>
- {% endif %}
- </div>
- {% endfor %}
+ <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">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-10">
+ {{ field|add_class:'form-control' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block">
+ {{ field.errors }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
+ </div>
</div><!-- /.box-body -->
<div class="box-footer">
diff --git a/smash/web/views.py b/smash/web/views.py
index 1f8dfb6b..d1083e8e 100644
--- a/smash/web/views.py
+++ b/smash/web/views.py
@@ -36,9 +36,6 @@ def login(request):
Saturates response with information about logged user
"""
def wrap_response(request, template, params):
- print request
- print request.user
-
person, role = Worker.get_details(request.user)
final_params = params.copy()
--
GitLab