From 89cb69c643fc244bad8836a044cf47a719afb6e9 Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 5 Mar 2011 22:04:54 +0000 Subject: cleaned up the group invitations and membership request pages git-svn-id: http://code.elgg.org/elgg/trunk@8593 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../views/default/groups/invitationrequests.php | 19 ++++-- .../views/default/groups/membershiprequests.php | 74 +++++++++++++--------- 2 files changed, 55 insertions(+), 38 deletions(-) (limited to 'mod/groups/views/default/groups') diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php index 11cac52de..788788324 100644 --- a/mod/groups/views/default/groups/invitationrequests.php +++ b/mod/groups/views/default/groups/invitationrequests.php @@ -2,11 +2,12 @@ /** * A user's group invitations * - * @uses $vars['invitations'] + * @uses $vars['invitations'] Array of ElggGroups */ if (!empty($vars['invitations']) && is_array($vars['invitations'])) { $user = elgg_get_logged_in_user_entity(); + echo ''; } else { - echo "

" . elgg_echo('groups:invitations:none') . "

"; + echo '

' . elgg_echo('groups:invitations:none') . "

"; } diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php index 303b9aad1..4d1c78c8c 100644 --- a/mod/groups/views/default/groups/membershiprequests.php +++ b/mod/groups/views/default/groups/membershiprequests.php @@ -1,36 +1,48 @@ '; + foreach ($vars['requests'] as $user) { + if ($user instanceof ElggUser) { + $icon = elgg_view_entity_icon($user, 'tiny', array('override' => 'true')); - foreach($vars['requests'] as $request) - if ($request instanceof ElggUser) { - - ?> -
- "; - echo elgg_view_entity_icon($request, 'small', array('override' => 'true')); - echo "
"; - - $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}"); - ?> -
- - 'action/groups/killrequest?user_guid='.$request->guid.'&group_guid=' . $vars['entity']->guid, - 'confirm' => elgg_echo('groups:joinrequest:remove:check'), - 'text' => elgg_echo('delete'), - ))); - echo "

getUrl() . "\">" . $request->name . "

"; - echo "

" . $request->briefdescription . "

"; - ?> -
- - $user->getURL(), + 'text' => $user->name, + )); + + $url = "action/groups/addtogroup?user_guid={$user->guid}&group_guid={$vars['entity']->guid}"; + $url = elgg_add_action_tokens_to_url($url); + $accept_button = elgg_view('output/url', array( + 'href' => $url, + 'text' => elgg_echo('accept'), + 'class' => 'elgg-button elgg-button-submit', + )); + + $url = 'action/groups/killrequest?user_guid=' . $user->guid . '&group_guid=' . $vars['entity']->guid; + $delete_button = elgg_view('output/confirmlink', array( + 'href' => $url, + 'confirm' => elgg_echo('groups:joinrequest:remove:check'), + 'text' => elgg_echo('delete'), + 'class' => 'elgg-button elgg-button-delete mlm', + )); + + $body = "

$user_title

"; + $alt = $accept_button . $delete_button; + + echo '
  • '; + echo elgg_view_image_block($icon, $body, array('image_alt' => $alt)); + echo '
    • '; } - } else { - echo "

    " . elgg_echo('groups:requests:none') . "

    "; } - -?> \ No newline at end of file + echo ''; +} else { + echo '

    ' . elgg_echo('groups:requests:none') . "

    "; +} -- cgit v1.2.3