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

Merge branch 'hotfixes' into web-calendar

Browse Source
This commit is contained in:
David Taylor
2015-06-29 19:40:01 +01:00
parent 6641867803 0b63bbcc5b
commit 2daca351d6
12 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@
$('.date').each(function (index, dateElem) {
var $dateElem = $(dateElem);
var formatted = moment($dateElem.attr('data-date'),"DD/MM/YYYY HH:mm").twitterLong();
var formatted = moment($dateElem.attr('data-date')).twitterLong();
$dateElem.text(formatted);
});

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

@@ -27,7 +27,7 @@
</div>
<div class="media-body">
<h5>{{ version.revision.user.name }}
<span class="pull-right"><small><span class="date" data-date="{{version.revision.date_created}}"></span></small></span>
<span class="pull-right"><small><span class="date" data-date="{{version.revision.date_created|date:"c"}}"></span></small></span>
</h5>
{% endif %}

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

@@ -5,12 +5,10 @@
<div class="row">
{% if not request.is_ajax %}
<div class="col-sm-12">
<div class="col-sm-8">
<h1>
{% if object.is_rig %}N{{ object.pk|stringformat:"05d" }}{% else %}{{ object.pk }}{% endif %}
| {{ object.name }}
| {{ object.name }} {% if event.dry_hire %}<span class="badge">Dry Hire</span>{% endif %}
</h1>
</div>
</div>
<div class="col-sm-12 text-right">
<div class="btn-group btn-page">

2
RIGS/templates/RIGS/event_print_page.xml
View File

@@ -241,7 +241,7 @@
</td>
</tr>
<tr>
<td>24 Hour Emergency Contacts: 07825 065681 or 07825 065678</td>
<td>24 Hour Emergency Contacts: 07825 065681 and 07825 065678</td>
</tr>
</blockTable>
</keepTogether>

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

@@ -38,7 +38,7 @@
<small>at {{ event.venue }}</small>
{% endif %}
{% if event.dry_hire %}
<span class="label label-default">Dry Hire</span>
<span class="badge">Dry Hire</span>
{% endif %}
</h4>
{% if event.is_rig and not event.cancelled %}

21
RIGS/templates/RIGS/version_changes.html
View File

@@ -2,8 +2,25 @@
<button title="Changes to {{ change.field.verbose_name }}" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='
{% if change.new %}<div class="alert alert-success {% if change.long %}overflow-ellipsis{% endif %}">{{change.new|linebreaksbr}}</div>{% endif %}
{% if change.old %}<div class="alert alert-danger {% if change.long %}overflow-ellipsis{% endif %}">{{change.old|linebreaksbr}}</div>{% endif %}
{% if change.new %}
<div class="alert alert-success {% if change.long %}overflow-ellipsis{% endif %}">
{% if change.linebreaks %}
{{change.new|linebreaksbr}}
{% else %}
{{change.new}}
{% endif %}
</div>
{% endif %}
{% if change.old %}
<div class="alert alert-danger {% if change.long %}overflow-ellipsis{% endif %}">
{% if change.linebreaks %}
{{change.old|linebreaksbr}}
{% else %}
{{change.old}}
{% endif %}
</div>
{% endif %}
'>{{ change.field.verbose_name }}</button>