From 2ac6d8f4d1738d299dab4fc5ac0cd28f7c3c00b5 Mon Sep 17 00:00:00 2001 From: pete Date: Tue, 13 Apr 2010 16:07:52 +0000 Subject: Groups profile page tool widget boxes updated. git-svn-id: http://code.elgg.org/elgg/trunk@5716 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../views/default/bookmarks/group_bookmarks.php | 22 +++++---- mod/file/views/default/file/groupprofile_files.php | 22 ++++----- mod/groups/languages/en.php | 2 +- mod/groups/views/default/forum/topicposts.php | 2 +- mod/groups/views/default/groups/css.php | 57 ++++++++++++---------- mod/groups/views/default/groups/forum_latest.php | 5 +- mod/groups/views/default/groups/profileitems.php | 56 ++++++++++----------- .../views/default/river/item/wrapper.php | 2 +- 8 files changed, 84 insertions(+), 84 deletions(-) diff --git a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php index 2f677fb44..e4cdedeac 100755 --- a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php +++ b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php @@ -4,7 +4,7 @@ $bookmarks = elgg_get_entities(array('type' => 'object', 'subtype' => 'bookmarks', 'container_guids' => $vars['entity']->container_guid, 'limit' => 6)); -echo "

".elgg_echo('bookmarks:group')."

"; +echo "

".elgg_echo('bookmarks:group')."

"; if($bookmarks){ foreach($bookmarks as $b){ @@ -14,21 +14,25 @@ if($bookmarks){ //get the time $friendlytime = friendly_time($b->time_created); + + $info = "
" . elgg_view('profile/icon',array('entity' => $b->getOwnerEntity(), 'size' => 'tiny')) . "
"; - //get the bookmark title - $info = "

address}\">{$b->title}

"; + //get the bookmark entries body + $info .= "

address}\">{$b->title}

"; //get the user details - $info .= "

{$friendlytime} "; + $info .= "

{$friendlytime} "; //get the bookmark description - if($s->description) + // @todo - do we even have a description anymore? or is this the current bookmarks note ? + if($s->description) { $info .= "".elgg_echo('bookmarks:more')."

{$s->description}

"; - else - $info .= "

"; - + } else { + $info .= "

"; + } + $info .= "
"; //display - echo "
" . $info . "
"; + echo "
" . $info . "
"; } } else { echo "

" . elgg_echo("bookmarks:none") . "

"; diff --git a/mod/file/views/default/file/groupprofile_files.php b/mod/file/views/default/file/groupprofile_files.php index 295c99a1e..7902ae91f 100644 --- a/mod/file/views/default/file/groupprofile_files.php +++ b/mod/file/views/default/file/groupprofile_files.php @@ -16,7 +16,7 @@ $(document).ready(function () { }); /* end document ready function */ -
+

num_display; if (!$number) - $number = 10; + $number = 6; //get the group's files $files = elgg_get_entities(array('type' => 'object', 'subtype' => 'file', 'container_guid' => $vars['entity']->guid, - 'limit' => $number, + 'limit' => $number )); //if there are some files, go get them @@ -40,14 +40,14 @@ $(document).ready(function () { foreach($files as $f){ $mime = $f->mimetype; - echo "
"; - echo "
getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "
"; - echo "
"; - echo "

" . $f->title . "

"; - echo "

" . friendly_time($f->time_created) . "

"; + echo "
"; + echo "
getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "
"; + echo "
"; + echo "

" . $f->title . "

"; + echo "

" . friendly_time($f->time_created) . "

"; $description = $f->description; if (!empty($description)) echo "". elgg_echo('more') ."
" . $description . "
"; - echo "
"; + echo "
"; } @@ -55,11 +55,11 @@ $(document).ready(function () { //get a link to the users files $users_file_url = $vars['url'] . "pg/file/" . page_owner_entity()->username; - echo "
" . elgg_echo('file:more') . "
"; + echo "

" . elgg_echo('file:more') . "

"; } else { - echo "
" . elgg_echo("file:none") . "
"; + echo "

" . elgg_echo("file:none") . "

"; } diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php index e681e1294..d3f035f5f 100644 --- a/mod/groups/languages/en.php +++ b/mod/groups/languages/en.php @@ -19,7 +19,7 @@ 'groups:owned' => "Groups I own", 'groups:yours' => "My groups", 'groups:user' => "%s's groups", - 'groups:all' => "All site groups", + 'groups:all' => "All groups", 'groups:new' => "Create a new group", 'groups:edit' => "Edit group", 'groups:delete' => 'Delete group', diff --git a/mod/groups/views/default/forum/topicposts.php b/mod/groups/views/default/forum/topicposts.php index 29ce21358..a6a3f6bf0 100644 --- a/mod/groups/views/default/forum/topicposts.php +++ b/mod/groups/views/default/forum/topicposts.php @@ -32,7 +32,7 @@ 'text' => elgg_echo('delete'), 'confirm' => elgg_echo('deleteconfirm') )).""; - echo "".elgg_echo('edit').""; + echo "".elgg_echo('edit').""; echo "
"; } diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php index 502c35f52..832692ed9 100644 --- a/mod/groups/views/default/groups/css.php +++ b/mod/groups/views/default/groups/css.php @@ -57,7 +57,7 @@ } -/* GROUP PROFILE PAGE (a groups homepage) */ +/* GROUP PROFILE PAGE (individual group homepage) */ .group_profile_column { float:left; margin-top:10px; @@ -91,14 +91,6 @@ padding:2px 4px; margin:0 0 7px; } -.group_profile.forum_latest { - margin-top:20px; -} -.group_profile.forum_latest h3 { - border-bottom:1px solid #CCCCCC; - padding-bottom:5px; - color:#555555; -} /* tool content boxes on group profile page */ #group_tools_latest { @@ -108,7 +100,7 @@ .group_tool_widget { float:left; margin-right:30px; - margin-bottom:20px; + margin-bottom:40px; min-height:200px; width:350px; } @@ -116,31 +108,42 @@ margin-right:0; } .group_tool_widget h3 { - border-bottom:1px solid #CCCCCC; - padding-bottom:5px; - color:#555555; -} -/* -.group_profile_column.right { - float:right; - width:350px; - margin-top:20px; -} -.group_profile_column.left { - width:350px; - float:left; - margin-top:20px; + border-bottom:1px solid #CCCCCC; + background:#e4e4e4; + color:#333333; + padding:5px 5px 3px 5px; + -moz-border-radius-topleft:4px; + -moz-border-radius-topright:4px; + -webkit-border-top-left-radius:4px; + -webkit-border-top-right-radius:4px; } + +/* group activity latest + (hide some items used on the full riverdashboard activity) + @todo provide a separate view for a groups latest activity + - so we can have tiny avatars and not have to manually hide elements */ +.group_tool_widget.activity a.river_comment_form_button, +.group_tool_widget.activity .river_comments_tabs, +.group_tool_widget.activity .river_content_display, +.group_tool_widget.activity .river_comments, +.group_tool_widget.activity .river_link_divider, +.group_tool_widget.activity .river_user_like_button { + display:none; +} +/* override default entity_listing_info width */ +.group_tool_widget .entity_listing_info { + width:315px; +} + /* edit group page */ .delete_group { float: right; margin-top:-44px; } -/* Group forum */ - -/* all browsers - force tinyMCE on edit forum posts to be full-width */ +/* edit forum posts + - force tinyMCE to correct width */ .edit_comment .defaultSkin table.mceLayout { width: 694px !important; } diff --git a/mod/groups/views/default/groups/forum_latest.php b/mod/groups/views/default/groups/forum_latest.php index d00dc4443..142920cc4 100644 --- a/mod/groups/views/default/groups/forum_latest.php +++ b/mod/groups/views/default/groups/forum_latest.php @@ -8,7 +8,7 @@ if($vars['entity']->forum_enable != 'no'){

'object', 'subtypes' => 'groupforumtopic', 'annotation_names' => 'group_topic_post', 'container_guid' => $vars['entity']->guid, 'limit' => 4, 'order_by' => 'maxtime desc')); + $forum = elgg_get_entities_from_annotations(array('types' => 'object', 'subtypes' => 'groupforumtopic', 'annotation_names' => 'group_topic_post', 'container_guid' => $vars['entity']->guid, 'limit' => 6, 'order_by' => 'maxtime desc')); if($forum){ foreach($forum as $f){ @@ -16,11 +16,10 @@ if($vars['entity']->forum_enable != 'no'){ $count_annotations = $f->countAnnotations("group_topic_post"); echo "
"; - echo "
" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny', 'override' => true)) . "
"; + echo "
" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny')) . "
"; echo "

guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "

"; echo "

".elgg_echo('groups:posts').": " . $count_annotations . "

"; echo "
"; - } } else { echo "

".elgg_echo("grouptopic:notcreated")."

"; diff --git a/mod/groups/views/default/groups/profileitems.php b/mod/groups/views/default/groups/profileitems.php index f3805ed70..f7eebf69c 100644 --- a/mod/groups/views/default/groups/profileitems.php +++ b/mod/groups/views/default/groups/profileitems.php @@ -1,37 +1,31 @@ "; - echo elgg_view("groups/forum_latest",array('entity' => $vars['entity'])); - echo "
"; -/* - //right column - echo "
"; - echo elgg_view("groups/right_column",array('entity' => $vars['entity'])); - echo "
"; - - //left column - echo "
"; - echo elgg_view("groups/left_column",array('entity' => $vars['entity'])); - echo "
"; +/** +* Elgg groups - group homepage (profile) - provide an area for tools to extend with their latest content. +* +* @package ElggGroups +* @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 +* @author Curverider +* @copyright Curverider Ltd 2008-2010 +* @link http://elgg.com/ */ - // tools widget area - echo "
"; - echo "

Dummy Placeholder Group Tool Widget

"; //test - echo elgg_view("groups/tool_latest",array('entity' => $vars['entity'])); - echo "

Another Placeholder for testing

"; //test - echo "
"; +// tools widget area +echo "
"; + + // activity latest + echo "
"; + echo elgg_view("groups/activity_latest",array('entity' => $vars['entity'])); + echo "
"; + + // forum latest + echo "
"; + echo elgg_view("groups/forum_latest",array('entity' => $vars['entity'])); + echo "
"; + + // enable tools to extend this area + echo elgg_view("groups/tool_latest",array('entity' => $vars['entity'])); + +echo "
"; ?>