chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Minor - format code, remove "social" get param

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent fc0aa6f134
commit aaf236b861
4 changed files with 26 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 46
      main/inc/lib/social.lib.php
  2. 6
      main/inc/lib/userportal.lib.php
  3. 2
      main/messages/new_message.php
  4. 2
      main/messages/outbox.php

46
main/inc/lib/social.lib.php
Unescape View File

@ -897,8 +897,8 @@ class SocialManager extends UserManager
$active = $show == 'messages' ? 'active' : null; $active = $show == 'messages' ? 'active' : null;
$links .= ' $links .= '
<li class="messages-icon ' . $active.'"> <li class="messages-icon ' . $active.'">
<a href="' . api_get_path(WEB_CODE_PATH).'messages/inbox.php?f=social"> <a href="'.api_get_path(WEB_CODE_PATH).'messages/inbox.php">
' . $messagesIcon.' '.get_lang('Messages').$count_unread_message.' '.$messagesIcon.' '.get_lang('Messages').$count_unread_message.'
</a> </a>
</li>'; </li>';
@ -982,53 +982,53 @@ class SocialManager extends UserManager
// My own profile // My own profile
if ($show_full_profile && $user_id == intval(api_get_user_id())) { if ($show_full_profile && $user_id == intval(api_get_user_id())) {
$links .= ' $links .= '
<li class="home-icon ' . $active.'"> <li class="home-icon '.$active.'">
<a href="' . api_get_path(WEB_CODE_PATH).'social/home.php"> <a href="'.api_get_path(WEB_CODE_PATH).'social/home.php">
' . $homeIcon.' '.get_lang('Home').' '.$homeIcon.' '.get_lang('Home').'
</a> </a>
</li> </li>
<li class="messages-icon ' . $active.'"> <li class="messages-icon '.$active.'">
<a href="' . api_get_path(WEB_CODE_PATH).'messages/inbox.php?f=social"> <a href="'.api_get_path(WEB_CODE_PATH).'messages/inbox.php">
' . $messagesIcon.' '.get_lang('Messages').$count_unread_message.' '.$messagesIcon.' '.get_lang('Messages').$count_unread_message.'
</a> </a>
</li>'; </li>';
$active = $show == 'invitations' ? 'active' : null; $active = $show == 'invitations' ? 'active' : null;
$links .= ' $links .= '
<li class="invitations-icon' . $active.'"> <li class="invitations-icon'.$active.'">
<a href="' . api_get_path(WEB_CODE_PATH).'social/invitations.php"> <a href="'.api_get_path(WEB_CODE_PATH).'social/invitations.php">
' . $invitationsIcon.' '.get_lang('Invitations').$total_invitations.' '.$invitationsIcon.' '.get_lang('Invitations').$total_invitations.'
</a> </a>
</li>'; </li>';
$links .= ' $links .= '
<li class="shared-profile-icon active"> <li class="shared-profile-icon active">
<a href="' . api_get_path(WEB_CODE_PATH).'social/profile.php"> <a href="'.api_get_path(WEB_CODE_PATH).'social/profile.php">
' . $sharedProfileIcon.' '.get_lang('ViewMySharedProfile').' '.$sharedProfileIcon.' '.get_lang('ViewMySharedProfile').'
</a> </a>
</li> </li>
<li class="friends-icon"> <li class="friends-icon">
<a href="' . api_get_path(WEB_CODE_PATH).'social/friends.php"> <a href="'.api_get_path(WEB_CODE_PATH).'social/friends.php">
' . $friendsIcon.' '.get_lang('Friends').' '.$friendsIcon.' '.get_lang('Friends').'
</a> </a>
</li> </li>
<li class="browse-groups-icon"> <li class="browse-groups-icon">
<a href="' . api_get_path(WEB_CODE_PATH).'social/groups.php"> <a href="'.api_get_path(WEB_CODE_PATH).'social/groups.php">
' . $groupsIcon.' '.get_lang('SocialGroups').' '.$groupsIcon.' '.get_lang('SocialGroups').'
</a> </a>
</li>'; </li>';
$active = $show == 'search' ? 'active' : null; $active = $show == 'search' ? 'active' : null;
$links .= ' $links .= '
<li class="search-icon ' . $active.'"> <li class="search-icon '.$active.'">
<a href="' . api_get_path(WEB_CODE_PATH).'social/search.php"> <a href="'.api_get_path(WEB_CODE_PATH).'social/search.php">
' . $searchIcon.' '.get_lang('Search').' '.$searchIcon.' '.get_lang('Search').'
</a> </a>
</li>'; </li>';
$active = $show == 'myfiles' ? 'active' : null; $active = $show == 'myfiles' ? 'active' : null;
$myFiles = ' $myFiles = '
<li class="myfiles-icon ' . $active.'"> <li class="myfiles-icon '.$active.'">
<a href="' . api_get_path(WEB_CODE_PATH).'social/myfiles.php"> <a href="'.api_get_path(WEB_CODE_PATH).'social/myfiles.php">
' . $filesIcon.' '.get_lang('MyFiles').' '.$filesIcon.' '.get_lang('MyFiles').'
</a> </a>
</li>'; </li>';

6
main/inc/lib/userportal.lib.php
Unescape View File

@ -920,14 +920,10 @@ class IndexManager
$total_invitations = $number_of_new_messages_of_friend + $group_pending_invitations; $total_invitations = $number_of_new_messages_of_friend + $group_pending_invitations;
$cant_msg = Display::badge($number_of_new_messages); $cant_msg = Display::badge($number_of_new_messages);
$link = '';
if (api_get_setting('allow_social_tool') == 'true') {
$link = '?f=social';
}
$items[] = [ $items[] = [
'class' => 'inbox-message-social', 'class' => 'inbox-message-social',
'icon' => Display::return_icon('inbox.png', get_lang('Inbox')), 'icon' => Display::return_icon('inbox.png', get_lang('Inbox')),
'link' => api_get_path(WEB_PATH).'main/messages/inbox.php'.$link, 'link' => api_get_path(WEB_PATH).'main/messages/inbox.php',
'title' => get_lang('Inbox').$cant_msg 'title' => get_lang('Inbox').$cant_msg
]; ];
$items[] = [ $items[] = [

2
main/messages/new_message.php
Unescape View File

@ -338,7 +338,7 @@ if ($allowSocial) {
$social_right_content .= '<div class="row">'; $social_right_content .= '<div class="row">';
$social_right_content .= '<div class="col-md-12">'; $social_right_content .= '<div class="col-md-12">';
$social_right_content .= '<div class="actions">'; $social_right_content .= '<div class="actions">';
$social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'. $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>'; Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>';
$social_right_content .= '</div>'; $social_right_content .= '</div>';
$social_right_content .= '</div>'; $social_right_content .= '</div>';

2
main/messages/outbox.php
Unescape View File

@ -83,7 +83,7 @@ $social_right_content = '';
if ($allowSocial) { if ($allowSocial) {
// Block Social Menu // Block Social Menu
$social_menu_block = SocialManager::show_social_menu('messages'); $social_menu_block = SocialManager::show_social_menu('messages');
$actionsLeft = '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'. $actionsLeft = '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>'; Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>';
$form = MessageManager::getSearchForm(api_get_path(WEB_PATH).'main/messages/outbox.php'); $form = MessageManager::getSearchForm(api_get_path(WEB_PATH).'main/messages/outbox.php');

Write Preview
Loading…
Cancel
Save