3 files changed, 48 insertions, 76 deletions
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/content.php b/mod/bookmarks/views/default/widgets/bookmarks/content.php
new file mode 100644
index 000000000..0b85017fc
--- /dev/null
+++ b/mod/bookmarks/views/default/widgets/bookmarks/content.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Elgg bookmarks widget
+ *
+ * @package Bookmarks
+ */
+
+$max = (int) $vars['entity']->num_display;
+
+$options = array(
+	'type' => 'object',
+	'subtype' => 'bookmarks',
+	'container_guid' => $vars['entity']->owner_guid,
+	'limit' => $max,
+	'full_view' => FALSE,
+	'pagination' => FALSE,
+);
+$content = elgg_list_entities($options);
+
+echo $content;
+
+if ($content) {
+	$url = "bookmarks/owner/" . elgg_get_page_owner_entity()->username;
+	$more_link = elgg_view('output/url', array(
+		'href' => $url,
+		'text' => elgg_echo('bookmarks:more'),
+		'is_trusted' => true,
+	));
+	echo "<span class=\"elgg-widget-more\">$more_link</span>";
+} else {
+	echo elgg_echo('bookmarks:none');
+}
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/edit.php b/mod/bookmarks/views/default/widgets/bookmarks/edit.php
index 2098b200b..ed9c7fd88 100644
--- a/mod/bookmarks/views/default/widgets/bookmarks/edit.php
+++ b/mod/bookmarks/views/default/widgets/bookmarks/edit.php
@@ -1,28 +1,24 @@
 <?php
 /**
  * Elgg bookmark widget edit view
- * 
- * @package ElggBookmarks
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
+ *
+ * @package Bookmarks
  */
 
-?>
-<p>
-	<?php echo elgg_echo('bookmarks:numbertodisplay'); ?>:
-	<select name="params[num_display]">
-<?php
+// set default value
+if (!isset($vars['entity']->num_display)) {
+	$vars['entity']->num_display = 4;
+}
 
-for ($i=1; $i<=10; $i++) {
-	$selected = '';
-	if ($vars['entity']->num_display == $i) {
-		$selected = "selected='selected'";
-	}
+$params = array(
+	'name' => 'params[num_display]',
+	'value' => $vars['entity']->num_display,
+	'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
+);
+$dropdown = elgg_view('input/dropdown', $params);
 
-	echo "	<option value='{$i}' $selected >{$i}</option>\n";
-}
 ?>
-	</select>
-</p>
-\ No newline at end of file
+<div>
+	<?php echo elgg_echo('bookmarks:numbertodisplay'); ?>:
+	<?php echo $dropdown; ?>
+</div>
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/view.php b/mod/bookmarks/views/default/widgets/bookmarks/view.php
deleted file mode 100644
index 4240b95f0..000000000
--- a/mod/bookmarks/views/default/widgets/bookmarks/view.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-/**
- * Elgg bookmark widget view
- * 
- * @package ElggBookmarks
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider <info@elgg.com>
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
-//get the num of shares the user want to display
-$num = $vars['entity']->num_display;
-		
-//if no number has been set, default to 4
-if(!$num)
-	$num = 4;
-			
-//grab the users bookmarked items
-$bookmarks = elgg_get_entities('object', 'bookmarks',$vars['entity']->owner_guid, "", $num, 0, false);
-		
-if($bookmarks){
-
-	foreach($bookmarks as $b){
-			
-		//get the owner
-		$owner = $b->getOwnerEntity();
-
-		//get the time
-		$friendlytime = friendly_time($b->time_created);
-
-		//get the bookmark title
-		$info = "<div class='river_object_bookmarks_create'><p class=\"shares_title\"><a href=\"{$b->address}\">{$b->title}</a></p></div>";
-				
-		//get the user details
-		$info .= "<p class=\"shares_timestamp\"><small>{$friendlytime} ";
-
-		//get the bookmark description
-		if($s->description)
-			$info .= "<a href=\"javascript:void(0);\" class=\"share_more_info\">".elgg_echo('bookmarks:more')."</a></small></p><div class=\"share_desc\"><p>{$s->description}</p></div>";
-		else 
-			$info .= "</small></p>";
-	
-		//display 
-		echo "<div class='ContentWrapper bookmarks'>";
-		echo "<div class='shares_widget_content'>" . $info . "</div></div>";
-
-	} 
-
-	$user_inbox = $vars['url'] . "pg/bookmarks/" . page_owner_entity()->username;
-	if (get_entities('object', 'bookmarks', $vars['entity']->container_guid, '', '', '', true) > $num)      
-		echo "<div class='ContentWrapper bookmarks more'><a href=\"{$user_inbox}\">".elgg_echo('bookmarks:read')."</a></div>";
-
-} else {
-	echo "<div class='ContentWrapper'>" . elgg_echo("bookmarks:widget:description") . "</div>";
-}
-\ No newline at end of file