5 files changed, 46 insertions, 69 deletions

diff --git a/mod/bookmarks/actions/bookmarks/edit.php b/mod/bookmarks/actions/bookmarks/edit.php
deleted file mode 100644
index 87de1c5e2..000000000
--- a/mod/bookmarks/actions/bookmarks/edit.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Elgg bookmarks edit action
- * 
- */
-	
-//set some required variables
-$guid = get_input('guid');
-$title = get_input('title');
-$address = get_input('address');
-$notes = get_input('notes');
-$access = get_input('access');
-$tags = get_input('tags');
-$tagarray = string_to_tag_array($tags);
-
-// Make sure we actually have permission to edit
-$bookmark = get_entity($guid);
-if ($bookmark->getSubtype() == "bookmarks" && $bookmark->canEdit()) {
-	$bookmark->title = $title;
-	$bookmark->description = $notes;
-	$bookmark->address = $address;
-	$bookmark->access_id = $access;
-	$bookmark->tags = $tagarray;
-	if ($bookmark->save()) {
-		system_message(elgg_echo('bookmarks:edit:success'));
-	} else {
-		system_message(elgg_echo('bookmarks:edit:fail'));
-	}
-}else{
-	system_message(elgg_echo('bookmarks:edit:fail'));
-}
-$account = get_entity($bookmark->container_guid);
-forward("pg/bookmarks/" . $account->username);
\ No newline at end of file
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 00a640644..1fd9768a1 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -52,7 +52,7 @@ function bookmarks_init() {
 
 	// Groups
 	add_group_tool_option('bookmarks', elgg_echo('bookmarks:enablebookmarks'), true);
-	elgg_extend_view('groups/tool_latest', 'bookmarks/group_bookmarks');
+	elgg_extend_view('groups/tool_latest', 'bookmarks/group_module');
 }
 
 /**
diff --git a/mod/bookmarks/views/default/bookmarks/group_module.php b/mod/bookmarks/views/default/bookmarks/group_module.php
new file mode 100644
index 000000000..94204d7e8
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/group_module.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * List most recent bookmarks on group profile page
+ *
+ * @package Bookmarks
+ */
+
+$group = elgg_get_page_owner_entity();
+
+if ($group->bookmarks_enable == "no") {
+	return true;
+}
+
+$all_link = elgg_view('output/url', array(
+	'href' => "pg/bookmarks/group/$group->guid/owner",
+	'text' => elgg_echo('link:view:all'),
+));
+
+$header = "<span class=\"group-widget-viewall\">$all_link</span>";
+$header .= '<h3>' . elgg_echo('bookmarks:group') . '</h3>';
+
+elgg_push_context('widgets');
+$options = array(
+	'type' => 'object',
+	'subtype' => 'bookmarks',
+	'container_guid' => elgg_get_page_owner_guid(),
+	'limit' => 6,
+	'full_view' => false,
+	'pagination' => false,
+);
+$content = elgg_list_entities($options);
+elgg_pop_context();
+
+if (!$content) {
+	$content = '<p>' . elgg_echo('bookmarks:none') . '</p>';
+}
+
+$new_link = elgg_view('output/url', array(
+	'href' => "pg/bookmarks/add/$group->guid",
+	'text' => elgg_echo('bookmarks:add'),
+));
+$content .= "<span class='elgg-widget-more'>$new_link</span>";
+
+echo elgg_view_module('info', '', $content, array('header' => $header));
diff --git a/mod/bookmarks/views/default/bookmarks/groupprofile_bookmarks.php b/mod/bookmarks/views/default/bookmarks/groupprofile_bookmarks.php
deleted file mode 100644
index ad8095d11..000000000
--- a/mod/bookmarks/views/default/bookmarks/groupprofile_bookmarks.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * List most recent bookmarks on group profile page
- */
-
-if ($vars['entity']->bookmarks_enable != 'no') {
-?>
-
-<div class="group_widget">
-<h2><?php echo elgg_echo('bookmarks:group'); ?></h2>
-<?php
-	$context = get_context();
-	set_context('search');
-	$content = elgg_list_entities(array('types' => 'object',
-										'subtypes' => 'bookmarks',
-										'container_guid' => $vars['entity']->guid,
-										'limit' => 5,
-										'full_view' => FALSE,
-										'pagination' => FALSE));
-	set_context($context);
-
-    if ($content) {
-		echo $content;
-
-		$more_url = "{$vars['url']}pg/bookmarks/owner/group:{$vars['entity']->guid}/";
-		echo "<div class=\"forum_latest\"><a href=\"$more_url\">" . elgg_echo('bookmarks:more') . "</a></div>";
-	} else {
-		echo "<div class=\"forum_latest\">" . elgg_echo("bookmarks:nogroup") . "</div>";
-	}
-?>
-</div>
-<?php
-}
\ No newline at end of file
diff --git a/mod/bookmarks/views/default/forms/bookmarks/save.php b/mod/bookmarks/views/default/forms/bookmarks/save.php
index 9b15b542f..4930aacdb 100644
--- a/mod/bookmarks/views/default/forms/bookmarks/save.php
+++ b/mod/bookmarks/views/default/forms/bookmarks/save.php
@@ -50,7 +50,7 @@ if ($categories) {
 echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid));
 
 if ($guid) {
-	echo elgg_view('input/hidden', array('name' => 'bookmark_guid', 'value' => $guid));
+	echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $guid));
 }
 
 echo elgg_view('input/submit', array('value' => elgg_echo("save")));