Template improvements

This commit is contained in:
2020-10-07 17:05:51 +01:00
parent cce0ad0f9f
commit 2db2cc6659
3 changed files with 47 additions and 66 deletions

View File

@@ -20,7 +20,7 @@
{% endif %} {% endif %}
{% if object.is_rig and perms.RIGS.view_event %} {% if object.is_rig and perms.RIGS.view_event %}
{# only need contact details for a rig #} {# only need contact details for a rig #}
<div class="col-sm"> <div class="col-md-6">
{% if event.person %} {% if event.person %}
<div class="card card-default mb-3"> <div class="card card-default mb-3">
<div class="card-header">Contact Details</div> <div class="card-header">Contact Details</div>
@@ -67,18 +67,18 @@
{% endif %} {% endif %}
</div> </div>
{% endif %} {% endif %}
<div class="col-sm"> <div class="col-md-6">
{% include 'partials/event_details.html' %} {% include 'partials/event_details.html' %}
</div> </div>
{% if event.is_rig and not event.dry_hire %} {% if event.is_rig and not event.dry_hire %}
<div class="col-sm-12 py-3"> <div class="col-md-4 py-3">
{% include 'partials/hs_details.html' %} {% include 'partials/hs_details.html' %}
<div> </div>
{% endif %} {% endif %}
{% if event.is_rig and event.internal and perms.RIGS.view_event %} {% if event.is_rig and event.internal and perms.RIGS.view_event %}
<div class="col-sm-12 py-3"> <div class="col-md-8 py-3">
{% include 'partials/auth_details.html' %} {% include 'partials/auth_details.html' %}
<div> </div>
{% endif %} {% endif %}
{% if not request.is_ajax and perms.RIGS.view_event %} {% if not request.is_ajax and perms.RIGS.view_event %}
<div class="col-sm-12 text-right"> <div class="col-sm-12 text-right">

View File

@@ -8,8 +8,8 @@
{% endif %} {% endif %}
"> ">
<div class="card-header">Client Authorisation</div> <div class="card-header">Client Authorisation</div>
<div class="card-body"> <div class="card-body row">
<dl class="col-sm-6"> <dl class="col-md-6">
<dt>Authorisation Request</dt> <dt>Authorisation Request</dt>
<dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd> <dd>{{ object.auth_request_to|yesno:"Yes,No" }}</dd>
@@ -22,8 +22,8 @@
<dt>To</dt> <dt>To</dt>
<dd>{{ object.auth_request_to }}</dd> <dd>{{ object.auth_request_to }}</dd>
</dl> </dl>
<dd class="visible-xs">&nbsp;</dd> <dd class="d-block d-sm-none">&nbsp;</dd>
<dl class="col-sm-6"> <dl class="col-md-6">
<dt>Authorised</dt> <dt>Authorised</dt>
<dd>{{ object.authorised|yesno:"Yes,No" }}</dd> <dd>{{ object.authorised|yesno:"Yes,No" }}</dd>

View File

@@ -5,67 +5,48 @@
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-sm-10 col-sm-offset-1"> <div class="col">
{% include 'form_errors.html' %} {% include 'form_errors.html' %}
<h3>Update Profile</h3> <h3>Update Profile {{object.name}}</h3>
<div class="col-sm-6"> <div class="row">
<form action="{{form.action|default:request.path}}" method="post" class="form-horizontal">{% csrf_token %} <div class="col-md-6">
<div class="form-group"> <form action="{{form.action|default:request.path}}" method="post">{% csrf_token %}
<label for="{{form.first_name.id_for_label}}" class="col-sm-4 control-label">{{form.first_name.label}}</label> <div class="form-group">
{% include 'partials/form_field.html' with field=form.first_name %}
</div>
<div class="form-group">
{% include 'partials/form_field.html' with field=form.last_name %}
</div>
<div class="col-sm-8"> <div class="form-group">
{% render_field form.first_name class+="form-control" placeholder=form.first_name.label %} <label for="{{form.email.id_for_label}}" class="control-label">{{form.email.label}}</label>
</div> {% render_field form.email type="email" class+="form-control" placeholder=form.email.label %}
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="{{form.last_name.id_for_label}}" class="col-sm-4 control-label">{{form.last_name.label}}</label> {% include 'partials/form_field.html' with field=form.initials %}
</div>
<div class="col-sm-8"> <div class="form-group">
{% render_field form.last_name class+="form-control" placeholder=form.last_name.label %} <label for="{{form.phone.id_for_label}}" class="control-label">{{form.phone.label}}</label>
</div> {% render_field form.phone type="tel" class+="form-control" placeholder=form.phone.label %}
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="{{form.email.id_for_label}}" class="col-sm-4 control-label">{{form.email.label}}</label> <input class="btn btn-primary float-right" type="submit"/>
</div>
</form>
</div>
<div class="col-sm-8"> <div class="col">
{% render_field form.email type="email" class+="form-control" placeholder=form.email.label %} <a href="https://gravatar.com/">
</div> <img src="{{object.profile_picture}}" class="img-responsive img-rounded" />
</div> <div class="text-center">
Images hosted by Gravatar
<div class="form-group"> </div>
<label for="{{form.initials.id_for_label}}" class="col-sm-4 control-label">{{form.initials.label}}</label> </a>
</div>
<div class="col-sm-8"> </div>
{% render_field form.initials class+="form-control" placeholder=form.initials.label %}
</div>
</div>
<div class="form-group">
<label for="{{form.phone.id_for_label}}" class="col-sm-4 control-label">{{form.phone.label}}</label>
<div class="col-sm-8">
{% render_field form.phone type="tel" class+="form-control" placeholder=form.phone.label %}
</div>
</div>
<div class="form-group">
<input class="btn btn-primary pull-right" type="submit"/>
</div>
</form>
</div>
<div class="col-sm-3 col-sm-offset-2">
<div class="center-block">
<a href="https://gravatar.com/">
<img src="{{object.profile_picture}}" class="img-responsive img-rounded" />
<div class="text-center">
Images hosted by Gravatar
</div>
</a>
</div>
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}