From 16ccf9c11622e35d31b59843cb2dedf9bffbcb11 Mon Sep 17 00:00:00 2001 From: Tom Price Date: Tue, 26 May 2015 00:00:40 +0100 Subject: [PATCH] Move activity loading into the feed file to be more semantic --- RIGS/templates/RIGS/activity_feed.html | 9 ++++++++- RIGS/templates/RIGS/index.html | 11 ----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/RIGS/templates/RIGS/activity_feed.html b/RIGS/templates/RIGS/activity_feed.html index 4a58ce5b..bf055fb9 100644 --- a/RIGS/templates/RIGS/activity_feed.html +++ b/RIGS/templates/RIGS/activity_feed.html @@ -33,9 +33,16 @@ }) + $(document).ready(function() { + $(function () { + $( "#activity" ).load( "{% url 'activity_feed' %}", function() { + $('#activity [data-toggle="popover"]').popover() + }); + }); + }); + {% endblock %} -

Recent Changes

diff --git a/RIGS/templates/RIGS/index.html b/RIGS/templates/RIGS/index.html index b23d7bab..5e7fd3b7 100644 --- a/RIGS/templates/RIGS/index.html +++ b/RIGS/templates/RIGS/index.html @@ -1,17 +1,6 @@ {% extends 'base.html' %} {% block title %}RIGS{% endblock %} -{% block js %} - -{% endblock %} - {% block content %}

Rig Information Gathering System