diff --git a/pombola/core/static/js/functions.js b/pombola/core/static/js/functions.js index a7f65ef30..e702a795a 100644 --- a/pombola/core/static/js/functions.js +++ b/pombola/core/static/js/functions.js @@ -28,6 +28,14 @@ $(function () { } var collapseElement = document.getElementById("truncate-former-section"); collapseElement.classList.toggle("truncate-div"); + if (typeof ga === 'function') { + ga('send', { + hitType: 'event', + eventCategory: 'collapsed-items', + eventAction: showingAllFormerPositions ? 'expand' : 'collapse', + eventLabel: 'former-positions' + }); + } }); // toggle current positions button on /person/person-slug/ const toggleCurrentElement = $('#toggle-current-positions'); @@ -54,6 +62,14 @@ $(function () { } var collapseElement = document.getElementById("truncate-current-section"); collapseElement.classList.toggle("truncate-div"); + if (typeof ga === 'function') { + ga('send', { + hitType: 'event', + eventCategory: 'collapsed-items', + eventAction: showingAllCurrentPositions ? 'expand' : 'collapse', + eventLabel: 'current-positions' + }); + } }); /* diff --git a/pombola/settings/south_africa_base.py b/pombola/settings/south_africa_base.py index da7dfa8f4..7525ca928 100644 --- a/pombola/settings/south_africa_base.py +++ b/pombola/settings/south_africa_base.py @@ -43,21 +43,21 @@ 'sass/south-africa.scss', ), 'output_filename': 'css/south-africa.css', - 'extra_context': default_stylesheet_extra_content, + 'extra_context': default_stylesheet_extra_content, }, 'datatables': { 'source_filenames': ( 'css/libs/datatables-1.10.10.css', ), 'output_filename': 'css/datatables.css', - 'extra_context': default_stylesheet_extra_content, + 'extra_context': default_stylesheet_extra_content, }, 'chosen': { 'source_filenames': { 'css/libs/chosen/chosen.css', }, 'output_filename': 'css/chosen.css', - 'extra_context': default_stylesheet_extra_content, + 'extra_context': default_stylesheet_extra_content, }, } @@ -67,42 +67,42 @@ 'js/tabs.js', ), 'output_filename': 'js/tabs.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, }, 'rep-locator': { 'source_filenames': ( 'js/rep-locator.js', ), 'output_filename': 'js/rep-locator.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, }, 'za-map-drilldown': { 'source_filenames': ( 'js/za-map-drilldown.js', ), 'output_filename': 'js/za-map-drilldown.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, }, 'election-countdown': { 'source_filenames': ( 'js/election_countdown.js', ), 'output_filename': 'js/election_countdown.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, }, 'advanced-search': { 'source_filenames': ( 'js/advanced-search.js', ), 'output_filename': 'js/advanced-search.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, }, 'interests-filter': { - 'source_filenames' : ( + 'source_filenames': ( 'js/interests-filter.js', ), 'output_filename': 'js/interests-filter.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, }, 'attendance-table': { 'source_filenames': ( @@ -110,7 +110,7 @@ 'js/attendance-table.js', ), 'output_filename': 'js/attendance-table.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, }, 'lazy-loaded-images': { 'source_filenames': ( @@ -118,7 +118,7 @@ 'js/lazy-loaded-images.js', ), 'output_filename': 'js/lazy-loaded-images.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, }, 'mp-profiles-live-filter': { 'source_filenames': ( @@ -126,14 +126,14 @@ 'js/mp-profiles-live-filter.js', ), 'output_filename': 'js/mp-profiles-live-filter.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, }, 'person-messages-ajax': { 'source_filenames': ( 'js/person-messages-ajax.js', ), 'output_filename': 'js/person-messages-ajax.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, }, 'writeinpublic': { 'source_filenames': ( @@ -141,15 +141,29 @@ 'js/writeinpublic.js', ), 'output_filename': 'js/writeinpublic.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, }, 'mps-download-tracking': { 'source_filenames': ( 'js/mps-download-tracking.js', ), 'output_filename': 'js/mps-download-tracking.js', - 'extra_context': default_js_extra_content, + 'extra_context': default_js_extra_content, + }, + 'track-profile-analytics': { + 'source_filenames': ( + 'js/track-profile-analytics.js', + ), + 'output_filename': 'js/track-profile-analytics.js', + 'extra_context': default_js_extra_content, }, + 'jquery-inview-min': { + 'source_filenames': ( + 'js/libs/jquery.inview.min.js', + ), + 'output_filename': 'js/jquery-inview-min.js', + 'extra_context': default_js_extra_content, + } } INFO_PAGES_ALLOW_RAW_HTML = True diff --git a/pombola/south_africa/static/js/libs/jquery.inview.min.js b/pombola/south_africa/static/js/libs/jquery.inview.min.js new file mode 100644 index 000000000..cbf1c3086 --- /dev/null +++ b/pombola/south_africa/static/js/libs/jquery.inview.min.js @@ -0,0 +1 @@ +!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){function i(){var b,c,d={height:f.innerHeight,width:f.innerWidth};return d.height||(b=e.compatMode,(b||!a.support.boxModel)&&(c="CSS1Compat"===b?g:e.body,d={height:c.clientHeight,width:c.clientWidth})),d}function j(){return{top:f.pageYOffset||g.scrollTop||e.body.scrollTop,left:f.pageXOffset||g.scrollLeft||e.body.scrollLeft}}function k(){if(b.length){var e=0,f=a.map(b,function(a){var b=a.data.selector,c=a.$element;return b?c.find(b):c});for(c=c||i(),d=d||j();ed.top&&l.topd.left&&l.left +
@@ -370,7 +372,7 @@

Former positions:

-
+
{% if person.has_ever_been_member_of_national_assembly %} {% if latest_meetings_attended %} -
+

Recent meetings attended:

{% for meeting in latest_meetings_attended|slice:":4" %} @@ -560,12 +562,12 @@

Questions asked to ministers:

-
+

Plenary appearances:

-
@@ -586,7 +588,7 @@

Plenary appearances:

-
+

Plenary sessions are forums that have been created for the purpose of public debate and decision-making. This mechanism is used to convey the messages of our MPs within main chambers on important decisions, like how they vote. @@ -617,7 +619,7 @@

Declaration of interests

-
@@ -638,7 +640,7 @@

Declaration of interests

-
+
Annually, MPs are required by parliament to register their financial interests and gifts received in their official capacity. Due to the significant influence of the role that MPs take on, there may be times when their personal or business interests become in conflict with the duty prescribed to them as elected officials representing the public interest. You can see what interests your MPs declared here.