aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/bookmarks/languages/en.php2
-rw-r--r--mod/bookmarks/start.php3
-rwxr-xr-xmod/bookmarks/views/default/bookmarks/group_bookmarks.php36
-rw-r--r--mod/groups/views/default/groups/css.php2
4 files changed, 42 insertions, 1 deletions
diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php
index 87d7772ca..2ba00a8dd 100644
--- a/mod/bookmarks/languages/en.php
+++ b/mod/bookmarks/languages/en.php
@@ -12,7 +12,7 @@ $english = array(
'bookmarks:friends' => "Friends' bookmarks",
'bookmarks:all' => "All site bookmarks",
'bookmarks:user' => "%s's bookmarks",
- 'bookmarks:workgroup' => "Work Group bookmarks",
+ 'bookmarks:group' => "Group bookmarks",
'bookmarks:this' => "Bookmark this",
'bookmarks:this:group' => "Bookmark in %s",
'bookmarks:bookmarklet' => "Get bookmarklet",
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 3df44f724..9588f7a8a 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -42,6 +42,9 @@ function bookmarks_init() {
// Add group menu option
add_group_tool_option('bookmarks',elgg_echo('bookmarks:enablebookmarks'),true);
+
+ // Extend Groups profile page
+ elgg_extend_view('groups/tool_latest','bookmarks/group_bookmarks');
}
diff --git a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
new file mode 100755
index 000000000..c99ffe73a
--- /dev/null
+++ b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
@@ -0,0 +1,36 @@
+<?php
+
+//grab the groups bookmarks
+//@todo adjust so it actually grabs the group bookmarks rather than the users
+$bookmarks = get_entities('object', 'bookmarks',$vars['entity']->owner_guid, "", 6, 0, false);
+
+echo "<div class='group_tool_widget'><h3>".elgg_echo('bookmarks:group')."</h3>";
+
+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='shares_widget_content'>" . $info . "</div>";
+ }
+} else {
+ echo "<p class='margin_top'>" . elgg_echo("bookmarks:none") . "</p>";
+}
+echo "</div>"; \ No newline at end of file
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index 3bb551035..502c35f52 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -97,6 +97,7 @@
.group_profile.forum_latest h3 {
border-bottom:1px solid #CCCCCC;
padding-bottom:5px;
+ color:#555555;
}
/* tool content boxes on group profile page */
@@ -117,6 +118,7 @@
.group_tool_widget h3 {
border-bottom:1px solid #CCCCCC;
padding-bottom:5px;
+ color:#555555;
}
/*
.group_profile_column.right {