diff --git a/src/admin/language/en-GB/en-GB.com_activitystream.ini b/src/admin/language/en-GB/en-GB.com_activitystream.ini index c31b8a3..a746b48 100755 --- a/src/admin/language/en-GB/en-GB.com_activitystream.ini +++ b/src/admin/language/en-GB/en-GB.com_activitystream.ini @@ -17,6 +17,7 @@ COM_ACTIVITYSTREAM_ACTIVITY_TARGET_ID="Target Id" COM_ACTIVITYSTREAM_ACTIVITY_TYPE="Activity Type" COM_ACTIVITYSTREAM_ACTIVITY_TEMPLATE="Template To Use" COM_ACTIVITYSTREAM_ACTIVITY_ACCESS="Access" +COM_ACTIVITYSTREAM_ACTIVITY="Activity" COM_ACTIVITYSTREAM_ACTIVITY_STATE="State" COM_ACTIVITYSTREAM_ACTIVITY_LOCATION="Location" COM_ACTIVITYSTREAM_ACTIVITY_LATITUDE="Latitude" diff --git a/src/admin/models/forms/filter_activities.xml b/src/admin/models/forms/filter_activities.xml index 7d8a4da..0832c9b 100755 --- a/src/admin/models/forms/filter_activities.xml +++ b/src/admin/models/forms/filter_activities.xml @@ -17,8 +17,6 @@ onchange="this.form.submit();" > - - getSortFields(); $listOrder = $this->escape($this->state->get('list.ordering')); $listDirn = $this->escape($this->state->get('list.direction')); + +$document = JFactory::getDocument(); +$document->addScript(JUri::root() . 'media/com_activitystream/scripts/mustache.min.js'); +$document->addScript(JUri::root() . 'media/com_activitystream/scripts/activities.jQuery.js'); + +$languageTag = JFactory::getLanguage()->get('tag', 'en-GB'); + +// Load theme related CSS +if (!empty($this->items)) +{ + foreach ($this->items as $item) + { + $document->addStyleSheet(JUri::root() . 'media/com_jgive/themes/' . $item->default_theme . '/css/theme.css'); + } +} ?>
@@ -33,6 +48,9 @@ + + + @@ -60,7 +78,7 @@ items) && empty($this->items['error'])) : ?> items as $i => $row) : $link = JRoute::_('index.php?option=com_activitystream&task=activity.edit&id=' . $row->id); - ?> + ?> id); ?> @@ -68,6 +86,10 @@ state, $i, 'activities.', true, 'cb'); ?> + +
+
+ type; ?> diff --git a/src/media/scripts/activities.jQuery.js b/src/media/scripts/activities.jQuery.js index a2b92ee..24c8d1f 100755 --- a/src/media/scripts/activities.jQuery.js +++ b/src/media/scripts/activities.jQuery.js @@ -16,6 +16,7 @@ getActivities = function(){ let widgetNumber = 0; + /* To load list of activities*/ techjoomla.jQuery('[tj-activitystream-widget]').each(function(){ widgetNumber++; techjoomla.jQuery(this).attr('id',"tj-activitystream" + widgetNumber); @@ -23,7 +24,38 @@ techjoomla.jQuery(this).attr('start',0); techjoomla.jQuery(this).html(""); - initActivities(this); + var activity = initActivities(this); + }); + + /* To load single activity*/ + jQuery('[tj-activitystream-single-activity-widget]').each(function(){ + let ele = this; + let activityData = techjoomla.jQuery(ele).attr("tj-activitystream-single-activity-data"); + let view = techjoomla.jQuery(ele).attr("tj-activitystream-bs"); + activityData = jQuery.parseJSON(activityData); + let templatePath = Joomla.getOptions('system.paths').root+"/media/"+activityData.client+"/themes/"+activityData.default_theme+"/templates/"+view+"/"+activityData.template; + var html = ""; + + jQuery.ajax({ + method: 'GET', + url: templatePath, + async:false, + success: function(res,stat,xhr) + { + if (!activityData.template) + { + var formatted_text = Mustache.render(activityData.formatted_text, {actor : activityData.actor, object: activityData.object, target: activityData.target}); + activityData.formatted_text = formatted_text; + html = Mustache.render(res, activityData); + } + else + { + html = Mustache.render(res, activityData); + } + } + }).done( function(){ + jQuery(ele).after(html); + }); }); }