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

Activity feed updates

Browse Source
This commit is contained in:
FreneticScribbler
2020-03-15 10:33:08 +00:00
parent b8ea3d3d42
commit 6970c5c490
8 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
RIGS/templates/activity_feed.html
View File

@@ -1,6 +1,8 @@
{% load static %}
{% block js %}
<script src="{% static 'js/tooltip.js' %}"></script>
<script src="{% static 'js/popover.js' %}"></script>
<script>
$(function () {
$('[data-toggle="popover"]').popover().click(function(){
@@ -8,7 +10,7 @@
window.location.href = $(this).attr('href');
}
});
moment().twitter();
//moment().twitter();
})
$(document).ready(function() {
$(function () {
@@ -20,11 +22,11 @@
$('#activity [data-toggle="popover"]').popover();
$('.date').each(function (index, dateElem) {
/*$('.date').each(function (index, dateElem) {
var $dateElem = $(dateElem);
var formatted = moment($dateElem.attr('data-date')).twitterLong();
$dateElem.text(formatted);
});
});*/
});
});

11
RIGS/templates/activity_feed_data.html
View File

@@ -1,15 +1,14 @@
{% extends request.is_ajax|yesno:"base_ajax_nomodal.html,base_rigs.html" %}
{% load static %}
{% load humanize %}
{% load paginator from filters %}
{% load to_class_name from filters %}
{% block content %}
<div class="list-group-item">
<div class="media">
{% for version in object_list %}
{% if not version.withPrevious %}
{% if not forloop.first %}
</div> {#/.media-body#}
@@ -18,7 +17,7 @@
<div class="list-group-item">
<div class="media">
{% endif %}
<div class="media-left">
<div class="align-self-start mr-3">
{% if version.revision.user %}
<a href="{% url 'profile_detail' pk=version.revision.user.pk %}" class="modal-href">
<img class="media-object img-rounded" src="{{ version.revision.user.profile_picture}}" />
@@ -26,10 +25,10 @@
{% endif %}
</div>
<div class="media-body">
<h5>{{ version.revision.user.name }}
<span class="pull-right"><small><span class="date" data-date="{{version.revision.date_created|date:"c"}}"></span></small></span>
<h5>
{{ version.revision.user.name }}
<span class="ml-3"><small>{{version.revision.date_created|naturaltime}}</small></span>
</h5>
{% endif %}
<p>
<small>

8
RIGS/templates/version_changes.html
View File

@@ -1,12 +1,12 @@
{% if version.changes.item_changes or version.changes.field_changes or version.changes.old == None %}
{% for change in version.changes.field_changes %}
<button title="Changes to {{ change.field.verbose_name }}" type="button" class="badge badge-light" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
<a title="Changes to {{ change.field.verbose_name }}" type="button" class="badge badge-light" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
{% include 'version_changes_change.html' %}
{% endspaceless %}'>{{ change.field.verbose_name }}</button>
{% endspaceless %}'>{{ change.field.verbose_name }}</a>
{% endfor %}
{% for itemChange in version.changes.item_changes %}
<button title="Changes to item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'" type="button" class="badge badge-light" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
<a title="Changes to item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'" type="button" class="badge badge-light" data-container="body" data-html="true" data-trigger='hover' data-toggle="popover" data-content='{% spaceless %}
<ul class="list-group">
{% for change in itemChange.field_changes %}
<li class="list-group-item">
@@ -16,7 +16,7 @@
{% endfor %}
</ul>
{% endspaceless %}'>item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'</button>
{% endspaceless %}'>item '{% if itemChange.new %}{{ itemChange.new.name }}{% else %}{{ itemChange.old.name }}{% endif %}'</a>
{% endfor %}
{% else %}
nothing useful