From 199b22e79c6c9f6673fc2c65c28fcc2a2078fab3 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 19 Mar 2011 18:37:25 +0000 Subject: Fixes #3171 added river widget using same name as 1.7 riverdashboard plugin git-svn-id: http://code.elgg.org/elgg/trunk@8774 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/river.php | 2 ++ languages/en.php | 7 ++++ views/default/widgets/river_widget/content.php | 27 ++++++++++++++++ views/default/widgets/river_widget/edit.php | 45 ++++++++++++++++++++++++++ 4 files changed, 81 insertions(+) create mode 100644 views/default/widgets/river_widget/content.php create mode 100644 views/default/widgets/river_widget/edit.php diff --git a/engine/lib/river.php b/engine/lib/river.php index c0100bb81..50663c966 100644 --- a/engine/lib/river.php +++ b/engine/lib/river.php @@ -534,6 +534,8 @@ function elgg_river_init() { elgg_register_page_handler('activity', 'elgg_river_page_handler'); $item = new ElggMenuItem('activity', elgg_echo('activity'), 'activity'); elgg_register_menu_item('site', $item); + + add_widget_type('river_widget', elgg_echo('river:widget:title'), elgg_echo('river:widget:description')); } elgg_register_event_handler('init', 'system', 'elgg_river_init'); diff --git a/languages/en.php b/languages/en.php index 6ccdbaecb..ab4abc00b 100644 --- a/languages/en.php +++ b/languages/en.php @@ -411,6 +411,13 @@ $english = array( 'riveritem:single:user' => 'a user', 'riveritem:plural:user' => 'some users', 'river:ingroup' => 'to the group %s', + 'river:none' => 'No activity', + + 'river:widget:title' => "Activity", + 'river:widget:description' => "Display latest activity", + 'river:widget:type' => "Type of activity", + 'river:widgets:friends' => 'Friends activity', + 'river:widgets:all' => 'All site activity', /** * Notifications diff --git a/views/default/widgets/river_widget/content.php b/views/default/widgets/river_widget/content.php new file mode 100644 index 000000000..427fd92bf --- /dev/null +++ b/views/default/widgets/river_widget/content.php @@ -0,0 +1,27 @@ +num_display; + +$options = array( + 'limit' => $num, + 'pagination' => false, +); + +if (elgg_in_context('profile')) { + $options['subject_guid'] = elgg_get_page_owner_guid(); +} else { + if ($vars['entity']->content_type == 'friends') { + $options['relationship_guid'] = elgg_get_logged_in_user_guid(); + $options['relationship'] = 'friend'; + } +} + +$content = elgg_list_river($options); +if (!$content) { + $content = elgg_echo('river:none'); +} + +echo $content; diff --git a/views/default/widgets/river_widget/edit.php b/views/default/widgets/river_widget/edit.php new file mode 100644 index 000000000..e0351e883 --- /dev/null +++ b/views/default/widgets/river_widget/edit.php @@ -0,0 +1,45 @@ +content_type)) { + $vars['entity']->content_type = 'friends'; + } + $params = array( + 'name' => 'params[content_type]', + 'value' => $vars['entity']->content_type, + 'options_values' => array( + 'friends' => elgg_echo('river:widgets:friends'), + 'all' => elgg_echo('river:widgets:all'), + ), + ); + $type_dropdown = elgg_view('input/dropdown', $params); + ?> +
+ : + +
+ num_display)) { + $vars['entity']->num_display = 8; +} + +$params = array( + 'name' => 'params[num_display]', + 'value' => $vars['entity']->num_display, + 'options' => array(5, 8, 10, 12, 15, 20), +); +$num_dropdown = elgg_view('input/dropdown', $params); + +?> +
+ : + +
-- cgit v1.2.3