From b709ec4fd39420bfb8541abf7eea2ecbd5e4b3fe Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 11:50:40 -0500 Subject: [PATCH 01/13] Adding htaccess + minor updates see #190 --- main/inc/ajax/.htaccess | 1 + main/inc/ajax/social.ajax.php | 4 ++++ main/inc/ajax/user_manager.ajax.php | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100755 main/inc/ajax/.htaccess diff --git a/main/inc/ajax/.htaccess b/main/inc/ajax/.htaccess new file mode 100755 index 0000000000..45552cb63e --- /dev/null +++ b/main/inc/ajax/.htaccess @@ -0,0 +1 @@ +Options -Indexes \ No newline at end of file diff --git a/main/inc/ajax/social.ajax.php b/main/inc/ajax/social.ajax.php index b7393eeec4..8a812622b6 100644 --- a/main/inc/ajax/social.ajax.php +++ b/main/inc/ajax/social.ajax.php @@ -163,6 +163,10 @@ switch ($action) { break; case 'toogle_course': + if (api_is_anonymous()){ + echo ''; + break; + } require_once api_get_path(LIBRARY_PATH).'blog.lib.php'; require_once api_get_path(SYS_CODE_PATH).'forum/forumfunction.inc.php'; diff --git a/main/inc/ajax/user_manager.ajax.php b/main/inc/ajax/user_manager.ajax.php index 2123c592be..3a7118fc11 100644 --- a/main/inc/ajax/user_manager.ajax.php +++ b/main/inc/ajax/user_manager.ajax.php @@ -9,7 +9,7 @@ $action = $_GET['a']; switch ($action) { case 'search_tags': - if (api_is_anonymous()){ + if (api_is_anonymous()) { echo ''; break; } else { From 65103475365f56e527be107f03e285c40f7b1c10 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 13:59:38 -0500 Subject: [PATCH 02/13] Fixing social network UI see #190 --- main/auth/profile.php | 1 + main/css/blue_lagoon/default.css | 2 +- main/css/chamilo/default.css | 6 +++- main/inc/banner.inc.php | 2 +- whoisonline.php | 58 +++++++++++++++++--------------- 5 files changed, 39 insertions(+), 30 deletions(-) mode change 100755 => 100644 main/css/chamilo/default.css diff --git a/main/auth/profile.php b/main/auth/profile.php index c2edec9730..001672324f 100755 --- a/main/auth/profile.php +++ b/main/auth/profile.php @@ -293,6 +293,7 @@ if (is_profile_editable() && api_get_setting('profile', 'password') == 'true') { // EXTRA FIELDS $extra = UserManager::get_extra_fields(0, 50, 5, 'ASC'); + $extra_data = UserManager::get_extra_user_data(api_get_user_id(), true); foreach ($extra as $id => $field_details) { if ($field_details[6] == 0) { diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index 7ffc173428..508a56e213 100755 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -586,7 +586,7 @@ input.liteoption { width: 100%; margin: 0 auto; border: 1px solid #bbb; - border-collapse: collapse; + border-collapse: collapse; } .agenda_month_divider { background-color: #dcdcdc; diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css old mode 100755 new mode 100644 index 818699eb52..c36d100e0f --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -589,12 +589,16 @@ margin-top:0; margin: 0 0 12px 0; padding: 0; + list-style-image:none; + list-style-position:outside; + list-style-type:none; } .menulist li{ - float:left; + /* float:left; */ /* margin-left:10px; */ margin-bottom:10px; + display:list-item; } #centerwrap { float: left; diff --git a/main/inc/banner.inc.php b/main/inc/banner.inc.php index 5ea49ff6e3..c676b6b5c8 100755 --- a/main/inc/banner.inc.php +++ b/main/inc/banner.inc.php @@ -197,7 +197,7 @@ if ($_user['user_id'] && !api_is_anonymous()) { } // My Profile - if (api_get_setting('show_tabs', 'my_profile') == 'true' && api_get_setting('show_tabs', 'social') != 'true') { + if (api_get_setting('show_tabs', 'my_profile') == 'true' && api_get_setting('allow_social_tool') != 'true') { $navigation['myprofile'] = $possible_tabs['myprofile']; } else { $menu_navigation['myprofile'] = $possible_tabs['myprofile']; diff --git a/whoisonline.php b/whoisonline.php index c90e3b7085..9b9e32d90f 100755 --- a/whoisonline.php +++ b/whoisonline.php @@ -117,6 +117,7 @@ if ($_GET['chatid'] != '') { // This if statement prevents users accessing the who's online feature when it has been disabled. if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) || ((api_get_setting('showonline', 'users') == 'true' || api_get_setting('showonline', 'course') == 'true') && $_user['user_id'])) { + if(isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) { $user_list = Who_is_online_in_this_course($_user['user_id'], api_get_setting('time_limit_whosonline'), $_GET['cidReq']); } else { @@ -124,42 +125,45 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) || } $total = count($user_list); - if (!isset($_GET['id'])) { + if (!isset($_GET['id'])) { + Display::display_header(get_lang('UsersOnLineList')); - - echo '
'; - //this include the social menu div - if (!api_is_anonymous()) { - SocialManager::show_social_menu('whoisonline'); - } - echo '
'; - - if ($_GET['id'] == '') { - echo '

'.get_lang('Refresh').'

'; + + if (api_get_setting('allow_social_tool') == 'true') { + echo '
'; + //this include the social menu div + if (!api_is_anonymous()) { + SocialManager::show_social_menu('whoisonline'); + } + echo '
'; + + if ($_GET['id'] == '') { + echo '

'.get_lang('Refresh').'

'; + } /*else { + if (0) { + // if ($_user['user_id'] && $_GET["id"] != $_user['user_id']) { + echo ''.get_lang('SendChatRequest').''; + } + }*/ } else { - if (0) { - // if ($_user['user_id'] && $_GET["id"] != $_user['user_id']) { - echo ''.get_lang('SendChatRequest').''; - } + echo '
'; + echo get_lang('UsersOnLineList'); + echo '
'; } + } if ($user_list) { if (!isset($_GET['id'])) { - - echo '
'; - //this include the social menu div - if (!api_is_anonymous()) { - echo UserManager::get_search_form($_GET['q']); - } + if (api_get_setting('allow_social_tool') == 'true') { + echo '
'; + //this include the social menu div + if (!api_is_anonymous()) { + echo UserManager::get_search_form($_GET['q']); + } + } SocialManager::display_user_list($user_list); echo '
'; - /* - if (!api_is_anonymous()) { - echo UserManager::get_search_form($_GET['q']); - } - SocialManager::display_user_list($user_list); - */ } else { //individual user information - also displays header info SocialManager::display_individual_user(Security::remove_XSS($_GET['id'])); From 2355b785bb677f486e262f4572c55ba550441e11 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 14:04:55 -0500 Subject: [PATCH 03/13] Updating Chamilo license --- chamilo_license.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) mode change 100755 => 100644 chamilo_license.txt diff --git a/chamilo_license.txt b/chamilo_license.txt old mode 100755 new mode 100644 index cd5e69a452..201e1293e0 --- a/chamilo_license.txt +++ b/chamilo_license.txt @@ -1,8 +1,8 @@ =============================================================================== - Dokeos - elearning and course management software + Chamilo - elearning and course management software + Copyright (c) 2008-2010 Dokeos Latinoamérica SAC Copyright (c) 2004-2009 Dokeos SPRL - Copyright (c) 2009 Dokeos Latinoamérica SAC Copyright (c) 2003-2007 Ghent University (UGent) Copyright (c) 2001 Universite catholique de Louvain (UCL) Copyright (c) 2003-2008 Vrije Universiteit Brussel (VUB) @@ -10,7 +10,7 @@ Copyright (c) Facultad de Matematicas, UADY (México) (Message plugin) For a full list of contributors detaining copyrights over parts of - the Dokeos software, see "documentation/credits.html". + the Chamilo software, see "documentation/credits.html". The full license can be read in "documentation/license.html". This program is free software; you can redistribute it and/or @@ -20,7 +20,6 @@ See the GNU General Public License for more details. - Contact address: Dokeos, Rue du Corbeau, 108, B-1030 Brussels, Belgium - Mail: info@dokeos.com + Mail: info@chamilo.org =============================================================================== This license is referenced throughout the code using the following header line: From 98f73c98ecd4cc5d1faff7d35d95b64c9a3c53f8 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 14:05:59 -0500 Subject: [PATCH 04/13] Updating footer --- main/inc/footer.inc.php | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/main/inc/footer.inc.php b/main/inc/footer.inc.php index 4e7f5d25f3..368af98878 100755 --- a/main/inc/footer.inc.php +++ b/main/inc/footer.inc.php @@ -1,10 +1,10 @@ Dokeos ', $_configuration['dokeos_version'], ' © ', date('Y'); +echo get_lang("Platform"), ' Chamilo ', $_configuration['dokeos_version'], ' © ', date('Y'); // Server mode indicator. if (api_is_platform_admin()) { if (api_get_setting('server_type') == 'test') { @@ -58,14 +58,11 @@ if (api_is_platform_admin()) { api_plugin('footer'); if (api_get_setting('show_administrator_data')=='true') { - // Platform manager echo '', get_lang('Manager'), ' : ', Display::encrypted_mailto_link(api_get_setting('emailAdministrator'), api_get_person_name(api_get_setting('administratorName'), api_get_setting('administratorSurname'))); - } -if (api_get_setting('show_tutor_data')=='true'){ - +if (api_get_setting('show_tutor_data')=='true') { // course manager $id_course=api_get_course_id(); $id_session=api_get_session_id(); @@ -73,13 +70,12 @@ if (api_get_setting('show_tutor_data')=='true'){ echo ''; if ($id_session!=0){ $coachs_email=CourseManager::get_email_of_tutor_to_session($id_session,$id_course); - - $email_link = array(); - foreach ($coachs_email as $coach_email) { - foreach ($coach_email as $email=>$username) { - $email_link[] = Display::encrypted_mailto_link($email,$username); - } - } + $email_link = array(); + foreach ($coachs_email as $coach_email) { + foreach ($coach_email as $email=>$username) { + $email_link[] = Display::encrypted_mailto_link($email,$username); + } + } echo ' '.get_lang('Coachs')." : ".implode(" | ",$email_link); } echo ''; @@ -109,11 +105,9 @@ if (api_get_setting('show_teacher_data')=='true') { } echo ''; } - } - ?> 
- + \ No newline at end of file From 8027e74322624f30711fe14e4177397a5864f680 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 14:09:22 -0500 Subject: [PATCH 05/13] Changing DLTT to Chamilo --- main/admin/index.php | 8 ++++---- main/install/install_upgrade.lib.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/main/admin/index.php b/main/admin/index.php index aad8a0e420..069e42feb4 100755 --- a/main/admin/index.php +++ b/main/admin/index.php @@ -273,11 +273,11 @@ if(api_is_platform_admin()){ }*/ ?>
-

Dokeos.com

+

Chamilo.org

    -
    • -
    • -
    • +
    • +
    • +
  • Permission problems.
    Try initially with chmod -R 777 and increase restrictions gradually.
  • PHP is running in Safe-Mode. If possible, try to switch it off.
- Read about this problem in Support Forum

+ Read about this problem in Support Forum

Please go back to step 5.

'; From e9a02e3fca4ecf8011bfb18d8c5f1603e79317d5 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 14:24:21 -0500 Subject: [PATCH 06/13] Fixing user image for 1024x768 resolution --- main/auth/profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/auth/profile.php b/main/auth/profile.php index 001672324f..6c9cb300a3 100755 --- a/main/auth/profile.php +++ b/main/auth/profile.php @@ -852,7 +852,7 @@ if (api_get_setting('allow_social_tool') == 'true') { } else { // Style position:absolute has been removed for Opera-compatibility. //echo '
'; - echo '
'; + echo '
'; if ($image == 'unknown.jpg') { echo ''; From af665f995276b516cbc2fd11b1fc1367b1e74115 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 14:48:12 -0500 Subject: [PATCH 07/13] Fixing message tool when social network is off see #190 --- main/css/blue_lagoon/default.css | 18 ++++-- main/inc/lib/message.lib.php | 94 ++++++++++++++------------------ main/messages/outbox.php | 4 ++ 3 files changed, 60 insertions(+), 56 deletions(-) diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index 508a56e213..afeceb5258 100755 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -2935,7 +2935,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus { background-image:url(images/shadow.gif); } .independent_course_item a { - font-size:120%; + font-size:135%; } .session_course_item a { font-size:120%; @@ -2948,14 +2948,24 @@ a.read { } #inbox-wrapper { width:100%; - } +} #inbox { - width:80%; - float:right; + height:auto; + margin-left:auto; + margin-right:auto; + overflow:hidden; +} +#outbox { + height:auto; + margin-left:auto; + margin-right:auto; + overflow:hidden; } + #inbox-menu { width:150px; float:left; + margin-right:10px; } #inbox-menu ul { list-style-image:none; diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php index 4081493d2f..434cc5f3a6 100755 --- a/main/inc/lib/message.lib.php +++ b/main/inc/lib/message.lib.php @@ -1,5 +1,5 @@ '; } else { $message[0] = ($result[0]); } if ($request===true) { - if($result[4]==0) { + + /*if($result[4]==0) { $message[1] = Display::return_icon('mail_open.png',get_lang('AlreadyReadMessage'));//Message already read } else { $message[1] = Display::return_icon('mail.png',get_lang('UnReadMessage'));//Message without reading - } + }*/ - $message[2] = ''.GetFullUserName($result[1]).''; - $message[3] = ''.str_replace("\\","",$result[2]).''; - $message[5] = ''.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).''. + $message[1] = ''.GetFullUserName($result[1]).''; + $message[2] = ''.str_replace("\\","",$result[2]).''; + $message[4] = ''.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).''. '  '.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).''; } else { if($result[4]==1) { $class = 'class = "unread"'; } else { $class = 'class = "read"'; - } - - $link = ''; - + } + $link = ''; if ($_GET['f']=='social') { $link = '&f=social'; } - - $message[2] = ''.GetFullUserName(($result[1])).'';; - $message[3] = ''.$result[2].''; - $message[5] = ''.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).''. + $message[1] = ''.GetFullUserName(($result[1])).'';; + $message[2] = ''.$result[2].''; + $message[4] = ''.Display::return_icon('message_reply.png',get_lang('ReplyToMessage')).''. '  '.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).''; } - $message[4] = ($result[3]); //date stays the same + $message[3] = $result[3]; //date stays the same foreach($message as $key => $value) { $message[$key] = api_xml_http_response_encode($value); } $message_list[] = $message; - $i++; } return $message_list; @@ -564,7 +561,6 @@ class MessageManager } /** * Gets information about messages sent - * @author Isaac FLores Paz * @param integer * @param integer * @param string @@ -589,6 +585,7 @@ class MessageManager $i = 0; $message_list = array (); while ($result = Database::fetch_row($sql_result)) { + if ($request===true) { $message[0] = ''; } else { @@ -597,31 +594,29 @@ class MessageManager $class = 'class = "read"'; - if ($request===true) { - if ($result[5]==4) { - $message[1] = Display::return_icon('mail_send.png',get_lang('MessageSent'));//Message Sent - } - - $message[2] = ''.GetFullUserName($result[4]).''; - $message[3] = ''.str_replace("\\","",$result[2]).''; - $message[5] = '  '.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).''; + if ($request===true) { + $message[1] = ''.GetFullUserName($result[4]).''; + $message[2] = ''.str_replace("\\","",$result[2]).''; + $message[3] = $result[3]; //date stays the same + $message[4] = '  '.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).''; } else { $link = ''; if ($_GET['f']=='social') { $link = '&f=social'; - } - - $message[2] = ''.GetFullUserName($result[4]).''; - $message[3] = ''.$result[2].''; - $message[5] = ''.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).''; + } + $message[1] = ''.GetFullUserName($result[4]).''; + $message[2] = ''.$result[2].''; + $message[3] = $result[3]; //date stays the same + $message[4] = ''.Display::return_icon('message_delete.png',get_lang('DeleteMessage')).''; } - $message[4] = $result[3]; //date stays the same + foreach($message as $key => $value) { $message[$key] = $value; } $message_list[] = $message; $i++; } + return $message_list; } /** @@ -1164,8 +1159,7 @@ function inbox_display() { // $charset = api_get_setting('platform_charset'); $table_message = Database::get_main_table(TABLE_MESSAGE); $request=api_is_xml_http_request(); - if ($_SESSION['social_exist']===true) { - $redirect="#remote-tab-2"; + if ($_SESSION['social_exist']===true) { if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') { $success= get_lang('SelectedMessagesDeleted'); } else { @@ -1195,11 +1189,11 @@ function inbox_display() { $table->set_header(0, '', false,array ('style' => 'width:20px;')); $title=api_xml_http_response_encode(get_lang('Title')); $action=api_xml_http_response_encode(get_lang('Actions')); - $table->set_header(1,api_xml_http_response_encode(get_lang('Status')),false,array('style' => 'width:30px;')); - $table->set_header(2,api_xml_http_response_encode(get_lang('From')),false); - $table->set_header(3,$title,false); - $table->set_header(4,api_xml_http_response_encode(get_lang('Date')),false,array('style' => 'width:150px;')); - $table->set_header(5,$action,false,array ('style' => 'width:100px;')); + + $table->set_header(1,api_xml_http_response_encode(get_lang('From')),false); + $table->set_header(2,$title,false); + $table->set_header(3,api_xml_http_response_encode(get_lang('Date')),false, array('style' => 'width:150px;')); + $table->set_header(4,$action,false,array ('style' => 'width:70px;')); if ($_REQUEST['f']=='social') { $parameters['f'] = 'social'; @@ -1242,11 +1236,8 @@ function outbox_display() { $social_link = false; if ($_REQUEST['f']=='social') { $social_link ='f=social'; - } - - - if ($_SESSION['social_exist']===true) { - + } + if ($_SESSION['social_exist']===true) { if (api_get_setting('allow_social_tool')=='true' && api_get_setting('allow_message_tool')=='true') { $success= get_lang('SelectedMessagesDeleted')." 
".get_lang('BackToOutbox').""; }else { @@ -1273,19 +1264,18 @@ function outbox_display() { break; } } - // display sortable table with messages of the current user $table = new SortableTable('messages', 'get_number_of_messages_send_mask', 'get_message_data_send_mask', 3, get_number_of_messages_send_mask(), 'DESC'); - $title=api_xml_http_response_encode(get_lang('Title')); - $action=api_xml_http_response_encode(get_lang('Actions')); + $title =get_lang('Title'); + $action=get_lang('Actions'); + $table->set_header(0, '', false,array ('style' => 'width:20px;')); - $table->set_header(1, api_xml_http_response_encode(get_lang('Status')),false,array ('style' => 'width:30px;')); - $table->set_header(2, api_xml_http_response_encode(get_lang('To')),false); - $table->set_header(3, $title,false); - $table->set_header(4, api_xml_http_response_encode(get_lang('Date')),false,array ('style' => 'width:150px;')); - $table->set_header(5,$action, false,array ('style' => 'width:100px;')); + $table->set_header(1, api_xml_http_response_encode(get_lang('To')),false); + $table->set_header(2, $title,false); + $table->set_header(3, api_xml_http_response_encode(get_lang('Date')),false,array ('style' => 'width:150px;')); + $table->set_header(4,$action, false,array ('style' => 'width:50px;')); if ($_REQUEST['f']=='social') { $parameters['f'] = 'social'; diff --git a/main/messages/outbox.php b/main/messages/outbox.php index 9bf155f326..fa6a21e0ed 100755 --- a/main/messages/outbox.php +++ b/main/messages/outbox.php @@ -153,7 +153,11 @@ echo '
'; MessageManager::delete_message_by_user_sender(api_get_user_id(), $delete_list_id[$i]); } $delete_list_id=array(); + + //------------------------ outbox_display(); + //------------------------ + } elseif ($_REQUEST['action']=='deleteone') { $delete_list_id=array(); $id=Security::remove_XSS($_GET['id']); From 72a1a016070912e908da5fc8d78caecca2aa246e Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 14:55:05 -0500 Subject: [PATCH 08/13] Fixing social network UI see #190 --- main/auth/profile.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/auth/profile.php b/main/auth/profile.php index 6c9cb300a3..288dc22558 100755 --- a/main/auth/profile.php +++ b/main/auth/profile.php @@ -836,7 +836,7 @@ if (api_get_setting('allow_social_tool') == 'true') { // Style position:absolute has been removed for Opera-compatibility. //echo '
'; - echo '
'; + echo '
'; if ($image == 'unknown.jpg') { echo ''; From 1cc2e591193c782ba2b370264d53d00ef5bd76ba Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 15:00:35 -0500 Subject: [PATCH 09/13] Adding validation --- main/social/invitations.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/main/social/invitations.php b/main/social/invitations.php index bbf23bea5c..c422137c85 100755 --- a/main/social/invitations.php +++ b/main/social/invitations.php @@ -72,13 +72,15 @@ if (is_array($_GET) && count($_GET)>0) { foreach($_GET as $key => $value) { switch ($key) { case 'accept': - $user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $value); + $user_role = GroupPortalManager::get_user_group_role(api_get_user_id(), $value); if (in_array($user_role , array(GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER,GROUP_USER_PERMISSION_PENDING_INVITATION))) { GroupPortalManager::update_user_role(api_get_user_id(), $value, GROUP_USER_PERMISSION_READER); $show_message = get_lang('UserIsSubscribedToThisGroup'); + } elseif (in_array($user_role , array(GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR))) { + $show_message = get_lang('UserIsAlreadySubscribedToThisGroup'); } else { $show_message = get_lang('UserIsNotSubscribedToThisGroup'); - } + } break 2; case 'deny': // delete invitation @@ -88,15 +90,10 @@ if (is_array($_GET) && count($_GET)>0) { } } } - - - $language_variable = get_lang('PendingInvitations'); $language_comment = get_lang('SocialInvitesComment'); - - echo '
'; echo '
'; From abef805a06b686c9493e24631f5cec752fb6b84a Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 15:31:33 -0500 Subject: [PATCH 10/13] Fixing social network UI see #190 --- main/css/blue_lagoon/default.css | 9 +- main/css/chamilo/default.css | 2 +- main/social/invitations.php | 221 ++++++++++++++++--------------- 3 files changed, 119 insertions(+), 113 deletions(-) diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index afeceb5258..3a01b45a5a 100755 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -43,7 +43,7 @@ body { /* for content section in main index.php file */ .maincontent { float: left; - width: 67%; + width: 66%; padding: 4px; background-color: #fff; } @@ -389,8 +389,9 @@ default.css (línea 362) width: auto; margin: 24px 6px 0 6px; padding-left: 10px; - border: 1px solid #ccc; + border: 1px dotted #ddd; background-color: #FFF; + } .menusectioncaption { position: relative; @@ -2201,7 +2202,7 @@ div.comments { background:#FFF; border:1px dotted #ccc; padding: 0px 10px 0 10px; -/* width:50%; */ + width:120px; position:relative; } .message-content .message-delete { @@ -3322,7 +3323,7 @@ a.read { -webkit-border-radius: 10px; border: 1px solid #e1e1e0; -opera-border-radius: 10px; border: 1px solid #e1e1e0; - width:270px; + width:280px; margin-top:20px; margin-right:10px; margin-bottom:40px; diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index c36d100e0f..7d998cd684 100644 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -1493,8 +1493,8 @@ div.admin_section { float: left; padding: 5px; margin: 10px 20px; - } + div.admin_section h4 { margin: 0; border-bottom: 1px solid #E1E1E0; diff --git a/main/social/invitations.php b/main/social/invitations.php index c422137c85..8027a7fb48 100755 --- a/main/social/invitations.php +++ b/main/social/invitations.php @@ -107,118 +107,123 @@ echo '
'; Display :: display_normal_message($show_message); } - echo '
'; - $list_get_invitation=array(); - $user_id = api_get_user_id(); - - $list_get_invitation = SocialManager::get_list_invitation_of_friends_by_user_id($user_id); - $list_get_invitation_sent = SocialManager::get_list_invitation_sent_by_user_id($user_id); - $pending_invitations = GroupPortalManager::get_groups_by_user($user_id, GROUP_USER_PERMISSION_PENDING_INVITATION); - - $number_loop=count($list_get_invitation); - - if ($number_loop != 0) { - echo '

'.get_lang('InvitationReceived').'

'; - - foreach ($list_get_invitation as $invitation) { - $sender_user_id = $invitation['user_sender_id'] - ?> -
- - - - - - - - -
- - /> - - -
- -
-
- -
-
- - -
-
-
-
'; + echo '
'; + $list_get_invitation=array(); + $user_id = api_get_user_id(); + + $list_get_invitation = SocialManager::get_list_invitation_of_friends_by_user_id($user_id); + $list_get_invitation_sent = SocialManager::get_list_invitation_sent_by_user_id($user_id); + $pending_invitations = GroupPortalManager::get_groups_by_user($user_id, GROUP_USER_PERMISSION_PENDING_INVITATION); + $number_loop = count($list_get_invitation); + + $total_invitations = $number_loop + count($list_get_invitation_sent); + if ($total_invitations == 0 ) { + echo ''.get_lang('TryAndFindSomeFriends').''; + } + + + if ($number_loop != 0) { + echo '

'.get_lang('InvitationReceived').'

'; - if (count($list_get_invitation_sent) > 0 ){ - echo '

'.get_lang('InvitationSent').'

'; - foreach ($list_get_invitation_sent as $invitation) { - $sender_user_id = $invitation['user_receiver_id'];?> -
- - - - - - - - -
- - /> - - -
- -
-
- -
-
-
+ foreach ($list_get_invitation as $invitation) { + $sender_user_id = $invitation['user_sender_id'] + ?> +
+ + + + + + + + +
+ + /> + + +
+ +
+
+ +
+
+ + +
+
+
0) { - echo '

'.get_lang('GroupsWaitingApproval').'

'; - $new_invitation = array(); - foreach ($pending_invitations as $invitation) { - $picture = GroupPortalManager::get_picture_group($invitation['id'], $invitation['picture_uri'],80); - $img = ''; - - $invitation['picture_uri'] = ''.$img.''; - $invitation['name'] = ''.cut($invitation['name'],120,true).''; - $invitation['join'] = ''.get_lang('AcceptInvitation').''; - $invitation['deny'] = ''.get_lang('DenyInvitation').''; - $invitation['description'] = cut($invitation['description'],220,true); - //$invitation['send_message'] = ''; - //$invitation['send_message'] .= Display::return_icon('message_new.png').'  '.get_lang('SendMessage').''; - $new_invitation[]=$invitation; - } - Display::display_sortable_grid('waiting_user', array(), $new_invitation, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false,false,true,true,true,true)); + } + echo '
'; + + if (count($list_get_invitation_sent) > 0 ){ + echo '

'.get_lang('InvitationSent').'

'; + foreach ($list_get_invitation_sent as $invitation) { + $sender_user_id = $invitation['user_receiver_id'];?> +
+ + + + + + + + +
+ + /> + + +
+ +
+
+ +
+
+
+ 0) { + echo '

'.get_lang('GroupsWaitingApproval').'

'; + $new_invitation = array(); + foreach ($pending_invitations as $invitation) { + $picture = GroupPortalManager::get_picture_group($invitation['id'], $invitation['picture_uri'],80); + $img = ''; + + $invitation['picture_uri'] = ''.$img.''; + $invitation['name'] = ''.cut($invitation['name'],120,true).''; + $invitation['join'] = ''.get_lang('AcceptInvitation').''; + $invitation['deny'] = ''.get_lang('DenyInvitation').''; + $invitation['description'] = cut($invitation['description'],220,true); + //$invitation['send_message'] = ''; + //$invitation['send_message'] .= Display::return_icon('message_new.png').'  '.get_lang('SendMessage').''; + $new_invitation[]=$invitation; } + Display::display_sortable_grid('waiting_user', array(), $new_invitation, array('hide_navigation'=>true, 'per_page' => 100), $query_vars, false, array(true, true, true,false,false,true,true,true,true)); + } echo '
'; echo '
'; From 1d82e4a135cf34bd7ad74655dbfc8b274c4a478e Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 16:49:54 -0500 Subject: [PATCH 11/13] Fixing social network UI see #190 + updating Chamilo CSS --- main/css/chamilo/default.css | 776 +++++++++++++++++++++++++++++---- main/inc/banner.inc.php | 11 +- main/messages/inbox.php | 4 +- main/messages/new_message.php | 2 +- main/messages/outbox.php | 2 +- main/messages/view_message.php | 2 +- main/social/home.php | 4 +- 7 files changed, 702 insertions(+), 99 deletions(-) diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index 7d998cd684..a5945c0673 100644 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -303,6 +303,7 @@ input[text] { #my_courses { float:left; padding-left:4%; + height:16px; } /******************************************************** * HEADER 2: Users online, help, student/teacher view * @@ -385,32 +386,32 @@ input[text] { } #header3 a { --moz-background-clip:border; --moz-background-inline-policy:continuous; --moz-background-origin:padding; -background:transparent url(images/tab_left.gif) no-repeat scroll left top; -color:#fff; -cursor:pointer; -float:left; -height:25px; -padding-left:9px; -padding-right:1px; -text-decoration:none; + -moz-background-clip:border; + -moz-background-inline-policy:continuous; + -moz-background-origin:padding; + background:transparent url(images/tab_left.gif) no-repeat scroll left top; + color:#fff; + cursor:pointer; + float:left; + height:25px; + padding-left:9px; + padding-right:1px; + text-decoration:none; } #header3 li a span { --moz-background-clip:border; --moz-background-inline-policy:continuous; --moz-background-origin:padding; -background:transparent url(images/tab_right.gif) no-repeat scroll right top; -color:#fff; -cursor:pointer; -display:block; -float:left; -height:20px; -padding-right:10px; -padding-top:5px; + -moz-background-clip:border; + -moz-background-inline-policy:continuous; + -moz-background-origin:padding; + background:transparent url(images/tab_right.gif) no-repeat scroll right top; + color:#fff; + cursor:pointer; + display:block; + float:left; + height:20px; + padding-right:10px; + padding-top:5px; } #header3 .banner_links { @@ -494,7 +495,7 @@ margin-top:0; padding: 4px; padding-left: 20px; clear:right; - + height:14px; } #header4 a { color: #666; @@ -746,7 +747,7 @@ this lets the navigation menu appear to the left: -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px; border:1px solid #E1E1E0; - width:100%; + /* width:100%; */ } #formLogin label { font-size: 12px; @@ -763,7 +764,7 @@ this lets the navigation menu appear to the left: -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px; border:1px solid #E1E1E0; - width:100%; + /*width:100%;*/ } #login_fail { @@ -2400,23 +2401,22 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} background-color: #E5EDF9; border: 1px solid #bbb; } + /********************************************** * MESSAGE TOOL * **********************************************/ - -/* styles from the new_message.php file */ .message_view_table { cellspacing:0; cellpadding:0; background-color:#dbeaf5; - border:0; + border=0; border-collapse: collapse; width: 100%; } .message_view_table th { padding-right: 12px; border: 1px solid gray; - background-color: #E5EDF9; + background-color: #f0f0f0; } .message-select-box { float:left; @@ -2426,14 +2426,13 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} margin-left:20px; } /* styles from the my.profile.php file */ - .message-content { float:right; margin:0px 10px; background:#FFF; border:1px dotted #ccc; padding: 0px 10px 0 10px; -/* width:50%; */ + width:138px; position:relative; } .message-content .message-delete { @@ -2445,8 +2444,8 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} .message-content-internal { display:inline; margin:20px auto; - background:#E5EDF9; - border:2px solid #E5EDF9; + background:#F5E38E; + border:2px solid #EBCA4F; padding:10px; width:100px; position:relative; @@ -2454,7 +2453,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} margin-right:-100px; } .message-title { - color:#ff0000; +/* color:#ff0000; */ font-size:12px; } .message-body { @@ -2468,8 +2467,8 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} .message-view { float:right; margin:20px auto; - background:#E5EDF9; - border:2px solid #E5EDF9; + background:#F5E38E; + border:2px solid #EBCA4F; padding:10px; width:100px; position:relative; @@ -2489,6 +2488,397 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} margin: 0px; padding: 0px; } + +/*SOCIAL TOOL*/ +div.image-social-content { + float:left; + border:1px dotted #ccc; + margin:2px; + padding: 8px 4px 4px 4px; + background: #ffffff; + height:105px; + width:82px; + z-index:5; + cursor:pointer; + position:relative; + overflow:hidden; +} +div.image-social-content span { + overflow:hidden; + display:block; + height:75px; +} +div.image-social-content img { + vertical-align:middle; +} +div.image-social-content center.friend { + overflow:hidden; + height:30px; +} +.image-social-content .image-delete { + position: absolute; + top: 1px; + right: 1px; + cursor: pointer; +} +.social-info { + background:#B8C8DC; + color:#4475B0; + font-size:12px; + font-weight:bold; +} +.social-display-image { + float:right; + margin-top:-130px; + margin-right:5px; +} +.social-search-image { + color:#000033; + margin-top:2px; + width:200px; +} +.social-subtitle-search { + background:#ffffff; + border-top:1px #9DACBF solid; + border-bottom:1px #9DACBF solid; +} +.social-align-box { + text-align:left; + float:left; +} +.social-header { + margin-bottom:8px; +} +#social-content { + width:100%; + height:auto; + overflow:hidden; + margin-left:auto; + margin-right:auto; +} +#social-content-right { + height:auto; + overflow:hidden; +} + +.social-content-image { + margin-bottom:10px; + margin-top:2px; +} + +#social-content-left { + float:left; + height:auto; + margin-right:16px; + min-height:300px; + width:200px; + overflow:hidden; +} +.social-content-description { + background:#ECE9D8; +} +.social-content-body { + background:#ffffff; +} +.social-content-table { + border-top:1px #9DACBF solid; + border-left:1px #9DACBF solid; + border-right:1px #9DACBF solid; + border-bottom:1px #9DACBF solid; +} +.social-profile-info dt { + text-align:left; + clear:left; + float:left; + width:80px; +} +.social-profile-info dd { + padding:1px 0px 3px 0px; + float:left; + margin:0; + display : block; + padding-left:10px; + width:200px; +} + +/* general layout of the profile page */ + +#social-profile-wrapper { + width: 100%; + text-align:left; + margin:0 auto; + float: left; +} +#social-profile-container { + /* width: 705px; */ +} +#social-profile-left { + float:left; + width:22%; +} +#social-profile-content { + float:right; + width:47%; + margin-left: 4px; +} +#social-profile-right { + float:right; + width:30%; + margin-left: 4px; +} + +/* SOCIAL MENU VERTICAL */ +.social-menu { + width:180px; + height:auto; +} +.social-menu ul { + list-style-image:none; + list-style-position:outside; + list-style-type:none; + margin:0; + padding:0px; +} +.social-menu li { + margin-bottom:4px; + padding-bottom:12px; + background-image:url(../../img/line-social.jpg); + background-position:bottom; + background-repeat:repeat-x; +} +.social-menu li img { + float:left; +} +.social-menu-sub-level a img { + float:left; +} +.social-menu ul li a { + padding:2px 0px; +} +.social-menu-sub-level { + margin-left:20px; +} +.social-menu-title{ + width:180px; + float:left; + height:auto; + background-color:#00AAE3; + margin-bottom:10px; + padding-top:4px; + padding-bottom:4px; +} +.social-menu-text1 { + color:#fff; + font-size:12px; + font-weight:bold; +} +.social-menu-text2 { + color:#000; + font-weight:normal; + font-size:12px; +} +.social-menu-text3 { + color:#94cdf9; + font-weight:normal; + font-size:12px; + font-weight:bold; +} +.social-menu-text4 { + font-family:Verdana, Geneva, sans-serif; + color:#000; + font-weight:normal; + font-size:13px; + vertical-align:bottom; +} +.social-menu-text-active { + font-family:Verdana, Geneva, sans-serif; + color:#000; + font-weight:bold; + font-size:12px; + vertical-align:bottom; +} +.social-menu-title-right { + width:84%; + float:right; + height:20px; + background-color:#32578b; + margin-bottom:10px; +} + +/* BOX SHARED PROFILE */ + +.social-friend-container { + width:100%; + overflow:hidden; +} + +.shared_profile_mygroups_grid_container { + width:100%; + overflow:hidden; +} +.shared_profile_mygroups_grid_item { + width:42%; + float:left; + height:140px; + margin:20px; +} + + +.social-menu-group-member { + float:left; + height:120px; + margin:5px; + overflow:hidden; + padding:2px; + width:76px; +} + +/* SOCIAL BOX */ + +.social-box-main1 { + width:100%; + height:auto; + overflow:hidden; +} +.social-box-left { + width:350px; + float:left; + height:auto; +} +.social-box-right { + width:350px; + float:left; + height:auto; + margin-left:50px; +} +.social-box-container1 { + width:350px; + height:auto; + margin-top:10px; +} +.social-box-content1 { + width:330px; + height:auto; + padding-left:15px; + padding-right:10px; + background-image:url(../../img/boxmygroupscontent.jpg); + background-repeat:repeat-y; + overflow:hidden; +} +.social-box-main2 { + height:auto; + overflow:hidden; + width:700px; +} +.social-box-container2 { + width:700px; + height:auto; + overflow:hidden; + margin-bottom:20px; +} +.social-box-content2 { + width:660px; + background-image:url(../../img/content-post-group2.jpg); + background-repeat:repeat-y; + padding-left:20px; + padding-right:20px; +} +.social-box-container3 { + width:110px; + margin-left:60px; +} +.social-box-content3 { + width:560px; + height:auto; + padding-left:20px; + padding-right:20px; + background-image:url(../../img/content-post-reply02.jpg); + background-repeat:repeat-y; +} + +.box_shared_profile_group_title { + border-bottom:1pt dotted #000; + padding:5px; + vertical-align:middle; + font-size:12pt; + font-weight:bold; + margin-bottom:5px +} +.box_shared_profile_group_description { + height:100px; + margin-left:65px; +} +.box_shared_profile_group_image { + height:80px; + width:60px; + float:left; +} +.box_shared_profile_group_actions { + text-align:right; +} + +.social-groups-text1 { + font-family:Verdana, Geneva, sans-serif; + font-size:12px; + color:#669; +} +.social-groups-text2 { + font-family:Verdana, Geneva, sans-serif; + font-size:12px; + color:#686868; + font-weight:bold; +} +.social-groups-text3 { + font-family:Verdana, Geneva, sans-serif; + font-size:12px; + color:#000; + font-weight:bold; + text-transform:capitalize; + margin-top:5px; +} +.social-groups-text4 { + font-family:Verdana, Geneva, sans-serif; + font-size:12px; + color:#666666; +} +.social-groups-image { + border: 2px solid #cac9c9; +} +.social-groups-home-title { + border-bottom:1pt dotted #000; + padding:2px; + margin-bottom:5px; + font-weight:bold; +} +.social-home-users-online { + border:3px solid #E6E6E6; +} + +#social-content-online { + background-color:#00AAE3; + margin-bottom:5px; + margin-top:2px; + padding:1px; +} + +#social-group-details { + margin-left:82px; +} +.social-group-details-info span { + color:#777; + +} + + + + + + + + + + + /********************************************** * EXERCISE TOOL * **********************************************/ @@ -2755,15 +3145,14 @@ div.image-social-content center.friend { .social-content-image { margin-top:4px; margin-right:5px; - background:#a0e5fc; - border-left:1px #999999 dotted; - border-top:1px #999999 dotted; - border-right:1px #999999 dotted; - border-bottom:1px #999999 dotted; + /* background:#a0e5fc; */ + border:1px #ddd dotted; } + .social-background-content { - background:#a0e5fc; + /* background:#a0e5fc; */ } + .social-content-information { margin-left:10px; margin-right:10px; @@ -2829,7 +3218,7 @@ button.add, button.save, button.cancel, button.refresh, button.upload, button.se } /* POSITIVE */ button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back { - background-color:#fff; + background-color:#; border-color: #fff; } button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover { @@ -3070,6 +3459,7 @@ button.arrowl { } +/* UI improvements for 1.8.6.2 this should be move to the chamilo theme and reproduce in all CSS*/ * { outline :none; @@ -3092,42 +3482,42 @@ input, select, textarea { line-height:normal; padding:5px; } - input[type="text"]:focus, input[type="password"]:focus, textarea:focus { background-image:url(images/shadow.gif); } - .independent_course_item a { - font-size:120%; + font-size:135%; } - .session_course_item a { font-size:120%; } - - #maincontent .courseslist li { margin-bottom:8px; } - a.read { font-weight:normal; } - -a.unread { - +#inbox-wrapper { + width:100%; +} +#inbox { + height:auto; + margin-left:auto; + margin-right:auto; + overflow:hidden; +} +#outbox { + height:auto; + margin-left:auto; + margin-right:auto; + overflow:hidden; } - - -#inbox-wrapper {width:100%;} - -#inbox {width:80%;float:right;} #inbox-menu { width:150px; float:left; + margin-right:10px; } - #inbox-menu ul { list-style-image:none; list-style-position:outside; @@ -3135,23 +3525,15 @@ a.unread { margin:0; padding:0px; } -#inbox-menu ul li{ - +#inbox-menu ul li { padding:2px 0px; } - -#message-reply-link { - float:right; -} - .social-plugin-item { float:left; width:50%; background-color:#ccc; margin: 0px; } - - #social-plugins { float:left; background-color:#f00; @@ -3159,17 +3541,9 @@ a.unread { margin: 0px; padding:2px; } - -.groups_grid_item { - width:80px; - float:left; - margin:5px; -} - -.groups_grid_container { - +#message-reply-link { + float:right; } - .message-item { -moz-background-clip:border; -moz-background-inline-policy:continuous; @@ -3182,7 +3556,6 @@ a.unread { margin:0 0 5px; padding:10px; } - .message-topic { -moz-background-clip:border; -moz-background-inline-policy:continuous; @@ -3196,7 +3569,6 @@ a.unread { padding:10px; } - .message-group-title-topic { font-size:180%; margin:5px 0px 5px 0px; @@ -3204,21 +3576,21 @@ a.unread { .message-group-title { font-size:120%; } - .message-group-author { margin:5px 0px 5px 0px; } - .message-group-content { line-height:150%; margin: 5px 0px 8px 0px; } - +.message-group-date { + color:#666; + float:right; +} .view-message-content { line-height:150%; font-size:110%; } - .actions { background:#efefef; border:1px solid #ccc; @@ -3226,7 +3598,6 @@ a.unread { margin-bottom: 5px; vertical-align:middle; } - .actions-title { background:#efefef; border:1px solid #ccc; @@ -3271,8 +3642,114 @@ a.unread { } /* Groups boxes */ -.groups_grid_container { width:100%;} + +.groups_grid_container { + width:100%; +} .groups_grid_item { + width:80px; + float:left; + margin:5px; +} +.groups_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;} +.groups_grid_element_1 { width:100px; float:left; text-align:left; margin-bottom:5px;} +.groups_grid_element_2 { width:150px; float:left;} + +/*POPULAR GROUP*/ +.popular_grid_item { + float:left; + 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; +} + +/*NEWEST GROUP*/ + +.newest_grid_item { + float:left; + 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; +} + +/*MY GROUPS*/ + +.mygroups_grid_item { + float:left; + width:350px; + height:165px; + margin-top:20px; +} + +.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:45px; + font-family:Verdana, Geneva, sans-serif; + font-size:12px; + color:#666666; +} +.box_description_group_actions { + float:right; + width:80%; + text-align:right; + margin-top:4px; + margin-right:4px; +} + +//.mygroups_grid_element_2 { width:400px; float:left; text-align:justify;} + +/*PROFILE*/ +.profile_grid_container { width:100%;} +.profile_grid_item { + border:1px dotted #CCCCCC; + float:left; + height:90px; + margin:5px; + padding:5px; + width:270px; +} +.profile_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;} +.profile_grid_element_1 { width:170px; float:left; text-align:left; margin-bottom:1px; } + + +/* Groups boxes */ + +.group_invitation_grid_container { width:100%;} +.group_invitation_grid_item { border:1px dotted #CCCCCC; float:left; height:85px; @@ -3280,10 +3757,47 @@ a.unread { padding:5px; width:300px; } -.groups_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;} -.groups_grid_element_1 { width:100px; float:left; text-align:left;margin-bottom:5px;} -.groups_grid_element_2 { width:150px; float:left;} +.group_invitation_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;} +.group_invitation_grid_element_1 { width:100px; float:left; text-align:left;margin-bottom:5px;} +.group_invitation_grid_element_2 { width:150px; float:left;} + + +/* home group boxes */ + +.home_group_grid_container { + margin-bottom:60px; +} +.home_group_grid_element_1 { + font-family:Verdana, Geneva, sans-serif; + font-size:12px; + color:#686868; + font-weight:bold; + margin:2px; + padding:2px; +} +.home_group_grid_element_2 { + float:right; + width:80%; + height:45px; + font-family:Verdana, Geneva, sans-serif; + font-size:12px; + color:#666666; +} +/*INVITATION IN PROFILE*/ +.invitation_profile_grid_container { width:100%;} +.invitation_profile_grid_item { + border:1px dotted #CCCCCC; + float:left; + height:110px; + margin:5px; + padding:5px; + width:100px; +} +.invitation_profile_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;} +.invitation_profile_grid_element_0 img {width:50px;height:50px;border:3px solid #E6E6E6;} +.invitation_profile_grid_element_2 { width:100px; float:left; text-align:center;} +.invitation_profile_grid_element_3 { width:100px; float:left; text-align:center;} /* User boxes */ .search_users_grid_container { width:100%;} @@ -3295,3 +3809,87 @@ a.unread { .search_users_grid_selectbox { width:50%; float:left;} .search_users_grid_title { width:30%; float:left;} .search_users_grid_nav { float:right;} + +/*WAITING USER*/ +.waiting_user_grid_container { width:100%;} +.waiting_user_grid_item { width:500px; height: 120px; border:1px dotted #ccc; float:left; padding:5px; margin:5px;} +.waiting_user_grid_element_0 { width:100px; height: 90px; float:left; text-align:center; margin-bottom:5px; padding-top:15px;} +.waiting_user_grid_element_1 { width:400px; float:left; text-align:left; margin-bottom:5px} +.waiting_user_grid_element_2 { width:400px; float:left; text-align:justify;margin-bottom:5px} +.waiting_user_grid_element_5 { width:100%; text-align:left;} +.waiting_user_grid_element_6 { width:100%; text-align:left;} + +/*LIST MEMBERS*/ +.list_members_grid_container { width:100%;} +.list_members_grid_item { width:105px; height: 150px; border:1px dotted #ccc; float:left; padding:5px; margin:8px;} +.list_members_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;} +.list_members_grid_element_0 img {width:50px;height:50px;border:3px solid #E6E6E6;} +.list_members_grid_element_2 { width:100px; float:left; text-align:center; margin-bottom:5px;} +.list_members_grid_element_3 { width:100px; float:left; text-align:center; margin-bottom:5px;} +.list_members_grid_element_5 { width:100%; text-align:center;} + +/*SEARCH USER*/ +.search_user_grid_container { width:100%;} +.search_user_grid_item { width:100px; height:100px; border:1px dotted #ccc; float:left; padding:5px; margin:5px; overflow:hidden;} +.search_user_grid_element_0 { width:100px; float:left; text-align:center; margin-bottom:5px;} +.search_user_grid_element_0 img {width:50px;height:50px;border:2px solid #E6E6E6;} +.search_user_grid_element_1 { width:100%; text-align:center;} +.search_user_grid_element_2 { width:100%; text-align:center;} +.search_user_grid_element_3 { width:100%; text-align:center;} + +/*SEARCH GROUP*/ + +.search_group_grid_item { + float:left; + width:350px; + height:165px; + margin-top:20px; +} + +.search_group_grid_container { + margin-top:0px; +} + +.search_group_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; +} + +/* +.search_group_grid_container { width:100%;} +.search_group_grid_item { width:500px; height: 120px; border:1px dotted #ccc; float:left; padding:5px; margin:5px;} +.search_group_grid_element_0 { width:100px; height: 90px; float:left; text-align:center; margin-bottom:5px; padding-top:15px;} +.search_group_grid_element_1 { width:100%; text-align:left; padding-top:15px; padding-bottom:15px;} +.search_group_grid_element_2 { width:100%; text-align:left;} +*/ + +#menu { + -moz-border-radius: 10px; border: 1px solid #e1e1e0; + -webkit-border-radius: 10px; border: 1px solid #e1e1e0; + -opera-border-radius: 10px; border: 1px solid #e1e1e0; + + width:280px; + margin-top:20px; + margin-right:10px; + margin-bottom:40px; + padding-left:10px; + padding-right:20px; + padding-top:5px; + float: right; + min-height: 150px; + padding-bottom:30px; +} + +/* INVITATIONS */ + +.invitation_confirm { + border-top:1px solid #D8DFEA; +} +.invitation_image { + width:110px; +} diff --git a/main/inc/banner.inc.php b/main/inc/banner.inc.php index c676b6b5c8..048fe6be37 100755 --- a/main/inc/banner.inc.php +++ b/main/inc/banner.inc.php @@ -35,7 +35,7 @@ $session_name = api_get_session_name($my_session_id); Course title section ----------------------------------------------------------------------------- */ -if (!empty($_cid) and $_cid != -1 and isset($_course)) { +if (!empty($_cid) and $_cid != -1 and isset($_course)) { //Put the name of the course in the header ?> "; -} elseif (isset ($nameTools) && $language_file != 'course_home') { +} elseif (isset ($nameTools) && $language_file != 'course_home') { //Put the name of the user-tools in the header if (!isset ($_user['user_id'])) { echo " "; - } elseif(!$noPHP_SELF) { + } elseif(!$noPHP_SELF) { echo "", "\n"; } else { echo "
$nameTools
\n"; } +} else { + echo '
'; } //not to let the header disappear if there's nothing on the left echo '
 
'; @@ -395,6 +397,9 @@ if (!empty($final_navigation)) { echo '
'; echo implode(' > ',$final_navigation); echo '
'; +} else { + echo '
'; + echo '
'; } if(api_get_setting('show_toolshortcuts')=='true') { echo '
'; diff --git a/main/messages/inbox.php b/main/messages/inbox.php index 0efe2c5940..9cdd1b848f 100755 --- a/main/messages/inbox.php +++ b/main/messages/inbox.php @@ -6,7 +6,7 @@ // name of the language file that needs to be included $language_file = array('registration','messages','userInfo'); -$cidReset=true; +$cidReset = true; require_once '../inc/global.inc.php'; require_once api_get_path(LIBRARY_PATH).'message.lib.php'; @@ -124,7 +124,7 @@ $table_message = Database::get_main_table(TABLE_MESSAGE); //api_display_tool_title(api_xml_http_response_encode(get_lang('Inbox'))); if ($_GET['f']=='social') { $this_section = SECTION_SOCIAL; - $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/profile.php','name' => get_lang('Social')); + $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social')); $interbreadcrumb[]= array ('url' => '#','name' => get_lang('Inbox')); } else { $this_section = SECTION_MYPROFILE; diff --git a/main/messages/new_message.php b/main/messages/new_message.php index 76c6026cae..5d6212f4b5 100755 --- a/main/messages/new_message.php +++ b/main/messages/new_message.php @@ -255,7 +255,7 @@ function manage_form ($default, $select_from_user_list = null) { */ if ($_GET['f']=='social') { $this_section = SECTION_SOCIAL; - $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/profile.php','name' => get_lang('Social')); + $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social')); $interbreadcrumb[]= array ('url' => '#','name' => $nameTools); } else { $this_section = SECTION_MYPROFILE; diff --git a/main/messages/outbox.php b/main/messages/outbox.php index fa6a21e0ed..8f6ac3e699 100755 --- a/main/messages/outbox.php +++ b/main/messages/outbox.php @@ -68,7 +68,7 @@ function deselect_all(formita) //api_display_tool_title(api_xml_http_response_encode(get_lang('Inbox'))); if ($_GET['f']=='social') { $this_section = SECTION_SOCIAL; - $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/profile.php','name' => get_lang('Social')); + $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social')); $interbreadcrumb[]= array ('url' => '#','name' => get_lang('Outbox')); } else { $this_section = SECTION_MYPROFILE; diff --git a/main/messages/view_message.php b/main/messages/view_message.php index fd937f43f9..89ae62f2b6 100755 --- a/main/messages/view_message.php +++ b/main/messages/view_message.php @@ -21,7 +21,7 @@ require_once api_get_path(LIBRARY_PATH).'message.lib.php'; */ if ($_REQUEST['f']=='social') { $this_section = SECTION_SOCIAL; - $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/profile.php','name' => get_lang('Social')); + $interbreadcrumb[]= array ('url' => api_get_path(WEB_PATH).'main/social/home.php','name' => get_lang('Social')); $interbreadcrumb[]= array ('url' => 'inbox.php?f=social','name' => get_lang('Inbox')); } else { $this_section = SECTION_MYPROFILE; diff --git a/main/social/home.php b/main/social/home.php index a3e3a0fb92..ba9997a701 100755 --- a/main/social/home.php +++ b/main/social/home.php @@ -7,6 +7,7 @@ $language_file = array('userInfo'); $cidReset = true; + require '../inc/global.inc.php'; require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php'; require_once api_get_path(LIBRARY_PATH).'social.lib.php'; @@ -19,7 +20,6 @@ $show_full_profile = true; $this_section = SECTION_SOCIAL; $interbreadcrumb[]= array ('url' => 'home.php','name' => get_lang('Social')); -$interbreadcrumb[]= array ('url' => '#','name' => get_lang('Home')); api_block_anonymous_users(); $htmlHeadXtra[] = ''; //jQuery @@ -54,7 +54,7 @@ if (api_get_setting('profile', 'picture') == 'true') { } } -Display :: display_header(null); +Display :: display_header(get_lang('Home')); $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); From 3fbd68b47f9cdea986faba2e62c73c45c2608eb9 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 17:24:22 -0500 Subject: [PATCH 12/13] Updates to chamilo css --- main/css/chamilo/default.css | 38 +++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index a5945c0673..c8c149351f 100644 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -575,7 +575,7 @@ margin-top:0; padding-left: 12px; } .menusection { - margin: 0px 5px 0 6px; + margin: 20px 5px 0 6px; padding-left: 10px; width: auto; } @@ -2432,7 +2432,7 @@ padding-top: 0px; padding-right: 0px; padding-bottom: 0px; padding-left: 0px;} background:#FFF; border:1px dotted #ccc; padding: 0px 10px 0 10px; - width:138px; + width:132px; position:relative; } .message-content .message-delete { @@ -3189,13 +3189,13 @@ div.image-social-content center.friend { /* BUTTONS */ button { margin:2px 5px 3px 3px !important; - background-color: #DFDFDF; + background-color: #F5F5F5; + border-width: 0px; - /* -moz-border-radius-topright : 5px; - -moz-border-radius-topleft : 5px; - -moz-border-radius-bottomright : 5px; - -moz-border-radius-bottomleft : 5px; -*/ + border-color:#EEEEEE #DEDEDE #DEDEDE #EEEEEE; + border-style:solid; + border-width:1px; + font-family: bold arial, verdana, helvetica, sans-serif; font-size: 100%; line-height :130%; @@ -3206,9 +3206,11 @@ button { vertical-align:middle; } button:hover { - background-color:#cbcbcb; + color:#545454; border-style: inset; + background-color:#DFF4FF; + border:1px solid #C2E1EF; } /* button with image */ button.add, button.save, button.cancel, button.refresh, button.upload, button.search, button.login, button.plus, button.minus, button.next, button.back { @@ -3218,12 +3220,12 @@ button.add, button.save, button.cancel, button.refresh, button.upload, button.se } /* POSITIVE */ button.save, button.add, button.search, button.refresh, button.upload, button.login, button.plus, button.minus, button.next, button.back { - background-color:#; - border-color: #fff; + /* background-color:#; */ + /* border-color: #fff; */ } button.save:hover, button.refresh:hover, button.upload:hover, button.add:hover, button.search:hover, button.login:hover, button.plus:hover, button.minus:hover, button.next:hover, button.back:hover { - border-color: #fff; - background-color:#fff; +/* border-color: #fff; + background-color:#fff; */ } /* NEGATIVE */ button.cancel { @@ -3248,7 +3250,7 @@ button.cancel { } /*including "search" image*/ button.search { - background-color:#FFFFFF; +/* background-color:#FFFFFF; */ background-image:url(images/bg-boton.png); background-position:right center; padding-right: 30px; @@ -3257,16 +3259,16 @@ button.search { button.login { background-image:url(images/bg-boton.png); background-position:right; - background-color:#FFF; - border:solid 2px #FFF; - float:right; +/* background-color:#FFF; + border:solid 2px #FFF; */ + float:left; margin-right:20px; padding-right:30px; margin:2px 5px 3px 5px !important; } button.login:hover{ - background-color:#FFF; +/* background-color:#FFF; */ /* border: solid 1px #FFF; */ } From 708d676fe954f73c9acc3f1b516e9cabf92b20d7 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Tue, 5 Jan 2010 17:30:36 -0500 Subject: [PATCH 13/13] Updates to chamilo css --- main/css/blue_lagoon/default.css | 4 ++++ main/css/chamilo/default.css | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css index 3a01b45a5a..0f18c6ec8f 100755 --- a/main/css/blue_lagoon/default.css +++ b/main/css/blue_lagoon/default.css @@ -2636,11 +2636,15 @@ div.image-social-content center.friend { } .social-group-details-info span { color:#777; +} +.social-group-details-info { + padding:2px 0px 2px 0px; } + /***************************************************** * BUTTONS * *****************************************************/ diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css index c8c149351f..a116cd8bf7 100644 --- a/main/css/chamilo/default.css +++ b/main/css/chamilo/default.css @@ -2866,7 +2866,10 @@ div.image-social-content center.friend { } .social-group-details-info span { color:#777; +} +.social-group-details-info { + padding:2px 0px 2px 0px; } @@ -2879,6 +2882,7 @@ div.image-social-content center.friend { + /********************************************** * EXERCISE TOOL * **********************************************/ @@ -3365,7 +3369,7 @@ div.image_friend_network { border:1px solid #CCCCCC; margin:2px; padding:4px; - background: #a0e5fc; + height:125px; width:82px; z-index:5;