arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-20 06:52:15 +00:00
Code Issues Projects Releases Wiki Activity

Updated organisation templates.

Browse Source 
Render improvements to forms

Fixed organisation url
This commit is contained in:
tomtom5152
2014-11-05 15:57:34 +00:00
parent 815b3989c4
commit 03347b1943
6 changed files with 140 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
RIGS/migrations/0006_auto_20141105_1553.py Normal file
View File

@@ -0,0 +1,18 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('RIGS', '0005_auto_20141104_1619'),
]
operations = [
migrations.RenameField(
model_name='organisation',
old_name='unionAccount',
new_name='union_account',
),
]

2
RIGS/templates/RIGS/organisation_detail.html
View File

@@ -31,7 +31,7 @@
<dd>{{ object.notes|linebreaksbr }}</dd> <dd>{{ object.notes|linebreaksbr }}</dd>
<dt>Union Account</dt> <dt>Union Account</dt>
<dd>{{ object.unionAccount|yesno }}</dd> <dd>{{ object.union_account|yesno|capfirst }}</dd>
</dl> </dl>
</div> </div>
</div> </div>

103
RIGS/templates/RIGS/organisation_form.html
View File

@@ -5,49 +5,74 @@
{% block content %} {% block content %}
<div class="col-sm-offset-1 col-sm-10"> <div class="col-sm-offset-1 col-sm-10">
<h3>Add Person</h3> <h3>{{ object.pk|yesno:"Edit,Add" }} Organisation</h3>
<div class="col-md-6">
<form action="{{ form.action }}" method="post" class="form-horizontal">{% csrf_token %} <form action="{{ form.action }}" method="post" class="form-horizontal">{% csrf_token %}
{% include 'form_errors.html' %} <div class="row">
<div class="form-group"> <div class="col-md-6">
<label for="{{ form.name.id_for_label }}" class="col-sm-2 control-label">{{ form.name.label }}</label> {% include 'form_errors.html' %}
<div class="col-sm-10"> <div class="form-group">
{% render_field form.name class+="form-control" placeholder=form.name.label %} <label for="{{ form.name.id_for_label }}"
class="col-sm-2 control-label">{{ form.name.label }}</label>
<div class="col-sm-10">
{% render_field form.name class+="form-control" placeholder=form.name.label %}
</div>
</div>
<div class="form-group">
<label for="{{ form.phone.id_for_label }}"
class="col-sm-2 control-label">{{ form.phone.label }}</label>
<div class="col-sm-10">
{% render_field form.phone class+="form-control" type="tel" placeholder=form.phone.label %}
</div>
</div>
<div class="form-group">
<label for="{{ form.email.id_for_label }}"
class="col-sm-2 control-label">{{ form.email.label }}</label>
<div class="col-sm-10">
{% render_field form.email class+="form-control" type="email" placeholder=form.email.label %}
</div>
</div>
<div class="form-group">
<label for="{{ form.address.id_for_label }}"
class="col-sm-2 control-label">{{ form.address.label }}</label>
<div class="col-sm-10">
{% render_field form.address class+="form-control" placeholder=form.address.label %}
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="col-sm-6">
<label for="{{ form.phone.id_for_label }}" class="col-sm-2 control-label">{{ form.phone.label }}</label> <div class="form-group">
<div class="col-sm-10"> <label for="{{ form.notes.id_for_label }}"
{% render_field form.phone class+="form-control" type="tel" placeholder=form.phone.label %} class="col-sm-2 control-label">{{ form.notes.label }}</label>
<div class="col-sm-10">
{% render_field form.notes class+="form-control" placeholder=form.notes.label %}
</div>
</div>
<div class="form-group">
<div class="col-sm-10 col-sm-offset-2">
<div class="checkbox">
<label>
{% render_field form.union_account %} {{ form.union_account.label }}
</label>
</div>
</div>
</div> </div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label for="{{ form.email.id_for_label }}" class="col-sm-2 control-label">{{ form.email.label }}</label> <input class="btn btn-primary pull-right" type="submit"/>
<div class="col-sm-10"> </div>
{% render_field form.email class+="form-control" type="email" placeholder=form.email.label %} </form>
</div>
</div>
<div class="form-group">
<label for="{{ form.address.id_for_label }}" class="col-sm-2 control-label">{{ form.address.label }}</label>
<div class="col-sm-10">
{% render_field form.address class+="form-control" placeholder=form.address.label %}
</div>
</div>
<div class="form-group">
<label for="{{ form.notes.id_for_label }}" class="col-sm-2 control-label">{{ form.notes.label }}</label>
<div class="col-sm-10">
{% render_field form.notes class+="form-control" placeholder=form.notes.label %}
</div>
</div>
<div class="form-group">
<input class="btn btn-primary pull-right" type="submit" />
</div>
</form>
</div>
</div> </div>
{% endblock %} {% endblock %}

5
RIGS/templates/RIGS/organisation_list.html
View File

@@ -35,7 +35,6 @@
<td>Email</td> <td>Email</td>
<td>Phone</td> <td>Phone</td>
<td>Notes</td> <td>Notes</td>
l
<td>Union Account</td> <td>Union Account</td>
<td></td> <td></td>
</tr> </tr>
@@ -48,7 +47,7 @@
<td>{{ object.email }}</td> <td>{{ object.email }}</td>
<td>{{ object.phone }}</td> <td>{{ object.phone }}</td>
<td>{{ object.notes|yesno|capfirst }}</td> <td>{{ object.notes|yesno|capfirst }}</td>
<td>{{ object.unionAccount|yesno|capfirst }}</td> <td>{{ object.union_account|yesno|capfirst }}</td>
<td> <td>
<a href="{% url 'organisation_detail' object.pk %}" class="btn btn-default modal-href"> <a href="{% url 'organisation_detail' object.pk %}" class="btn btn-default modal-href">
<span class="glyphicon glyphicon-eye-open"></span> <span class="glyphicon glyphicon-eye-open"></span>
@@ -60,7 +59,7 @@
{% empty %} {% empty %}
<tr> <tr>
<td></td> <td></td>
<td colspan="5">No people stored</td> <td colspan="5">No organisations found</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>

93
RIGS/templates/RIGS/person_form.html
View File

@@ -5,49 +5,64 @@
{% block content %} {% block content %}
<div class="col-sm-offset-1 col-sm-10"> <div class="col-sm-offset-1 col-sm-10">
<h3>Add Person</h3> <h3>{{ object.pk|yesno:"Edit,Add" }} Person</h3>
<div class="col-md-6">
<form action="{{ form.action }}" method="post" class="form-horizontal">{% csrf_token %} <form action="{{ form.action }}" method="post" class="form-horizontal">{% csrf_token %}
{% include 'form_errors.html' %} <div class="row">
<div class="form-group"> <div class="col-md-6">
<label for="{{ form.name.id_for_label }}" class="col-sm-2 control-label">{{ form.name.label }}</label> {% include 'form_errors.html' %}
<div class="col-sm-10"> <div class="form-group">
{% render_field form.name class+="form-control" placeholder=form.name.label %} <label for="{{ form.name.id_for_label }}"
class="col-sm-2 control-label">{{ form.name.label }}</label>
<div class="col-sm-10">
{% render_field form.name class+="form-control" placeholder=form.name.label %}
</div>
</div>
<div class="form-group">
<label for="{{ form.phone.id_for_label }}"
class="col-sm-2 control-label">{{ form.phone.label }}</label>
<div class="col-sm-10">
{% render_field form.phone class+="form-control" type="tel" placeholder=form.phone.label %}
</div>
</div>
<div class="form-group">
<label for="{{ form.email.id_for_label }}"
class="col-sm-2 control-label">{{ form.email.label }}</label>
<div class="col-sm-10">
{% render_field form.email class+="form-control" type="email" placeholder=form.email.label %}
</div>
</div>
<div class="form-group">
<label for="{{ form.address.id_for_label }}"
class="col-sm-2 control-label">{{ form.address.label }}</label>
<div class="col-sm-10">
{% render_field form.address class+="form-control" placeholder=form.address.label %}
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="col-sm-6">
<label for="{{ form.phone.id_for_label }}" class="col-sm-2 control-label">{{ form.phone.label }}</label> <div class="form-group">
<div class="col-sm-10"> <label for="{{ form.notes.id_for_label }}"
{% render_field form.phone class+="form-control" type="tel" placeholder=form.phone.label %} class="col-sm-2 control-label">{{ form.notes.label }}</label>
<div class="col-sm-10">
{% render_field form.notes class+="form-control" placeholder=form.notes.label %}
</div>
</div> </div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label for="{{ form.email.id_for_label }}" class="col-sm-2 control-label">{{ form.email.label }}</label> <input class="btn btn-primary pull-right" type="submit"/>
<div class="col-sm-10"> </div>
{% render_field form.email class+="form-control" type="email" placeholder=form.email.label %} </form>
</div>
</div>
<div class="form-group">
<label for="{{ form.address.id_for_label }}" class="col-sm-2 control-label">{{ form.address.label }}</label>
<div class="col-sm-10">
{% render_field form.address class+="form-control" placeholder=form.address.label %}
</div>
</div>
<div class="form-group">
<label for="{{ form.notes.id_for_label }}" class="col-sm-2 control-label">{{ form.notes.label }}</label>
<div class="col-sm-10">
{% render_field form.notes class+="form-control" placeholder=form.notes.label %}
</div>
</div>
<div class="form-group">
<input class="btn btn-primary pull-right" type="submit" />
</div>
</form>
</div>
</div> </div>
{% endblock %} {% endblock %}

2
RIGS/urls.py
View File

@@ -35,7 +35,7 @@ urlpatterns = patterns('',
url(r'^organisations/(?P<pk>\d+)/$', url(r'^organisations/(?P<pk>\d+)/$',
permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()), permission_required_with_403('RIGS.view_organisation')(views.OrganisationDetail.as_view()),
name='organisation_detail'), name='organisation_detail'),
url(r'^organisation/(?P<pk>\d+)/edit/$', url(r'^organisations/(?P<pk>\d+)/edit/$',
permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()), permission_required_with_403('RIGS.change_organisation')(views.OrganisationUpdate.as_view()),
name='organisation_update'), name='organisation_update'),
) )