Fixes #50

git-svn-id: https://code.elgg.org/elgg/trunk@1005 36083f99-b078-4883-b0ff-0f9b5a30f544

6 files changed, 40 insertions, 10 deletions

diff --git a/languages/en.php b/languages/en.php
index cb2745df8..e07fa5d48 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -199,12 +199,7 @@
 		 * River

 		 */

 			'river' => "River",

-			'river:widget:noactivity' => 'We could not find any activity.',
-			'river:widget:title' => "%s activity.",
-			'river:widget:description' => "Show your latest activity.",
-			'river:widget:title:friends' => "%s friends activity.",
-			'river:widget:description:friends' => "Show what your friends are up to.",
-	
+			
 			'river:relationship:friend' => 'is now friends with',

 			

 		/**

diff --git a/mod/river/languages/en.php b/mod/river/languages/en.php
index 13de7e8a3..824164541 100644
--- a/mod/river/languages/en.php
+++ b/mod/river/languages/en.php
@@ -8,6 +8,13 @@
 		
 		'river:manifest:description' => "Provide a list of your or your friends recent activity!",
 	
+		'river:widget:noactivity' => 'We could not find any activity.',
+		'river:widget:title' => "%s activity.",
+		'river:widget:description' => "Show your latest activity.",
+		'river:widget:title:friends' => "%s friends activity.",
+		'river:widget:description:friends' => "Show what your friends are up to.",
+	
+		'river:widget:label:displaynum' => "Number of entries to display:",
 	);
 					
 	add_translation("en",$english);
diff --git a/mod/river/views/default/widgets/river_widget/edit.php b/mod/river/views/default/widgets/river_widget/edit.php
index 77d0594b6..9d89c56dd 100644
--- a/mod/river/views/default/widgets/river_widget/edit.php
+++ b/mod/river/views/default/widgets/river_widget/edit.php
@@ -8,4 +8,14 @@
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.com/
 	 */
-?>
\ No newline at end of file
+?>
+<p>
+	<?php echo elgg_echo('river:widget:label:displaynum'); ?>
+	
+	<select name="params[limit]">
+		<option value="5" <?php if ($vars['entity']->limit == 5) echo " selected=\"yes\" "; ?>>5</option>
+		<option value="8" <?php if ((!isset($vars['entity']->limit)) || ($vars['entity']->limit == 8)) echo " selected=\"yes\" "; ?>>8</option>
+		<option value="12" <?php if ($vars['entity']->limit == 12) echo " selected=\"yes\" "; ?>>12</option>
+		<option value="15" <?php if ($vars['entity']->limit == 15) echo " selected=\"yes\" "; ?>>15</option>
+	</select>
+</p>
\ No newline at end of file
diff --git a/mod/river/views/default/widgets/river_widget/view.php b/mod/river/views/default/widgets/river_widget/view.php
index 38507c625..27aeb7806 100644
--- a/mod/river/views/default/widgets/river_widget/view.php
+++ b/mod/river/views/default/widgets/river_widget/view.php
@@ -10,8 +10,12 @@
 	 */
 
 	$owner = page_owner_entity();
+	$limit = 8;
+	
+	if ($vars['entity']->limit)
+		$limit = $vars['entity']->limit;
 ?>
 <h1><?php echo sprintf(elgg_echo('river:widget:title'), $owner->name . "'s") ?></h1>
 <?php
-	echo elgg_view_river($owner->guid);
+	echo elgg_view_river($owner->guid, $limit);
 ?>
\ No newline at end of file
diff --git a/mod/river/views/default/widgets/river_widget_friends/edit.php b/mod/river/views/default/widgets/river_widget_friends/edit.php
index 77d0594b6..9d89c56dd 100644
--- a/mod/river/views/default/widgets/river_widget_friends/edit.php
+++ b/mod/river/views/default/widgets/river_widget_friends/edit.php
@@ -8,4 +8,14 @@
 	 * @copyright Curverider Ltd 2008
 	 * @link http://elgg.com/
 	 */
-?>
\ No newline at end of file
+?>
+<p>
+	<?php echo elgg_echo('river:widget:label:displaynum'); ?>
+	
+	<select name="params[limit]">
+		<option value="5" <?php if ($vars['entity']->limit == 5) echo " selected=\"yes\" "; ?>>5</option>
+		<option value="8" <?php if ((!isset($vars['entity']->limit)) || ($vars['entity']->limit == 8)) echo " selected=\"yes\" "; ?>>8</option>
+		<option value="12" <?php if ($vars['entity']->limit == 12) echo " selected=\"yes\" "; ?>>12</option>
+		<option value="15" <?php if ($vars['entity']->limit == 15) echo " selected=\"yes\" "; ?>>15</option>
+	</select>
+</p>
\ No newline at end of file
diff --git a/mod/river/views/default/widgets/river_widget_friends/view.php b/mod/river/views/default/widgets/river_widget_friends/view.php
index 5b0b3c137..df96fcd76 100644
--- a/mod/river/views/default/widgets/river_widget_friends/view.php
+++ b/mod/river/views/default/widgets/river_widget_friends/view.php
@@ -10,8 +10,12 @@
 	 */
 
 	$owner = page_owner_entity();
+	$limit = 8;
+	
+	if ($vars['entity']->limit)
+		$limit = $vars['entity']->limit;
 ?>
 <h1><?php echo sprintf(elgg_echo('river:widget:title:friends'), $owner->name . "'s") ?></h1>
 <?php
-	echo elgg_view_friend_river($owner->guid);
+	echo elgg_view_friend_river($owner->guid, $limit);
 ?>
\ No newline at end of file