From 3bf72994688ad9292bf37444d80ab5ab1a002748 Mon Sep 17 00:00:00 2001 From: Paweł Sroka Date: Sun, 4 Nov 2012 08:25:28 +0100 Subject: Fixes #1479 - Replaces WP autop with implementation from Steve Clay. --- mod/groups/views/rss/object/groupforumtopic.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/groups') diff --git a/mod/groups/views/rss/object/groupforumtopic.php b/mod/groups/views/rss/object/groupforumtopic.php index d730ef796..b2d05d488 100644 --- a/mod/groups/views/rss/object/groupforumtopic.php +++ b/mod/groups/views/rss/object/groupforumtopic.php @@ -14,7 +14,7 @@ if (empty($title)) { $permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8'); $pubdate = date('r', $vars['entity']->getTimeCreated()); -$description = autop($vars['entity']->description); +$description = elgg_autop($vars['entity']->description); $creator = elgg_view('page/components/creator', $vars); $georss = elgg_view('page/components/georss', $vars); -- cgit v1.2.3 From 5fdacb4b36d351998d96693d3d35218ee91a70ff Mon Sep 17 00:00:00 2001 From: Sem Date: Thu, 13 Dec 2012 03:34:47 +0100 Subject: Checking if we have an owner before using it. --- mod/groups/views/default/groups/profile/summary.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mod/groups') diff --git a/mod/groups/views/default/groups/profile/summary.php b/mod/groups/views/default/groups/profile/summary.php index 54abcb1e5..6eca9745e 100644 --- a/mod/groups/views/default/groups/profile/summary.php +++ b/mod/groups/views/default/groups/profile/summary.php @@ -15,6 +15,10 @@ if (!isset($vars['entity']) || !$vars['entity']) { $group = $vars['entity']; $owner = $group->getOwnerEntity(); +if (!$owner) { + return true; +} + ?>
-- cgit v1.2.3 From 9e5941882ea30511b9be7887da2b555399395f14 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Wed, 19 Dec 2012 15:39:04 -0500 Subject: Fixes #4633. Added the invitation count for group invitations page menu item. --- mod/groups/languages/en.php | 3 ++- mod/groups/start.php | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) (limited to 'mod/groups') diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php index 0d57f1680..a9743f9d4 100644 --- a/mod/groups/languages/en.php +++ b/mod/groups/languages/en.php @@ -21,6 +21,7 @@ $english = array( 'groups:delete' => 'Delete group', 'groups:membershiprequests' => 'Manage join requests', 'groups:invitations' => 'Group invitations', + 'groups:invitations:pending' => 'Group invitations (%s)', 'groups:icon' => 'Group icon (leave blank to leave unchanged)', 'groups:name' => 'Group name', @@ -211,7 +212,7 @@ View and reply to the discussion: 'groups:updated' => "Last reply by %s %s", 'groups:started' => "Started by %s", 'groups:joinrequest:remove:check' => 'Are you sure you want to remove this join request?', - 'groups:invite:remove:check' => 'Are you sure you want to remove this invite?', + 'groups:invite:remove:check' => 'Are you sure you want to remove this invitation?', 'groups:invite:body' => "Hi %s, %s invited you to join the '%s' group. Click below to view your invitations: diff --git a/mod/groups/start.php b/mod/groups/start.php index 9dca7dc16..25ce56350 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -163,11 +163,21 @@ function groups_setup_sidebar_menus() { $url = "groups/owner/$user->username"; $item = new ElggMenuItem('groups:owned', elgg_echo('groups:owned'), $url); elgg_register_menu_item('page', $item); + $url = "groups/member/$user->username"; $item = new ElggMenuItem('groups:member', elgg_echo('groups:yours'), $url); elgg_register_menu_item('page', $item); + $url = "groups/invitations/$user->username"; - $item = new ElggMenuItem('groups:user:invites', elgg_echo('groups:invitations'), $url); + $invitations = groups_get_invited_groups($user->getGUID()); + if (is_array($invitations) && !empty($invitations)) { + $invitation_count = count($invitations); + $text = elgg_echo('groups:invitations:pending', array($invitation_count)); + } else { + $text = elgg_echo('groups:invitations'); + } + + $item = new ElggMenuItem('groups:user:invites', $text, $url); elgg_register_menu_item('page', $item); } } -- cgit v1.2.3 From bccc976f079590f0c989484a0a6237dc4a1b8615 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Wed, 19 Dec 2012 15:56:57 -0500 Subject: Refs #4633. Added join request count to page menu item. --- mod/groups/languages/en.php | 1 + mod/groups/start.php | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'mod/groups') diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php index a9743f9d4..a817210c6 100644 --- a/mod/groups/languages/en.php +++ b/mod/groups/languages/en.php @@ -20,6 +20,7 @@ $english = array( 'groups:edit' => "Edit group", 'groups:delete' => 'Delete group', 'groups:membershiprequests' => 'Manage join requests', + 'groups:membershiprequests:pending' => 'Manage join requests (%s)', 'groups:invitations' => 'Group invitations', 'groups:invitations:pending' => 'Group invitations (%s)', diff --git a/mod/groups/start.php b/mod/groups/start.php index 25ce56350..4e49d9e55 100644 --- a/mod/groups/start.php +++ b/mod/groups/start.php @@ -144,9 +144,24 @@ function groups_setup_sidebar_menus() { if (elgg_in_context('group_profile')) { if (elgg_is_logged_in() && $page_owner->canEdit() && !$page_owner->isPublicMembership()) { $url = elgg_get_site_url() . "groups/requests/{$page_owner->getGUID()}"; + + $count = elgg_get_entities_from_relationship(array( + 'type' => 'user', + 'relationship' => 'membership_request', + 'relationship_guid' => $guid, + 'inverse_relationship' => true, + 'count' => true, + )); + + if ($count) { + $text = elgg_echo('groups:membershiprequests:pending', array($count)); + } else { + $text = elgg_echo('groups:membershiprequests'); + } + elgg_register_menu_item('page', array( 'name' => 'membership_requests', - 'text' => elgg_echo('groups:membershiprequests'), + 'text' => $text, 'href' => $url, )); } -- cgit v1.2.3 From 757202e4cb2255f08040611189445aadfc8dbe42 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Thu, 27 Dec 2012 15:36:18 -0500 Subject: Fixes #1747. Added "My status" sidebar menu for groups. --- mod/groups/languages/en.php | 6 +++ mod/groups/lib/groups.php | 27 ++++++++-- mod/groups/views/default/groups/css.php | 21 ++++++++ .../views/default/groups/sidebar/my_status.php | 62 ++++++++++++++++++++++ 4 files changed, 112 insertions(+), 4 deletions(-) create mode 100644 mod/groups/views/default/groups/sidebar/my_status.php (limited to 'mod/groups') diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php index a817210c6..9e0799b3a 100644 --- a/mod/groups/languages/en.php +++ b/mod/groups/languages/en.php @@ -32,6 +32,12 @@ $english = array( 'groups:interests' => 'Tags', 'groups:website' => 'Website', 'groups:members' => 'Group members', + 'groups:my_status' => 'My status', + 'groups:my_status:group_owner' => 'You own this group', + 'groups:my_status:group_member' => 'You are in this group', + 'groups:subscribed' => 'Group notifications on', + 'groups:unsubscribed' => 'Group notifications off', + 'groups:members:title' => 'Members of %s', 'groups:members:more' => "View all members", 'groups:membership' => "Group membership permissions", diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php index 505cacd01..ea7308d39 100644 --- a/mod/groups/lib/groups.php +++ b/mod/groups/lib/groups.php @@ -264,14 +264,33 @@ function groups_handle_profile_page($guid) { groups_register_profile_buttons($group); $content = elgg_view('groups/profile/layout', array('entity' => $group)); - if (group_gatekeeper(false)) { - $sidebar = ''; + $sidebar = ''; + + if (group_gatekeeper(false)) { if (elgg_is_active_plugin('search')) { $sidebar .= elgg_view('groups/sidebar/search', array('entity' => $group)); } $sidebar .= elgg_view('groups/sidebar/members', array('entity' => $group)); - } else { - $sidebar = ''; + + $subscribed = false; + if (elgg_is_active_plugin('notifications')) { + global $NOTIFICATION_HANDLERS; + + foreach ($NOTIFICATION_HANDLERS as $method => $foo) { + $relationship = check_entity_relationship(elgg_get_logged_in_user_guid(), + 'notify' . $method, $guid); + + if ($relationship) { + $subscribed = true; + break; + } + } + } + + $sidebar .= elgg_view('groups/sidebar/my_status', array( + 'entity' => $group, + 'subscribed' => $subscribed + )); } $params = array( diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php index 9c65d1602..20cd947f8 100644 --- a/mod/groups/views/default/groups/css.php +++ b/mod/groups/views/default/groups/css.php @@ -54,3 +54,24 @@ .groups-latest-reply { float: right; } + +.elgg-menu-groups-my-status li a { + display: block; + + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + + background-color: white; + margin: 3px 0 5px 0; + padding: 2px 4px 2px 8px; +} +.elgg-menu-groups-my-status li a:hover { + background-color: #0054A7; + color: white; + text-decoration: none; +} +.elgg-menu-groups-my-status li.elgg-state-selected > a { + background-color: #4690D6; + color: white; +} \ No newline at end of file diff --git a/mod/groups/views/default/groups/sidebar/my_status.php b/mod/groups/views/default/groups/sidebar/my_status.php new file mode 100644 index 000000000..4c36c0213 --- /dev/null +++ b/mod/groups/views/default/groups/sidebar/my_status.php @@ -0,0 +1,62 @@ +isMember($user); +$is_owner = $group->getOwnerEntity() == $user; + +if ($is_owner) { + elgg_register_menu_item('groups:my_status', array( + 'name' => 'membership_status', + 'text' => '' . elgg_echo('groups:my_status:group_owner') . '', + 'href' => false + )); +} elseif ($is_member) { + elgg_register_menu_item('groups:my_status', array( + 'name' => 'membership_status', + 'text' => '' . elgg_echo('groups:my_status:group_member') . '', + 'href' => false + )); +} else { + elgg_register_menu_item('groups:my_status', array( + 'name' => 'membership_status', + 'text' => elgg_echo('groups:join'), + 'href' => "/action/groups/join?group_guid={$group->getGUID()}", + 'is_action' => true + )); +} + +// notification info +if (elgg_is_active_plugin('notifications')) { + if ($subscribed) { + elgg_register_menu_item('groups:my_status', array( + 'name' => 'subscription_status', + 'text' => elgg_echo('groups:subscribed'), + 'href' => "notifications/group/$user->username", + 'is_action' => true + )); + } else { + elgg_register_menu_item('groups:my_status', array( + 'name' => 'subscription_status', + 'text' => elgg_echo('groups:unsubscribed'), + 'href' => "notifications/group/$user->username" + )); + } +} + +$body = elgg_view_menu('groups:my_status'); +echo elgg_view_module('aside', elgg_echo('groups:my_status'), $body); -- cgit v1.2.3 From b800d4721c8dccb5bd0ad6a0d793219d27cf25bd Mon Sep 17 00:00:00 2001 From: Per Jensen Date: Sat, 22 Dec 2012 09:35:47 +0100 Subject: Prevent distortion of group icon --- mod/groups/views/default/groups/css.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mod/groups') diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php index 20cd947f8..f475f7d9e 100644 --- a/mod/groups/views/default/groups/css.php +++ b/mod/groups/views/default/groups/css.php @@ -9,7 +9,10 @@ .groups-profile > .elgg-image { margin-right: 10px; } - +.groups-profile img { + width: 100%; + height: auto; +} .groups-stats { background: #eeeeee; padding: 5px; @@ -74,4 +77,4 @@ .elgg-menu-groups-my-status li.elgg-state-selected > a { background-color: #4690D6; color: white; -} \ No newline at end of file +} -- cgit v1.2.3 From 87995e28bab9a291db54da3faca90e2336066cbe Mon Sep 17 00:00:00 2001 From: cash Date: Tue, 22 Jan 2013 14:31:22 -0500 Subject: addresses pull request 472 - group not having an owner is a serious problem - try exception approach - maybe we need a mechanism for displaying an error page besides exceptions --- mod/groups/views/default/groups/profile/summary.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mod/groups') diff --git a/mod/groups/views/default/groups/profile/summary.php b/mod/groups/views/default/groups/profile/summary.php index 6eca9745e..261a746d1 100644 --- a/mod/groups/views/default/groups/profile/summary.php +++ b/mod/groups/views/default/groups/profile/summary.php @@ -15,8 +15,10 @@ if (!isset($vars['entity']) || !$vars['entity']) { $group = $vars['entity']; $owner = $group->getOwnerEntity(); -if (!$owner) { - return true; +if ($owner) { + // not having an owner is very bad so we throw an exception + $msg = elgg_echo('InvalidParameterException:IdNotExistForGUID', array('group owner', $group->guid)); + throw new InvalidParameterException($msg); } ?> -- cgit v1.2.3 From e60f092f80d247fbdc3089689bbf5ddb229762db Mon Sep 17 00:00:00 2001 From: cash Date: Tue, 22 Jan 2013 14:36:27 -0500 Subject: forgot to change the condition back after testing from previous commit --- mod/groups/views/default/groups/profile/summary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/groups') diff --git a/mod/groups/views/default/groups/profile/summary.php b/mod/groups/views/default/groups/profile/summary.php index 261a746d1..f1221f19a 100644 --- a/mod/groups/views/default/groups/profile/summary.php +++ b/mod/groups/views/default/groups/profile/summary.php @@ -15,7 +15,7 @@ if (!isset($vars['entity']) || !$vars['entity']) { $group = $vars['entity']; $owner = $group->getOwnerEntity(); -if ($owner) { +if (!$owner) { // not having an owner is very bad so we throw an exception $msg = elgg_echo('InvalidParameterException:IdNotExistForGUID', array('group owner', $group->guid)); throw new InvalidParameterException($msg); -- cgit v1.2.3 From 3c65e1e606395a0d22b909719fe66d494c31c762 Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 25 Jan 2013 16:00:43 -0500 Subject: Fixes #5005 correct pagination for my groups --- mod/groups/lib/groups.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/groups') diff --git a/mod/groups/lib/groups.php b/mod/groups/lib/groups.php index ea7308d39..d8d0f568d 100644 --- a/mod/groups/lib/groups.php +++ b/mod/groups/lib/groups.php @@ -152,7 +152,7 @@ function groups_handle_mine_page() { elgg_register_title_button(); - $content = elgg_list_entities_from_relationship_count(array( + $content = elgg_list_entities_from_relationship(array( 'type' => 'group', 'relationship' => 'member', 'relationship_guid' => elgg_get_page_owner_guid(), -- cgit v1.2.3 From b9d52537492bc6bd3e5d308c055635cc072612cf Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 26 Jan 2013 14:16:51 -0500 Subject: fixed some formatting issues in CSS files --- mod/groups/views/default/groups/css.php | 4 ++-- views/default/css/elements/layout.php | 2 +- views/default/css/elements/modules.php | 2 +- views/default/css/elements/typography.php | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'mod/groups') diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php index f475f7d9e..6f710ddab 100644 --- a/mod/groups/views/default/groups/css.php +++ b/mod/groups/views/default/groups/css.php @@ -10,8 +10,8 @@ margin-right: 10px; } .groups-profile img { - width: 100%; - height: auto; + width: 100%; + height: auto; } .groups-stats { background: #eeeeee; diff --git a/views/default/css/elements/layout.php b/views/default/css/elements/layout.php index 25a2bffb7..9d92752b4 100644 --- a/views/default/css/elements/layout.php +++ b/views/default/css/elements/layout.php @@ -118,4 +118,4 @@ } .elgg-page-footer a:hover { color: #666; -} \ No newline at end of file +} diff --git a/views/default/css/elements/modules.php b/views/default/css/elements/modules.php index 74092c774..a37ae094b 100644 --- a/views/default/css/elements/modules.php +++ b/views/default/css/elements/modules.php @@ -191,4 +191,4 @@ a.elgg-widget-collapsed:before { .elgg-widget-placeholder { border: 2px dashed #dedede; margin-bottom: 15px; -} \ No newline at end of file +} diff --git a/views/default/css/elements/typography.php b/views/default/css/elements/typography.php index 4c2c3c774..c044cb1cc 100644 --- a/views/default/css/elements/typography.php +++ b/views/default/css/elements/typography.php @@ -157,6 +157,6 @@ h6 { font-size: 0.8em; } padding: 3px 5px; } .elgg-output img { - max-width: 100%; - height: auto; -} \ No newline at end of file + max-width: 100%; + height: auto; +} -- cgit v1.2.3