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

More UI stuff, and pagination on activity stream

Browse Source
This commit is contained in:
David Taylor
2015-05-23 04:53:17 +01:00
parent 77139a8821
commit bf33607967
4 changed files with 80 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
RIGS/templates/RIGS/activity_stream.html
View File

@@ -1,5 +1,6 @@
{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %}
{% load static %}
{% load paginator from filters %}
{% block title %}Rigboard Activity Stream{% endblock %}
@@ -40,48 +41,62 @@
{% endblock %}
{% block content %}
{# comment "table view" #}
<div class="col-sm-12">
<div class="row">
<div class="col-sm-12">
<h3>Rigboard Activity Stream</h3>
</div>
<div class="text-right col-sm-12">{% paginator %}</div>
</div>
<div class="table-responsive">
<h2>Rigboard Activity Stream - Table View</h2>
<br>
<table class="table table-striped">
<thead>
<tr>
<td>Date</td>
<td>Event</td>
<td>Version ID</td>
<td>User</td>
<td>Changes</td>
</tr>
</thead>
<tbody>
{% for version in object_list %}
{% if version.item_changes or version.field_changes or version.old == None%}
<tr>
<td>{{ version.revision.date_created|date:"RIGS_DATETIME_FORMAT" }}</td>
<td><a href="{% url 'event_detail' version.new.pk %}">N{{ version.new.pk|stringformat:"05d" }}</a></td>
<td>{{ version.version.pk }}|{{ version.revision.pk }}</td>
<td>{{ version.revision.user.name }}</td>
<td>
{% if version.old == None %}
Event Created
{% else %}
{% include 'RIGS/event_version_changes.html' %}
{% endif %} </td>
</tr>
{% endif %}
{% endfor %}
<table class="table table-striped">
<thead>
<tr>
<td>Date</td>
<td>Event</td>
<td>Version ID</td>
<td>User</td>
<td>Changes</td>
</tr>
</thead>
<tbody>
{% for version in object_list %}
<tr>
<td>{{ version.revision.date_created|date:"RIGS_DATETIME_FORMAT" }}</td>
<td><a href="{% url 'event_detail' version.new.pk %}">N{{ version.new.pk|stringformat:"05d" }}</a></td>
<td>{{ version.version.pk }}|{{ version.revision.pk }}</td>
<td>{{ version.revision.user.name }}</td>
<td>
{% if version.old == None %}
Event Created
{% else %}
{% include 'RIGS/event_version_changes.html' %}
{% endif %} </td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<div class="align-right">{% paginator %}</div>
</div>
</tbody>
</table>
{# endcomment #}
<div>
<br>
<h2>Rigboard Activity Stream - Stream View</h2>
<h2>Rigboard Activity Stream - Scrollable Stream View <br/><small>Possibly to go on homepage</small></h2>
<br>
<div style="
max-height: 500px;
max-width: 300px;
overflow-y:scroll;
border:1px solid black;">
{% for version in object_list %}
{% if version.item_changes or version.field_changes or version.old == None %}
<div class="well">
@@ -97,9 +112,8 @@
</div>
{% endif %}
{% endfor %}
</div>
</div>
{{ thediff }}
{% endblock %}

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

@@ -10,7 +10,7 @@
{% endfor %}
{% for itemChange in version.item_changes %}
<button title="Changes to item '{{ itemChange.new.name }}'" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='
<button title="Changes to item '{{ itemChange.new.name|default:itemChange.old.name }}'" type="button" class="btn btn-default btn-xs" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='
{% for change in itemChange.changes %}
<h4>{{ change.field.verbose_name }}</h4>
@@ -19,5 +19,5 @@
{% endfor %}
'>item '{{ itemChange.new.name }}'</button>
'>item '{{ itemChange.new.name|default:itemChange.old.name }}'</button>
{% endfor %}

8
RIGS/templates/RIGS/event_version_list.html
View File

@@ -8,8 +8,12 @@
<script src="{% static "js/popover.js" %}"></script>
<script>
$(function () {
$('[data-toggle="popover"]').popover()
})
$('[data-toggle="popover"]').popover().click(function(){
if($(this).attr('href')){
window.location.href = $(this).attr('href');
}
});
})
</script>
{% endblock %}