diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index 041b14e10a..755b3959e9 100644 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -1002,11 +1002,8 @@ class MessageManager $rows = self::calculate_children($rows, $topic_id); $current_user_id = api_get_user_id(); - //$topics_per_page = 5; $items_per_page = 50; - //$count_items = 0; - //$html_messages = ''; $query_vars = array('id' => $group_id, 'topic_id' => $topic_id , 'topics_page_nr' => 0); // Main message @@ -1015,7 +1012,6 @@ class MessageManager $links = ''; $main_content = ''; - //$items_page_nr = intval($_GET['items_'.$topic['id'].'_page_nr']); $items_page_nr = null; $html = ''; @@ -1064,7 +1060,7 @@ class MessageManager if (is_array($rows) && count($rows)> 0) { $topics = $rows; - + $array_html_items = array(); foreach ($topics as $index => $topic) { if (empty($topic['id'])) { continue; @@ -1127,8 +1123,7 @@ class MessageManager if (!empty($array_html_items)) { $html .= Display::return_sortable_grid('items_'.$topic['id'], array(), $array_html_items, $options, $query_vars, null, $visibility, false, $style_class); } - } - $html .= ''; + } $html = Display::div($html, array('class'=>'', 'style'=>'width:638px')); return $html; } diff --git a/main/social/groups.php b/main/social/groups.php index 2ab81d71e0..e337c18966 100644 --- a/main/social/groups.php +++ b/main/social/groups.php @@ -211,13 +211,11 @@ if ($group_id != 0 ) { $is_group_member = GroupPortalManager::is_group_member($group_id); // details about the current group - $social_right_content = '
'; + $social_right_content = '
'; $social_right_content .= '
'; //Group's title $social_right_content .= Display::tag('h2', Security::remove_XSS($group_info['name'], STUDENT, true)); - //echo ''; - //Privacy if (!$is_group_member) { $social_right_content .= ''; - $social_right_content .= '
'; - $social_right_content .= '
'; + $social_right_content .= '
'; //-- Show message groups - $social_right_content .= '
'; + $social_right_content .= '
'; if ($is_group_member || $group_info['visibility'] == GROUP_PERMISSION_OPEN) { if (!$is_group_member) { @@ -352,7 +349,7 @@ if ($group_id != 0 ) { $result['picture_uri'] = ''; $item_0 = Display::div($result['picture_uri'], array('class'=>'box_description_group_image')); $members = Display::span($count_users_group, array('class'=>'box_description_group_member')); - $item_1 = Display::div(Display::tag('h2', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title')); + $item_1 = Display::div(Display::tag('h3', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title')); $item_2 = ''; $item_3 = ''; @@ -389,7 +386,7 @@ if ($group_id != 0 ) { $item_0 = Display::div($result['picture_uri'], array('class'=>'box_description_group_image')); $members = Display::span($count_users_group, array('class'=>'box_description_group_member')); - $item_1 = Display::div(Display::tag('h2', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title')); + $item_1 = Display::div(Display::tag('h3', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title')); if ($result['description'] != '') { @@ -435,7 +432,7 @@ if ($group_id != 0 ) { $item_0 = Display::div($result['picture_uri'], array('class'=>'box_description_group_image')); $members = Display::span($count_users_group, array('class'=>'box_description_group_member')); - $item_1 = Display::div(Display::tag('h2', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title')); + $item_1 = Display::div(Display::tag('h3', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title')); if ($result['description'] != '') { $item_3 = '
'.cut($result['description'],100,true).'
'; @@ -520,12 +517,11 @@ if ($group_id != 0 ) { } if (!empty($create_group_item)) { - $social_right_content .= Display::div($create_group_item, array('style'=>'padding-top:12px;height:30px')); + $social_right_content .= Display::div($create_group_item, array('class'=>'span9')); } $headers = array(get_lang('Newest'), get_lang('Popular'), get_lang('MyGroups')); - $social_right_content .= Display::tabs($headers, array($newest_content, $popular_content, $my_group_content),'tab_browse'); - } - $social_right_content .= '
'; + $social_right_content .= '
'.Display::tabs($headers, array($newest_content, $popular_content, $my_group_content),'tab_browse').'
'; + } //Display :: display_footer(); if (isset($_REQUEST['action']) && $_REQUEST['action'] == 'show_message' && $_REQUEST['msg'] == 'topic_deleted') { diff --git a/main/template/default/layout/layout_1_col.tpl b/main/template/default/layout/layout_1_col.tpl index 2614ee815c..1913822f46 100644 --- a/main/template/default/layout/layout_1_col.tpl +++ b/main/template/default/layout/layout_1_col.tpl @@ -16,7 +16,7 @@ {/if}
- {include file="default/layout/page_body.tpl"} + {include file="default/layout/page_body.tpl"}
{* Content bottom *} diff --git a/main/template/default/layout/page_body.tpl b/main/template/default/layout/page_body.tpl index d180323135..a4283bbf73 100644 --- a/main/template/default/layout/page_body.tpl +++ b/main/template/default/layout/page_body.tpl @@ -1,7 +1,7 @@ {* Actions *} {if (!empty($actions)) }
- {$actions} + {$actions}
{/if} @@ -15,12 +15,11 @@ {* Show messages*} {if !empty($message) }
- {$message} + {$message}
{/if} {* Main content*}
{$content} -
- + \ No newline at end of file diff --git a/main/template/default/layout/social_layout.tpl b/main/template/default/layout/social_layout.tpl index 5b12d522d4..44a60da81b 100644 --- a/main/template/default/layout/social_layout.tpl +++ b/main/template/default/layout/social_layout.tpl @@ -2,12 +2,11 @@
{$social_left_content} {$social_left_menu} -
- +
- {$social_right_content} -
+ {$social_right_content} +
\ No newline at end of file