From 1505f3f46398ccf04fdd52de16fcc69a43c363bf Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda.001@student.uni.lu>
Date: Thu, 26 Jan 2017 15:35:46 +0100
Subject: [PATCH] Disabled edit boxes in details subpages. Corrected flow
---
smash/web/templates/doctors/add.html | 2 +-
smash/web/templates/doctors/details.html | 36 +++++++++++------------
smash/web/templates/doctors/edit.html | 36 +++++++++++------------
smash/web/templates/subjects/details.html | 36 +++++++++++------------
smash/web/templates/subjects/edit.html | 36 +++++++++++------------
todos.txt | 5 ++--
6 files changed, 71 insertions(+), 80 deletions(-)
diff --git a/smash/web/templates/doctors/add.html b/smash/web/templates/doctors/add.html
index 7dbda725..93c3fb9d 100644
--- a/smash/web/templates/doctors/add.html
+++ b/smash/web/templates/doctors/add.html
@@ -42,7 +42,7 @@
</label>
<div class="col-sm-10">
- {{ field|add_class:'form-control disabled' }}
+ {{ field|add_class:'form-control' }}
</div>
{% if field.errors %}
diff --git a/smash/web/templates/doctors/details.html b/smash/web/templates/doctors/details.html
index 2441c3f1..dfc9a99b 100644
--- a/smash/web/templates/doctors/details.html
+++ b/smash/web/templates/doctors/details.html
@@ -34,25 +34,23 @@
{% csrf_token %}
<div class="box-body">
- <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>
+ {% for field in form %}
+ <div class="col-md-6 form-group {% if field.errors %}has-error{% endif %}">
+ <label for="{# TODO #}" class="col-sm-4 control-label">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-8">
+ {{ field|disable|add_class:'form-control' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block">
+ {{ field.errors }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
</div><!-- /.box-body -->
<div class="box-footer">
diff --git a/smash/web/templates/doctors/edit.html b/smash/web/templates/doctors/edit.html
index 69c9bd0c..31d518df 100644
--- a/smash/web/templates/doctors/edit.html
+++ b/smash/web/templates/doctors/edit.html
@@ -34,25 +34,23 @@
{% csrf_token %}
<div class="box-body">
- <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>
+ {% for field in form %}
+ <div class="col-md-6 form-group {% if field.errors %}has-error{% endif %}">
+ <label for="{# TODO #}" class="col-sm-4 control-label">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-8">
+ {{ field|add_class:'form-control' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block">
+ {{ field.errors }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
</div><!-- /.box-body -->
<div class="box-footer">
diff --git a/smash/web/templates/subjects/details.html b/smash/web/templates/subjects/details.html
index 220bfb19..7f7be5f5 100644
--- a/smash/web/templates/subjects/details.html
+++ b/smash/web/templates/subjects/details.html
@@ -32,25 +32,23 @@
<form class="form-horizontal">
<div class="box-body">
- <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>
+ {% for field in form %}
+ <div class="col-md-6 form-group {% if field.errors %}has-error{% endif %}">
+ <label for="{# TODO #}" class="col-sm-4 control-label">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-8">
+ {{ field|disable|add_class:'form-control' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block">
+ {{ field.errors }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
</div><!-- /.box-body -->
<div class="box-footer">
diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html
index a7007538..387edb65 100644
--- a/smash/web/templates/subjects/edit.html
+++ b/smash/web/templates/subjects/edit.html
@@ -34,25 +34,23 @@
{% csrf_token %}
<div class="box-body">
- <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>
+ {% for field in form %}
+ <div class="col-md-6 form-group {% if field.errors %}has-error{% endif %}">
+ <label for="{# TODO #}" class="col-sm-4 control-label">
+ {{ field.label }}
+ </label>
+
+ <div class="col-sm-8">
+ {{ field|add_class:'form-control' }}
+ </div>
+
+ {% if field.errors %}
+ <span class="help-block">
+ {{ field.errors }}
+ </span>
+ {% endif %}
+ </div>
+ {% endfor %}
</div><!-- /.box-body -->
<div class="box-footer">
diff --git a/todos.txt b/todos.txt
index 40eb2ae7..e7d8c805 100644
--- a/todos.txt
+++ b/todos.txt
@@ -7,9 +7,8 @@
- make some names sound/look more pythonic
** Visual
- - all html forms - make them more "bootstrap'y"
- - make fields in details not editable
+ - None
** Possible improvements
- breadcrumbs - make them stack (multiple template inheritance?)
-- label for's => give them correct html id's (all html forms)
\ No newline at end of file
+- label for's => give them correct html id's (all html forms)
--
GitLab