arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-26 01:42:16 +00:00
Code Issues Projects Releases Wiki Activity

Rewrote venue detail UI, and added 3-phase to detail & forms

Browse Source
This commit is contained in:
David Taylor
2015-06-29 02:52:39 +01:00
parent d3f7ab8fbb
commit 2ab27daaab
3 changed files with 85 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
RIGS/templates/RIGS/venue_detail.html
View File

@@ -1,64 +1,96 @@
{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %} {% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
{% load widget_tweaks %} {% load widget_tweaks %}
{% block title %}{{ object.name }}{% endblock %} {% block title %}Venue {{ object.pk|stringformat:"05d" }} | {{ object.name }}{% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col-sm-10 col-sm-offset-1"> {% if not request.is_ajax %}
{% if not request.is_ajax %} <div class="col-sm-12">
<h3>{{ object.name }}<br/> <h1>Venue {{ object.pk|stringformat:"05d" }} | {{ object.name }}</h1>
<span class="small"><a href="{% url 'venue_history' object.pk %}" title="View Revision History"> </div>
Last edited at {{ object.last_edited_at|date:"d/m/Y H:i" }} by {{ object.last_edited_by.name }}
</a></span> <div class="col-sm-12 text-right">
</h3> <div class="btn-group btn-page">
<div class="pull-right"> <a href="{% url 'venue_update' object.pk %}" class="btn btn-default"><span
<a href="{% url 'venue_update' object.pk %}" class="btn btn-primary">Edit <span class="glyphicon glyphicon-pencil"></span> Edit</a>
class="glyphicon glyphicon-pencil"></span></a>
</div> </div>
{% endif %} </div>
<div class=""> {% endif %}
<dl class="dl-horizontal"> <div class="col-sm-12">
<dt>Name</dt> <div class="panel panel-info">
<dd>{{ object.name }}</dd> <div class="panel-heading">Venue Details</div>
<div class="panel-body">
<dl class="dl-horizontal">
<dt>Name</dt>
<dd>{{ object.name }}</dd>
<dt>Phone</dt> <dt>Phone</dt>
<dd><a href="tel:{{ object.phone }}">{{ object.phone }}</a></dd> <dd><a href="tel:{{ object.phone }}">{{ object.phone }}</a></dd>
<dt>Email</dt> <dt>Email</dt>
<dd><a href="mailto:{{ object.email }}">{{ object.email }}</a></dd> <dd><a href="mailto:{{ object.email }}"><span class="overflow-ellipsis">{{ object.email }}</span></a></dd>
<dt>Address</dt> <dt>Address</dt>
<dd>{{ object.address|linebreaksbr }}</dd> <dd>{{ object.address|linebreaksbr }}</dd>
<dt>Notes</dt> <dt>Notes</dt>
<dd>{{ object.notes|linebreaksbr }}</dd> <dd>{{ object.notes|linebreaksbr }}</dd>
</dl>
<dt>Three Phase Available</dt>
<dd>{{ object.three_phase_available|yesno|capfirst }}</dd>
</dl>
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-sm-12"> <div class="col-sm-12">
{% with object.latest_events as events %} <div class="panel panel-default">
{% include 'RIGS/event_table.html' %} <div class="panel-heading">Associated Events</div>
{% endwith %} <div class="panel-body">
{% with object.latest_events as events %}
{% include 'RIGS/event_table.html' %}
{% endwith %}
</div>
</div>
</div> </div>
</div> </div>
{% if not request.is_ajax %}
<div class="row">
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<a href="{% url 'venue_update' object.pk %}" class="btn btn-default"><span
class="glyphicon glyphicon-pencil"></span> Edit</a>
</div>
<div>
<a href="{% url 'venue_history' object.pk %}" title="View Revision History">
Last edited {{ object.last_edited_at }} by {{ object.last_edited_by.name }}
</a>
</div>
</div>
</div>
{% endif %}
{% endblock %} {% endblock %}
{% if request.is_ajax %} {% if request.is_ajax %}
{% block footer %} {% block footer %}
<div class="row"> <div class="row">
<div class="col-sm-10 align-left"> <div class="col-sm-12 text-right">
<a href="{% url 'venue_history' object.pk %}" title="View Revision History"> <div class="btn-group btn-page">
Last edited at {{ object.last_edited_at|date:"d/m/Y H:i" }} by {{ object.last_edited_by.name }} <a href="{% url 'venue_detail' object.pk %}" class="btn btn-default"><span
</a> class="glyphicon glyphicon-eye-open"></span> Open Page</a>
</div> <a href="{% url 'venue_update' object.pk %}" class="btn btn-default"><span
<div class="col-sm-2"> class="glyphicon glyphicon-pencil"></span> Edit</a>
<div class="pull-right"> </div>
<a href="{% url 'venue_update' object.pk %}" class="btn btn-primary">Edit <span <div>
class="glyphicon glyphicon-pencil"></span></a> <a href="{% url 'venue_history' object.pk %}" title="View Revision History">
Last edited {{ object.last_edited_at }} by {{ object.last_edited_by.name }}
</a>
</div> </div>
</div> </div>
</div> </div>

14
RIGS/templates/RIGS/venue_form.html
View File

@@ -58,7 +58,21 @@
{% render_field form.notes class+="form-control" placeholder=form.notes.label %} {% render_field form.notes class+="form-control" placeholder=form.notes.label %}
</div> </div>
</div> </div>
<div class="form-group">
<div class="col-sm-10 col-sm-offset-2">
<div class="checkbox">
<label>
{% render_field form.three_phase_available %} {{ form.three_phase_available.label }}
</label>
</div>
</div>
</div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<input class="btn btn-primary pull-right" type="submit"/> <input class="btn btn-primary pull-right" type="submit"/>

4
RIGS/views.py
View File

@@ -176,7 +176,7 @@ class VenueDetail(generic.DetailView):
class VenueCreate(generic.CreateView): class VenueCreate(generic.CreateView):
model = models.Venue model = models.Venue
fields = ['name','phone','email','address','notes'] fields = ['name','phone','email','address','notes','three_phase_available']
def get_success_url(self): def get_success_url(self):
if self.request.is_ajax(): if self.request.is_ajax():
@@ -193,7 +193,7 @@ class VenueCreate(generic.CreateView):
class VenueUpdate(generic.UpdateView): class VenueUpdate(generic.UpdateView):
model = models.Venue model = models.Venue
fields = ['name','phone','email','address','notes'] fields = ['name','phone','email','address','notes','three_phase_available']
def get_success_url(self): def get_success_url(self):
if self.request.is_ajax(): if self.request.is_ajax():