From 9046c68b5819d33b2f3abbb1857f1a0a4a8d7bfb Mon Sep 17 00:00:00 2001 From: aragonc Date: Thu, 23 Oct 2014 11:25:13 -0500 Subject: [PATCH] fix html and css structure social group --- main/css/base_chamilo.css | 24 +++++-- main/css/chamilo/default.css | 2 - main/inc/lib/display.lib.php | 2 +- main/social/invitations.php | 63 +++++++++++-------- .../template/default/layout/social_layout.tpl | 7 ++- 5 files changed, 61 insertions(+), 37 deletions(-) diff --git a/main/css/base_chamilo.css b/main/css/base_chamilo.css index dafee3d606..58c37ac75f 100755 --- a/main/css/base_chamilo.css +++ b/main/css/base_chamilo.css @@ -1393,14 +1393,26 @@ a.read { /* INVITATIONS */ -.invitation_confirm { - padding-bottom: 10px; - border-bottom: 1px solid #D8DFEA; +.invitation-clear{ + padding-bottom: 1em; + padding-top: 1em; } -.invitation_image { - width:110px; +.invitation-clear .title-profile, .invitation-clear .title-group { + font-size: 15px; + font-weight: bold; + padding-bottom: 0.2em; +} +.invitation-clear .title-profile a, .invitation-clear .title-group a{ + color: #333; +} +.invitation-clear .title-profile a:hover, .invitation-clear .title-group a:hover{ + color: #666; +} +.invitation-clear .content-invitation, .invitation-clear .description-group { + color: #666; + font-size: 13px; + padding-bottom: 0.3em; } - /* DASHBOARD */ /* Head section */ diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index da23f58f98..5c2a21cd34 100755 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -118,7 +118,6 @@ a.thumbnail:hover{ } .breadcrumb a{ - line-height: 30px; text-transform: none; } @@ -441,7 +440,6 @@ a.thumbnail:hover{ } .breadcrumb a{ padding-top: 0; - line-height: 30px; text-transform: none; } diff --git a/main/inc/lib/display.lib.php b/main/inc/lib/display.lib.php index 58e6b2a914..e0b08e0782 100755 --- a/main/inc/lib/display.lib.php +++ b/main/inc/lib/display.lib.php @@ -1661,7 +1661,7 @@ class Display $second_title = Security::remove_XSS($second_title); $title .= " $second_title"; } - return '

'.Security::remove_XSS($title).'

'; + return '

'.Security::remove_XSS($title).'

'; } public static function page_subheader2($title, $second_title = null) diff --git a/main/social/invitations.php b/main/social/invitations.php index 0029992228..aeac780361 100755 --- a/main/social/invitations.php +++ b/main/social/invitations.php @@ -94,7 +94,9 @@ if (is_array($_GET) && count($_GET)>0) { $social_avatar_block = SocialManager::show_social_avatar_block('invitations'); $social_menu_block = SocialManager::show_social_menu('invitations'); -$social_right_content = '
'; +$social_right_content = '
+
+
'; $user_id = api_get_user_id(); $list_get_invitation = SocialManager::get_list_invitation_of_friends_by_user_id($user_id); @@ -105,15 +107,15 @@ $number_loop = count($list_get_invitation); $total_invitations = $number_loop + count($list_get_invitation_sent) + count($pending_invitations); if ($total_invitations == 0 && count($_GET) <= 0) { - $social_right_content .= '
'.get_lang('TryAndFindSomeFriends').'
'; + $social_right_content .= '
'.get_lang('TryAndFindSomeFriends').'
'; } if ($number_loop != 0) { - $social_right_content .= '
'.Display::page_subheader(get_lang('InvitationReceived')).'
'; + $social_right_content .= '
'.Display::page_subheader(get_lang('InvitationReceived')).'
'; foreach ($list_get_invitation as $invitation) { $sender_user_id = $invitation['user_sender_id']; - $social_right_content .= '
'; + $social_right_content .= '
'; $picture = UserManager::get_user_picture_path_by_id($sender_user_id, 'web', false, true); $friends_profile = SocialManager::get_picture_user($sender_user_id, $picture['file'], 92); @@ -123,20 +125,20 @@ if ($number_loop != 0) { $date = api_convert_and_format_date($invitation['send_date'], DATE_TIME_FORMAT_LONG); $social_right_content .= '
- - -
-
- '.api_get_person_name($user_info['firstName'], $user_info['lastName']).' : - '.$content.' -
+ +
+
+ + '.api_get_person_name($user_info['firstName'], $user_info['lastName']).': +
'.$content.'
'.get_lang('DateSend').' : '.$date.'
- - + + +
'; @@ -144,11 +146,11 @@ if ($number_loop != 0) { } if (count($list_get_invitation_sent) > 0) { - $social_right_content .= '
'.Display::page_subheader(get_lang('InvitationSent')).'
'; + $social_right_content .= '
'.Display::page_subheader(get_lang('InvitationSent')).'
'; foreach ($list_get_invitation_sent as $invitation) { $sender_user_id = $invitation['user_receiver_id']; - $social_right_content .= '
'; + $social_right_content .= '
'; $picture = UserManager::get_user_picture_path_by_id($sender_user_id, 'web', false, true); $friends_profile = SocialManager::get_picture_user($sender_user_id, $picture['file'], 92); @@ -162,7 +164,7 @@ if (count($list_get_invitation_sent) > 0) {
-
+
'.api_get_person_name($user_info['firstName'], $user_info['lastName']).'
'. $title.' : '.$content.' @@ -176,21 +178,28 @@ if (count($list_get_invitation_sent) > 0) { } if (count($pending_invitations) > 0) { - $social_right_content .= Display::page_subheader(get_lang('GroupsWaitingApproval')); + $social_right_content .= '
'.Display::page_subheader(get_lang('GroupsWaitingApproval')).'
'; $new_invitation = array(); foreach ($pending_invitations as $invitation) { $picture = GroupPortalManager::get_picture_group($invitation['id'], $invitation['picture_uri'],80); - $img = ''; + $img = ''; $invitation['picture_uri'] = ''.$img.''; - $invitation['name'] = ''.cut($invitation['name'],120,true).''; - $invitation['join'] = ''. - Display::return_icon('accept_invitation.png', get_lang('AcceptInvitation')).'  '.get_lang('AcceptInvitation').''; - $invitation['deny'] = ''. - Display::return_icon('denied_invitation.png', get_lang('DenyInvitation')).'  '.get_lang('DenyInvitation').''; + $invitation['name'] = '
'.cut($invitation['name'],120,true).'
'; + $invitation['join'] = ''.get_lang('AcceptInvitation').''; + $invitation['deny'] = ''.get_lang('DenyInvitation').''; $invitation['description'] = cut($invitation['description'],220,true); $new_invitation[]=$invitation; + + $social_right_content .= '
+
'.$invitation['picture_uri'].'
+
' + .$invitation['name'].'
'.$invitation['description'].'
+
'.$invitation['join'].' '.$invitation['deny'].'
+
+
+ '; } - $social_right_content .= Display::return_sortable_grid( + /*$social_right_content .= Display::return_sortable_grid( 'waiting_user', array(), $new_invitation, @@ -198,7 +207,7 @@ if (count($pending_invitations) > 0) { array(), false, array(true, true, true, false, false, true, true, true, true) - ); + );*/ } $tpl = new Template(null); diff --git a/main/template/default/layout/social_layout.tpl b/main/template/default/layout/social_layout.tpl index e9c5781c4d..e4cc9ec44a 100755 --- a/main/template/default/layout/social_layout.tpl +++ b/main/template/default/layout/social_layout.tpl @@ -10,8 +10,13 @@
- +
+
+
+
+
{{ social_right_content}} +