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

Merge branch 'master' into revision-view

Browse Source
This commit is contained in:
David Taylor
2015-05-21 17:01:59 +01:00
parent a6836f8139 0b787aeb33
commit 77c4a72900
13 changed files with 81 additions and 17613 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
RIGS/templates/RIGS/event_detail.html
View File

@@ -1,13 +1,15 @@
{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
{% block title %}Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}
{% endif %}{% endblock %}
{% block title %}{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %} | {{object.name}}{% endblock %}
{% block content %}
<div class="row">
{% if not request.is_ajax %}
<div class="col-sm-12">
<div class="col-sm-8">
<h1>Event {% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}</h1>
<h1>
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
| {{ object.name }}
</h1>
</div>
</div>
<div class="col-sm-12 text-right">
@@ -53,7 +55,7 @@
<dt>Email</dt>
<dd>
<a href="mailto:{{object.person.email}}" target="_blank">
{{ object.person.email }}
<span class="overflow-ellipsis">{{ object.person.email }}</span>
</a>
</dd>
@@ -93,7 +95,7 @@
{% endif %}
<div class="col-sm-12 {% if event.is_rig %}col-md-6 col-lg-7{% endif %}">
<div class="panel panel-info">
<div class="panel-heading">{{ object.name }}</div>
<div class="panel-heading">Event Info</div>
<div class="panel-body">
<dl class="dl-horizontal">
<dt>Event Venue</dt>

27
RIGS/templates/RIGS/event_form.html
View File

@@ -401,15 +401,16 @@
</div>
</div>
</div>
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span>
</button>
</div>
</div>
</div>
<!-- /.col-sm-12 .col-md-6 -->
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span>
</button>
</div>
</div>
{# Notes and item shit #}
<div class="col-sm-12">
@@ -424,12 +425,12 @@
{% include "RIGS/item_table.html" %}
</div>
</div>
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span>
</button>
</div>
</div>
<div class="col-sm-12 text-right form-hws form-is_rig">
<div class="btn-group btn-page">
<button type="submit" class="btn btn-default" title="Save"><span
class="glyphicon glyphicon-floppy-disk"></span>
</button>
</div>
</div>
</form>

3
RIGS/templates/RIGS/index.html
View File

@@ -13,6 +13,9 @@
{% endif %}
<h3>There are currently {{ rig_count }} rigs coming up.</h3>
<a class="btn btn-default" href="{% url 'rigboard' %}">View Rigboard</a>
<a class="btn btn-default" href="{% url 'event_create' %}">
New Event <span class="glyphicon glyphicon-plus"></span>
</a>
</div>
</div>
<div class="col-sm-6">

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

@@ -11,7 +11,7 @@
<div class="col-sm-4 text-right">
<a href="{% url 'invoice_void' object.pk %}" class="btn btn-default" title="Void Invoice">
<span class="glyphicon glyphicon-text-background"></span>
<span class="glyphicon glyphicon-ban-circle"></span>
</a>
</div>
</div>

4
RIGS/templates/RIGS/profile_detail.html
View File

@@ -34,10 +34,10 @@
<dd>{{object.email}}</dd>
<dt>Last Login</dt>
<dd>{{object.last_login}}</dd>
<dd>{{object.last_login|date:"d/m/Y H:i"}}</dd>
<dt>Date Joined</dt>
<dd>{{object.date_joined}}</dd>
<dd>{{object.date_joined|date:"d/m/Y H:i"}}</dd>
<dt>Initials</dt>
<dd>{{object.initials}}</dd>