Skip to content
Snippets Groups Projects
Commit a6ae9f0e authored by Piotr Matyjaszyk's avatar Piotr Matyjaszyk
Browse files

Family-friendly merge

parents 017581af c2b81735
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 120 additions and 108 deletions
smash/web/templates/doctors/add.html
+ 20
− 17
View file @ a6ae9f0e
{% 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">
......
smash/web/templates/doctors/details.html
+ 20
− 17
View file @ a6ae9f0e
{% 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">
......
smash/web/templates/doctors/edit.html
+ 20
− 17
View file @ a6ae9f0e
{% 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">
......
smash/web/templates/subjects/add.html
+ 20
− 17
View file @ a6ae9f0e
{% 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">
......
smash/web/templates/subjects/details.html
+ 20
− 20
View file @ a6ae9f0e
{% 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">
......
smash/web/templates/subjects/edit.html
+ 20
− 17
View file @ a6ae9f0e
{% 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">
......
smash/web/views.py
+ 0
− 3
View file @ a6ae9f0e
......@@ -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()
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment