diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index 6d16dd4be9..2cb7167662 100755 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -2156,6 +2156,21 @@ div.comments { font-weight:bolder; vertical-align:middle; } + +.actions-title-groups { + //background:#efefef; + //border-bottom:1px dotted #999999; + //border-top:1px dotted #999999; + padding-left:0px; + padding-right:0px; + padding-top: 4px; + padding-bottom: 4px; + margin-bottom: 5px; + font-size:14px; + font-weight:bolder; + vertical-align:middle; +} + /********************************************** * MESSAGE TOOL * **********************************************/ @@ -2352,6 +2367,27 @@ div.image-social-content center.friend { width:30%; margin-left: 4px; } +#socialContent{ + width:100%; + height:auto; + overflow:hidden; + margin-left:auto; + margin-right:auto; +} + +#socialContentRigth{ + height:auto; + float:rigth; + overflow:hidden; + } +#socialContentLeft { + float:left; + height:auto; + margin-right:16px; + min-height:300px; + width:160px; + overflow:hidden; +} /***************************************************** * BUTTONS * *****************************************************/ @@ -2847,47 +2883,74 @@ a.unread { .groups_grid_element_2 { width:150px; float:left;} /*POPULAR GROUP*/ -.popular_grid_container { width:100%;} .popular_grid_item { - border:1px dotted #CCCCCC; float:left; - height:90px; - margin:5px; - padding:5px; - width:500px; + width:350px; + height:165px; + margin-top:20px; + } + +.popular_grid_element_1 { + width:330px; + height:165px; + padding-left:10px; + padding-right:10px; + background-image:url(../../img/boxmygroupscontent.jpg); + background-repeat:repeat-y; + overflow:hidden; } -.popular_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;} -.popular_grid_element_1 { width:350px; float:left; text-align:left; margin-bottom:1px; padding:1px;} -.popular_grid_element_2 { width:200px; float:left;} -.popular_grid_element_3 { width:200px; float:left; text-align:justify;} + /*NEWEST GROUP*/ -.newest_grid_container { width:100%;} + .newest_grid_item { - border:1px dotted #CCCCCC; float:left; - height:90px; - margin:5px; - padding:5px; - width:500px; + width:350px; + height:165px; + margin-top:20px; + } + +.newest_grid_element_1 { + width:330px; + height:165px; + padding-left:10px; + padding-right:10px; + background-image:url(../../img/boxmygroupscontent.jpg); + background-repeat:repeat-y; + overflow:hidden; } -.newest_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;} -.newest_grid_element_1 { width:350px; float:left; text-align:left; margin-bottom:1px; padding:1px;} -.newest_grid_element_2 { width:400px; float:left; text-align:justify;} /*MY GROUPS*/ -.mygroups_grid_container { width:100%;} + + .mygroups_grid_item { - border:1px dotted #CCCCCC; float:left; - height:90px; - margin:5px; - padding:5px; - width:500px; + width:350px; + height:165px; + margin-top:20px; } -.mygroups_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;} -.mygroups_grid_element_1 { width:350px; float:left; text-align:left; margin-bottom:1px; padding:1px;} -.mygroups_grid_element_2 { width:400px; float:left; text-align:justify;} + +.mygroups_grid_element_1 { + width:330px; + height:165px; + padding-left:10px; + padding-right:10px; + background-image:url(../../img/boxmygroupscontent.jpg); + background-repeat:repeat-y; + overflow:hidden; +} + +.box_description_group_title { + float:right;width:80%; +} +.box_description_group_content { + float:right;width:80%;height:40px; +} +.box_description_group_actions { + float:right;width:80%;text-align:right;margin-top:4px; +} + +//.mygroups_grid_element_2 { width:400px; float:left; text-align:justify;} /*PROFILE*/ .profile_grid_container { width:100%;} @@ -3022,6 +3085,118 @@ a.unread { float:right; } +/* SOCIAL MENU VERTICAL */ +.socialMenu { + width:150px; + height:auto; +} + +.socialMenu ul { + list-style-image:none; + list-style-position:outside; + list-style-type:none; + margin:0; + padding:0px; +} + +.socialMenu li { + margin-bottom:8px; + padding-bottom:4px; + background-image:url(../../img/line-social.jpg); + background-position:bottom; + background-repeat:repeat-x; +} + +.socialMenu ul li a{ + padding:2px 0px; +} + +.socialMenuSubLevel { + margin-left:20px;} + +.menuTitle{ + width:150px; + float:left; + height:20px; + background-color:#32578b; + margin-bottom:10px; +} +.TitleRigth{ + width:88%; + float:right; + height:20px; + background-color:#32578b; + margin-bottom:10px; +} +.menuTex1{ + color:#fff; + font-size:14px; + font-weight:normal; + } +.menuTex2{ + color:#000; + font-weight:normal; + font-size:12px; + } +.menuTex3{ + color:#94cdf9; + font-weight:normal; + font-size:12px; + font-weight:bold; + } + +/*BOX MY GROPUPS*/ + +#boxmyGroups{ + height:auto; + overflow:hidden; + } + +#boxmyGroupsLeft{ + width:100%; + //float:left; + height:auto; +} +#boxmyGroupsRigth{ + width:350px; + float:left; + height:auto; +} + +.boxMygroupsContent { + width:350px; + height:auto; + margin-top:20px; + } + +.myGroupsContent{ + width:330px; + height:auto; + overflow:hidden; + padding-left:10px; + padding-right:10px; + background-image:url(../../img/boxmygroupscontent.jpg); + background-repeat:repeat-y; + overflow:hidden; +} + +.imageGroups{ + border: 2px solid #cac9c9; + } + + +.groupTex1{ + font-family:Verdana, Geneva, sans-serif; + font-size:12px; + color:#686868; +} + +.groupText2{ + font-family:Verdana, Geneva, sans-serif; + font-size:12px; + color:#666699; +} + /* INVITATIONS */ .invitation_confirm { diff --git a/main/img/boxmygroups.jpg b/main/img/boxmygroups.jpg new file mode 100644 index 0000000000..deda4ed25b Binary files /dev/null and b/main/img/boxmygroups.jpg differ diff --git a/main/img/boxmygroupscontent.jpg b/main/img/boxmygroupscontent.jpg new file mode 100644 index 0000000000..c68ee5b389 Binary files /dev/null and b/main/img/boxmygroupscontent.jpg differ diff --git a/main/img/line-social.jpg b/main/img/line-social.jpg new file mode 100644 index 0000000000..b5fde9d7e6 Binary files /dev/null and b/main/img/line-social.jpg differ diff --git a/main/img/linegroups.jpg b/main/img/linegroups.jpg new file mode 100644 index 0000000000..13ae8595d6 Binary files /dev/null and b/main/img/linegroups.jpg differ diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php index 5d34c18ab2..e6aef0562f 100755 --- a/main/inc/lib/group_portal_manager.lib.php +++ b/main/inc/lib/group_portal_manager.lib.php @@ -206,8 +206,8 @@ class GroupPortalManager while ($row = Database::fetch_array($result, 'ASSOC')) { if ($with_image == true) { $picture = self::get_picture_group($row['id'], $row['picture_uri'],80); - $img = ''; - $row['picture_uri'] = $img; + //$img = ''; + $row['picture_uri'] = $picture['file']; } $array[$row['id']] = $row; } @@ -232,8 +232,7 @@ class GroupPortalManager $num = intval($num); } // only show admins and readers - $where_relation_condition = " WHERE gu.relation_type IN ('".GROUP_USER_PERMISSION_ADMIN."' , '".GROUP_USER_PERMISSION_READER."') "; - + $where_relation_condition = " WHERE gu.relation_type IN ('".GROUP_USER_PERMISSION_ADMIN."' , '".GROUP_USER_PERMISSION_READER."') "; $sql = "SELECT count(user_id) as count, g.picture_uri, g.name, g.description, g.id FROM $tbl_group g INNER JOIN $table_group_rel_user gu @@ -244,8 +243,8 @@ class GroupPortalManager while ($row = Database::fetch_array($result, 'ASSOC')) { if ($with_image == true) { $picture = self::get_picture_group($row['id'], $row['picture_uri'],80); - $img = ''; - $row['picture_uri'] = $img; + //$img = ''; + $row['picture_uri'] = $picture['file']; } $array[$row['id']] = $row; } @@ -276,12 +275,12 @@ class GroupPortalManager $result=Database::query($sql,__FILE__,__LINE__); $array = array(); while ($row = Database::fetch_array($result, 'ASSOC')) { - if ($with_image == true) { - $picture = self::get_picture_group($row['id'], $row['picture_uri'],80); - $img = ''; - $row['picture_uri'] = $img; - } - $array[$row['id']] = $row; + if ($with_image == true) { + $picture = self::get_picture_group($row['id'], $row['picture_uri'],80); + //$img = ''; + $row['picture_uri'] = $picture['file']; + } + $array[$row['id']] = $row; } return $array; } diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index 83bf7666d0..d9eb141376 100755 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -877,7 +877,8 @@ class MessageManager $name = api_get_person_name($user_sender_info['firstname'], $user_sender_info['lastname']); $html .= '
'; $html .= ' - '.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align: middle')).' + '.((isset($_GET['div_id']) && $_GET['div_id'] == 'content_'.$topic['id'])?Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align: middle')): + Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align: middle'))).' '.$topic['title'].''; //$html .= '('.get_lang('PostIn').' '.date_to_str_ago($topic['send_date']).($topic['send_date']!=$topic['update_date']?' - '.get_lang('LastUpdate').' '.date_to_str_ago($topic['send_date']):'').')'; $html .= ''; @@ -889,15 +890,16 @@ class MessageManager } else { $html .= ' '.get_lang('Created').' '.date_to_str_ago($topic['send_date']).''; } - - - $html .= '
'; + + + $html .= '
'; + $html .= ''; $html.= '
'; $html.= ''; @@ -907,18 +909,33 @@ class MessageManager //$html.= '
'.get_lang('PostIn').' '.date_to_str_ago($topic['send_date']).'
'; $html.= '
'.(!empty($files_attachments)?implode(' | ',$files_attachments):'').'
'; $html.= '
'; - // items + + // items if (is_array($topic['items'])) { - foreach ($topic['items'] as $item) { + + // pager items + $page_item = isset($_GET['page_item_nr'])?intval($_GET['page_item_nr']):1; + $total_items = count($topic['items']); + $items_per_page = 3; + $div_content = 'content_'.$topic['id']; + $pager_items = self::get_pager_for_message_group($group_id,$page_item,$total_items,$items_per_page,true,$div_content); + $html .= '
+ +
 '.$pager_items['details'].''.$pager_items['links'].'
'; + + $topic_slice['items'] = array_slice($topic['items'],($page_item-1)*($items_per_page),$items_per_page); + + foreach ($topic_slice['items'] as $item) { + $indent = $item['indent_cnt']*'15'; $user_sender_info = UserManager::get_user_info_by_id($item['user_sender_id']); $files_attachments = self::get_links_message_attachment_files($item['id']); $name = api_get_person_name($user_sender_info['firstname'], $user_sender_info['lastname']); $html.= '
'; $html.= ''; $html.= '
'.$item['title'].' 
'; @@ -937,7 +954,13 @@ class MessageManager $html.= '
'.(!empty($files_attachments)?implode(' | ',$files_attachments):'').'
'; $html.= '
'; - } + } + + // pager items + $html .= '
+ +
  '.$pager_items['links'].'
'; + } $html .= '
'; $html .= '
'; @@ -960,7 +983,7 @@ class MessageManager * @param int rows per page * @return array pager with details and links */ - public static function get_pager_for_message_group($group_id,$page,$num_rows,$rows_per_page) { + public static function get_pager_for_message_group($group_id,$page,$num_rows,$rows_per_page,$pager_items = false,$div_content='') { $link = ''; $details = ''; @@ -983,26 +1006,34 @@ class MessageManager // get links for pager - $href = api_get_path(WEB_CODE_PATH).'social/groups.php?id='.$group_id; - if ($page > 1) { - $link .= ''; + $href = api_get_path(WEB_CODE_PATH).'social/groups.php?id='.$group_id; + + if ($pager_items) { + $page_topic = isset($_GET['page_nr'])?intval($_GET['page_nr']):1; + $param_name_page_nr = '&page_nr='.$page_topic.'&div_id='.$div_content.'&page_item_nr='; + } else { + $param_name_page_nr = '&page_nr='; + } + + if ($page > 1) { + $link .= ''; $link .= Display::return_icon('first.png',get_lang('FirstPage'),array('style'=>'vertical-align: middle')); $link .= ''; - $link .= ''; + $link .= ''; $link .= Display::return_icon('prev.png',get_lang('PreviousPage'),array('style'=>'vertical-align: middle')); $link .= ''; } $link .= $page.'/'.$last_page; + if ($page < $last_page) { - $link .= ''; + $link .= ''; $link .= Display::return_icon('next.png',get_lang('NextPage'),array('style'=>'vertical-align: middle')); $link .= ''; - $link .= ''; + $link .= ''; $link .= Display::return_icon('last.png',get_lang('PreviousPage'),array('style'=>'vertical-align: middle')); $link .= ''; - } + } $pager['links'] = $link; - return $pager; } diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index f7ed15844f..af393c4356 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -653,7 +653,9 @@ class SocialManager extends UserManager { } public static function show_social_menu($show = '' ) { - echo '
'; + + /* + echo ''; + */ + + // Everybody can create groups + if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') { + $create_group_item = '
  • '.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6')).get_lang('CreateAgroup').'
  • '; + } else { + // Only admins and teachers can create groups + if (api_is_allowed_to_edit(null,true)) { + $create_group_item = '
  • '.Display::return_icon('edit.gif',get_lang('CreateAgroup'),array('hspace'=>'6')).get_lang('CreateAgroup').'
  • '; + } + } + + echo ''; + + } diff --git a/main/social/groups.php b/main/social/groups.php index d5da6e9f3b..f574533e17 100755 --- a/main/social/groups.php +++ b/main/social/groups.php @@ -69,26 +69,32 @@ function validate_text_empty (str,msg) { } jQuery(document).ready(function() { - $(".head").click(function() { - $(this).next().next().slideToggle("fast"); - image_clicked = $("#" + this.id + " img").attr("src"); - - image_clicked_info = image_clicked.split("/"); - image_real_clicked = image_clicked_info[image_clicked_info.length-1]; - image_path = image_clicked.split("img"); - current_path = image_path[0]+"img/"; + var valor = "'.Security::remove_XSS($_GET['div_id']).'"; - if (image_real_clicked == "div_show.gif") { - current_path = current_path+"div_hide.gif"; - $("#" + this.id + " img").attr("src", current_path); - } else { - current_path = current_path+"div_show.gif"; - $("#" + this.id + " img").attr("src", current_path) - } - - return false; - }).next().next().hide(); + $(".head").click(function() { + $(this).next().next().slideToggle("fast"); + image_clicked = $("#" + this.id + " img").attr("src"); + image_clicked_info = image_clicked.split("/"); + image_real_clicked = image_clicked_info[image_clicked_info.length-1]; + image_path = image_clicked.split("img"); + current_path = image_path[0]+"img/"; + if (image_real_clicked == "div_show.gif") { + current_path = current_path+"div_hide.gif"; + $("#" + this.id + " img").attr("src", current_path); + } else { + current_path = current_path+"div_show.gif"; + $("#" + this.id + " img").attr("src", current_path) + } + return false; + }).next().next().hide(); + + // anchor for current topic + if (valor) { + $("#"+valor).show(); + window.location = document.URL+"#"+valor; + } + }); '; @@ -96,9 +102,9 @@ $interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('Social')); $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Groups')); Display :: display_header($tool_name, 'Groups'); -echo '
    '; -echo get_lang('Groups'); -echo '
    '; + + + // save message group if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) { @@ -128,15 +134,27 @@ if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) { // getting group information $group_id = intval($_GET['id']); -echo '
    '; +$who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_user_id(), $statistics_database, api_get_setting('time_limit_whosonline'))); + +echo '
    '; +//echo get_lang('Groups'); +echo ''; +echo '
    '.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).''.$who_is_on_line.'
    '; + +echo '
    '; + + +echo '
    '; + + echo '
    '; //this include the social menu div - SocialManager::show_social_menu('groups'); + SocialManager::show_social_menu('groups'); + echo '
    '; + + echo '
    '; - echo '
    '; - - if ($group_id != 0 ) { //Loading group information if (isset($_GET['status']) && $_GET['status']=='sent') { @@ -164,8 +182,7 @@ if ($group_id != 0 ) { } } } - - + //-- Shows left column echo GroupPortalManager::show_group_column_information($group_id, api_get_user_id()); //--- @@ -187,90 +204,111 @@ if ($group_id != 0 ) { echo '
    '; // end layout right } else { - - // My groups ----- - - $results = GroupPortalManager::get_groups_by_user(api_get_user_id(), 0, true); - - $groups = array(); + + // My groups ----- + $results = GroupPortalManager::get_groups_by_user(api_get_user_id(), 0, true); + $grid_my_groups = array(); if (is_array($results) && count($results) > 0) { foreach ($results as $result) { - //cutting text - //$result['name'] = cut($result['name'],150); - //$result['description'] = cut($result['description'],180); - $id = $result['id']; $url_open = ''; $url_close = ''; + + $name = cut($result['name'],30,true); if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) { - $result['name'] .= Display::return_icon('admin_star.png', get_lang('Admin')); + $name .= Display::return_icon('admin_star.png', get_lang('Admin')); } elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) { - $result['name'] .= Display::return_icon('moderator_star.png', get_lang('Moderator')); - } - $groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close, cut($result['description'],180,true)); - } - } - echo '
    '; - // Everybody can create groups - if (api_get_setting('allow_students_to_create_groups_in_social') == 'true') { - echo ''.get_lang('CreateAgroup').''; - } else { - // Only admins and teachers can create groups - if (api_is_allowed_to_edit(null,true)) { - echo ''.get_lang('CreateAgroup').''; + $name .= Display::return_icon('moderator_star.png', get_lang('Moderator')); + } + $count_users_group = count(GroupPortalManager::get_all_users_by_group($id)); + if ($count_users_group == 1 ) { + $count_users_group = $count_users_group.' '.get_lang('Member'); + } else { + $count_users_group = $count_users_group.' '.get_lang('Members'); + } + + $result['picture_uri'] = ''; + $grid_item_1 = Display::return_icon('boxmygroups.jpg'); + $item_1 = '
    '.$url_open.$result['picture_uri'].'

    '.$name.'
    ('.$count_users_group.')

    '.$url_close.Display::return_icon('linegroups.jpg').'
    '; + $item_2 = '
    '.get_lang('DescriptionGroup').'
    '; + $item_3 = '
    '.cut($result['description'],120,true).'
    '; + $item_4 = '
    '.$url_open.get_lang('SeeMore').$url_close.'
    '; + $grid_item_2 = $item_1.$item_2.$item_3.$item_4; + $grid_my_groups[]= array($grid_item_1,$grid_item_2); } } - - echo '

    '.get_lang('MyGroups').'

    '; - - if (count($groups) > 0) { - Display::display_sortable_grid('mygroups', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false)); - } - - - // Newest groups -------- - + + // Newest groups -------- $results = GroupPortalManager::get_groups_by_age(); - $groups = array(); + $grid_newest_groups = array(); foreach ($results as $result) { - $id = $result['id']; $url_open = ''; - $url_close = ''; - $groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close, cut($result['description'],180,true)); + $url_close = ''; + $count_users_group = count(GroupPortalManager::get_all_users_by_group($id)); + if ($count_users_group == 1 ) { + $count_users_group = $count_users_group.' '.get_lang('Member'); + } else { + $count_users_group = $count_users_group.' '.get_lang('Members'); + } + + $name = cut($result['name'],30,true); + $result['picture_uri'] = ''; + $grid_item_1 = Display::return_icon('boxmygroups.jpg'); + $item_1 = '
    '.$url_open.$result['picture_uri'].'

    '.$name.'
    ('.$count_users_group.')

    '.$url_close.Display::return_icon('linegroups.jpg').'
    '; + $item_2 = '
    '.get_lang('DescriptionGroup').'
    '; + $item_3 = '
    '.cut($result['description'],120,true).'
    '; + $item_4 = '
    '.$url_open.get_lang('SeeMore').$url_close.'
    '; + $grid_item_2 = $item_1.$item_2.$item_3.$item_4; + + $grid_newest_groups[]= array($grid_item_1,$grid_item_2); } - if (count($groups) > 0) { - echo '

    '.get_lang('Newest').'

    '; - Display::display_sortable_grid('newest', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false)); - } - - // Pop groups ----- + // Pop groups ----- $results = GroupPortalManager::get_groups_by_popularity(); - $groups = array(); + $grid_pop_groups = array(); foreach ($results as $result) { $id = $result['id']; $url_open = ''; - $url_close = ''; - + $url_close = ''; if ($result['count'] == 1 ) { $result['count'] = $result['count'].' '.get_lang('Member'); } else { $result['count'] = $result['count'].' '.get_lang('Members'); - } + } + $count_users_group = $result['count']; - $groups[]= array($url_open.$result['picture_uri'].$url_close, $url_open.$result['name'].$url_close,$result['count'],cut($result['description'],120,true)); - } - if (count($groups) > 0) { - echo '

    '.get_lang('Popular').'

    '; - Display::display_sortable_grid('popular', array(), $groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true)); + $name = cut($result['name'],30,true); + $result['picture_uri'] = ''; + $grid_item_1 = Display::return_icon('boxmygroups.jpg'); + $item_1 = '
    '.$url_open.$result['picture_uri'].'

    '.$name.'
    ('.$count_users_group.')

    '.$url_close.Display::return_icon('linegroups.jpg').'
    '; + $item_2 = '
    '.get_lang('DescriptionGroup').'
    '; + $item_3 = '
    '.cut($result['description'],120,true).'
    '; + $item_4 = '
    '.$url_open.get_lang('SeeMore').$url_close.'
    '; + $grid_item_2 = $item_1.$item_2.$item_3.$item_4; + + $grid_pop_groups[]= array($grid_item_1,$grid_item_2); + } - - echo '
    '; + + echo '
    '; + echo '

    '.get_lang('MyGroups').'

    '; + if (count($grid_my_groups) > 0) { + Display::display_sortable_grid('mygroups', array(), $grid_my_groups, array('hide_navigation'=>true, 'per_page' => 2), $query_vars, false, array(true, true, true,false)); + } + if (count($grid_newest_groups) > 0) { + echo '

    '.get_lang('Newest').'

    '; + Display::display_sortable_grid('newest', array(), $grid_newest_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false)); + } + if (count($grid_pop_groups) > 0) { + echo '

    '.get_lang('Popular').'

    '; + Display::display_sortable_grid('popular', array(), $grid_pop_groups, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,true,true)); + } + echo '
    '; -echo '
    '; +} + echo '
    '; - -} +echo '
    '; Display :: display_footer(); ?> \ No newline at end of file diff --git a/main/social/message_for_group_form.inc.php b/main/social/message_for_group_form.inc.php index 2c157ff12d..478c6d5d73 100755 --- a/main/social/message_for_group_form.inc.php +++ b/main/social/message_for_group_form.inc.php @@ -53,9 +53,12 @@ if (!empty($group_id) && $allowed_action) { } } +$page_item = !empty($_GET['page_item_nr'])?intval($_GET['page_item_nr']):1; +$page_topic = !empty($_GET['page_nr'])?intval($_GET['page_nr']):1; + ?> -
    +