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

fixed social header and social content right for ie6 and ie7 - partial CT#446

Browse Source
skala
Cristian Fasanando 16 years ago
parent 77edf0317b
commit b7df32f52e
17 changed files with 27 additions and 102 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. 7
      main/css/blue_lagoon/default.css
  2. 12
      main/inc/lib/social.lib.php
  3. 7
      main/messages/inbox.php
  4. 7
      main/messages/new_message.php
  5. 7
      main/messages/outbox.php
  6. 7
      main/messages/view_message.php
  7. 9
      main/social/friends.php
  8. 7
      main/social/group_add.php
  9. 9
      main/social/group_edit.php
  10. 8
      main/social/group_invitation.php
  11. 9
      main/social/group_members.php
  12. 9
      main/social/group_waiting_list.php
  13. 3
      main/social/groups.php
  14. 2
      main/social/home.php
  15. 8
      main/social/invitations.php
  16. 11
      main/social/profile.php
  17. 7
      main/social/search.php

7
main/css/blue_lagoon/default.css
Unescape View File

@ -2325,7 +2325,8 @@ div.image-social-content center.friend {
#social-content-right {
height:auto;
float:rigth;
overflow:hidden;
overflow:hidden;
width:800px;
}
#social-content-left {
float:left;
@ -2333,7 +2334,7 @@ div.image-social-content center.friend {
margin-right:16px;
min-height:300px;
width:160px;
overflow:hidden;
overflow:hidden;
}
.social-content-description {
background:#ECE9D8;
@ -2451,7 +2452,7 @@ div.image-social-content center.friend {
font-family:Verdana, Geneva, sans-serif;
color:#000;
font-weight:bold;
font-size:13px;
font-size:12px;
vertical-align:bottom;
}
.social-menu-title-right {

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

@ -666,11 +666,11 @@ class SocialManager extends UserManager {
if (in_array($show,$show_messages)) {
echo '<ul>';
echo '<li><ul>';
echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('inbox.png', get_lang('Inbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_inbox'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Inbox').'</span></a></li>';
echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?f=social">'.Display::return_icon('message_new.png', get_lang('ComposeMessage'), array('hspace'=>'6','style'=>'float:left')).'<span class="'.($show=='messages_compose'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('ComposeMessage').'</span></a></li>';
echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png', get_lang('Outbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_outbox'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Outbox').'</span></a></li>';
echo '</ul>';
echo '<li class="social-menu-sub-level" style="background:none;padding:0px"><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php?f=social">'.Display::return_icon('outbox.png', get_lang('Outbox'), array('hspace'=>'6')).'<span class="'.($show=='messages_outbox'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Outbox').'</span></a></li>';
echo '</ul></li>';
}
@ -684,10 +684,10 @@ class SocialManager extends UserManager {
<li><a href="'.api_get_path(WEB_PATH).'main/social/groups.php">'.Display::return_icon('group.gif',get_lang('Groups'),array('hspace'=>'6')).'<span class="'.($show=='groups'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Groups').'</span></a></li>';
if (in_array($show,$show_groups)) {
echo '<ul>';
echo '<li><ul>';
echo $create_group_item;
echo '<li class="social-menu-sub-level"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php?view=mygroups">'.Display::return_icon('group.gif',get_lang('MyGroups'),array('hspace'=>'6')).'<span class="'.($show=='mygroups'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyGroups').'</span></a></li>';
echo '</ul>';
echo '<li class="social-menu-sub-level" style="background:none;padding:0px"><a href="'.api_get_path(WEB_PATH).'main/social/groups.php?view=mygroups">'.Display::return_icon('group.gif',get_lang('MyGroups'),array('hspace'=>'6')).'<span class="'.($show=='mygroups'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyGroups').'</span></a></li>';
echo '</ul></li>';
}
echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('search.gif',get_lang('Search'),array('hspace'=>'6')).'<span class="'.($show=='search'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Search').'</span></a></li>
</ul>

7
main/messages/inbox.php
Unescape View File

@ -138,7 +138,7 @@ $social_parameter = '';
if ($_GET['f']=='social' || api_get_setting('allow_social_tool') == 'true') {
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -147,11 +147,6 @@ if ($_GET['f']=='social' || api_get_setting('allow_social_tool') == 'true') {
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('Messages');
echo '</div>';
*/
$social_parameter = '?f=social';
} else {
//comes from normal profile

7
main/messages/new_message.php
Unescape View File

@ -279,7 +279,7 @@ if ($group_id != 0) {
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -288,11 +288,6 @@ if ($group_id != 0) {
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('Messages');
echo '</div>';
*/
} else {
echo '<div class=actions>';
if (api_get_setting('allow_social_tool') == 'true' && api_get_setting('allow_message_tool') == 'true') {

7
main/messages/outbox.php
Unescape View File

@ -82,7 +82,7 @@ if ($_GET['f']=='social') {
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -91,11 +91,6 @@ if ($_GET['f']=='social') {
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('Messages');
echo '</div>';
*/
} else {

7
main/messages/view_message.php
Unescape View File

@ -34,7 +34,7 @@ Display::display_header('');
if ($_GET['f']=='social') {
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -43,11 +43,6 @@ if ($_GET['f']=='social') {
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('Messages');
echo '</div>';
*/
$social_parameter = '?f=social';
} else {
if (api_get_setting('extended_profile') == 'true') {

9
main/social/friends.php
Unescape View File

@ -87,10 +87,9 @@ $interbreadcrumb[]= array ('url' =>'#','name' => get_lang('Friends'));
Display :: display_header($tool_name, 'Groups');
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -99,11 +98,7 @@ echo '<div class="social-menu-title" align="center"><span class="social-menu-tex
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('MyFriends');
echo '</div>';
*/
echo '<div id="social-content">';
echo '<div id="social-content-left">';

7
main/social/group_add.php
Unescape View File

@ -102,7 +102,7 @@ Display :: display_header($tool_name, 'Groups');
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -111,11 +111,6 @@ echo '<div class="social-menu-title" align="center"><span class="social-menu-tex
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('Groups');
echo '</div>';
*/
echo '<div id="social-content">';
echo '<div id="social-content-left">';
//show the action menu

9
main/social/group_edit.php
Unescape View File

@ -127,7 +127,7 @@ Display::display_header($tool_name);
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -136,13 +136,6 @@ echo '<div class="social-menu-title" align="center"><span class="social-menu-tex
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('Groups');
echo '</div>';
*/
// Group picture
$image_path = GroupPortalManager::get_group_picture_path_by_id($group_id,'web');
$image_dir = $image_path['dir'];

8
main/social/group_invitation.php
Unescape View File

@ -214,7 +214,7 @@ $users=$sessions=array();
Display :: display_header($tool_name, 'Groups');
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -223,12 +223,6 @@ echo '<div class="social-menu-title" align="center"><span class="social-menu-tex
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('Invitations');
echo '</div>';
*/
if($_POST['form_sent']) {
$form_sent = $_POST['form_sent'];
$firstLetterUser = $_POST['firstLetterUser'];

9
main/social/group_members.php
Unescape View File

@ -43,7 +43,7 @@ if (empty($group_id)) {
Display :: display_header($tool_name, 'Groups');
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -52,14 +52,7 @@ echo '<div class="social-menu-title" align="center"><span class="social-menu-tex
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('GroupMembers');
echo '</div>';
*/
$show_message = '';
//if i'm a moderator
if (isset($_GET['action']) && $_GET['action']=='add') {
// we add a user only if is a open group

9
main/social/group_waiting_list.php
Unescape View File

@ -43,7 +43,7 @@ Display :: display_header($tool_name, 'Groups');
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -52,12 +52,7 @@ echo '<div class="social-menu-title" align="center"><span class="social-menu-tex
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('GroupWaitingList');
echo '</div>';
*/
// Group information
$admins = GroupPortalManager::get_users_by_group($group_id, true, array(GROUP_USER_PERMISSION_ADMIN), 0, 1000);
$show_message = '';

3
main/social/groups.php
Unescape View File

@ -147,7 +147,7 @@ $group_id = intval($_GET['id']);
$relation_group_title = '';
$who_is_on_line = get_lang('UsersOnline').' '.count(WhoIsOnline(api_get_setting('time_limit_whosonline'),true));
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></td>
</tr></table>';
@ -157,7 +157,6 @@ echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.p
*/
echo '</div>';
echo '<div id="social-content">';
echo '<div id="social-content-left">';

2
main/social/home.php
Unescape View File

@ -58,7 +58,7 @@ $user_info = UserManager :: get_user_info_by_id(api_get_user_id());
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'),true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';

8
main/social/invitations.php
Unescape View File

@ -69,7 +69,7 @@ Display :: display_header($tool_name, 'Groups');
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -79,12 +79,6 @@ echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.p
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('Invitations');
echo '</div>';
*/
// easy links
if (is_array($_GET) && count($_GET)>0) {
foreach($_GET as $key => $value) {

11
main/social/profile.php
Unescape View File

@ -252,7 +252,7 @@ if (is_array($personal_course_list)) {
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.get_lang('ViewMySharedProfile').'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -262,15 +262,6 @@ echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.p
*/
echo '</div>';
/*
echo '<div class="actions-title">';
if ($user_id == api_get_user_id())
echo get_lang('ViewMySharedProfile');
else
echo get_lang('ViewSharedProfile').' - '.api_get_person_name($user_info['firstname'], $user_info['lastname']);
echo '</div>';
*/
echo '<div id="social-content">';
echo '<div id="social-content-left">';

7
main/social/search.php
Unescape View File

@ -23,7 +23,7 @@ Display :: display_header($tool_name);
$user_online_list = WhoIsOnline(api_get_setting('time_limit_whosonline'), true);
$user_online_count = count($user_online_list);
echo '<div class="actions-title-groups">';
echo '<div class="social-header">';
echo '<table width="100%"><tr><td width="150px" bgcolor="#32578b"><center><span class="social-menu-text1">'.strtoupper(get_lang('Menu')).'</span></center></td>
<td width="15px">&nbsp;</td><td bgcolor="#32578b">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.get_lang('FriendsOnline').' '.$user_online_count.'</span></a></td>
</tr></table>';
@ -32,11 +32,6 @@ echo '<div class="social-menu-title" align="center"><span class="social-menu-tex
echo '<div class="social-menu-title-right">'.Display::return_icon('whoisonline.png','',array('hspace'=>'6')).'<a href="#" ><span class="social-menu-text1">'.$who_is_on_line.'</span></a></div>';
*/
echo '</div>';
/*
echo '<div class="actions-title">';
echo get_lang('Search');
echo '</div>';
*/
echo '<div id="social-content">';
echo '<div id="social-content-left">';

Write Preview
Loading…
Cancel
Save