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 - Closing divs

Browse Source
skala
Julio Montoya 15 years ago
parent b40b1591a9
commit 3ddb6a4425
2 changed files with 39 additions and 58 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. 35
      main/auth/profile.php
  2. 62
      main/social/profile.php

35
main/auth/profile.php
Unescape View File

@ -472,9 +472,7 @@ if (is_profile_editable()) {
$user_data = array_merge($user_data, $extra_data); $user_data = array_merge($user_data, $extra_data);
$form->setDefaults($user_data); $form->setDefaults($user_data);
/* /* FUNCTIONS */
FUNCTIONS
*/
/** /**
@ -546,11 +544,8 @@ function check_user_email($email){
$result = Database::query($sql_password); $result = Database::query($sql_password);
return Database::num_rows($result) != 0; return Database::num_rows($result) != 0;
} }
/*
============================================================================== /* MAIN CODE */
MAIN CODE
==============================================================================
*/
$filtered_extension = false; $filtered_extension = false;
$update_success = false; $update_success = false;
$upload_picture_success = false; $upload_picture_success = false;
@ -730,11 +725,7 @@ if ($form->validate()) {
//} //}
//} //}
/* /* MAIN DISPLAY SECTION */
==============================================================================
MAIN DISPLAY SECTION
==============================================================================
*/
// the header // the header
Display::display_header(get_lang('ModifyProfile')); Display::display_header(get_lang('ModifyProfile'));
@ -815,17 +806,14 @@ $big_image_width = $big_image_size[0];
$big_image_height = $big_image_size[1]; $big_image_height = $big_image_size[1];
$url_big_image = $big_image.'?rnd='.time(); $url_big_image = $big_image.'?rnd='.time();
if (api_get_setting('allow_social_tool') == 'true') { if (api_get_setting('allow_social_tool') == 'true') {
echo '<div id="social-content">'; echo '<div id="social-content">';
echo '<div id="social-content-left">'; echo '<div id="social-content-left">';
SocialManager::show_social_menu('home', null, $user_id, $show_full_profile); SocialManager::show_social_menu('home', null, $user_id, $show_full_profile);
echo '</div>'; echo '</div>';
echo '<div id="social-content-right">'; echo '<div id="social-content-right">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Profile')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
echo '<table><tr><td>'; echo '<table><tr><td>';
echo '<div id="social-content-online">'; echo '<div id="social-content-online">';
if (api_get_setting('extended_profile') == 'true') { if (api_get_setting('extended_profile') == 'true') {
@ -836,15 +824,10 @@ if (api_get_setting('allow_social_tool') == 'true') {
echo '<a href="profile.php?type=reduced'.$show.'"><span class="social-menu-text1">'.Display::return_icon('edit.gif', get_lang('EditNormalProfile')).'&nbsp;'.get_lang('EditNormalProfile').'</span></a>'; echo '<a href="profile.php?type=reduced'.$show.'"><span class="social-menu-text1">'.Display::return_icon('edit.gif', get_lang('EditNormalProfile')).'&nbsp;'.get_lang('EditNormalProfile').'</span></a>';
} }
} }
echo '</div>'; echo '</div>';
$form->display(); $form->display();
echo '</td></tr></table>'; echo '</td></tr></table>';
echo '</div>';
echo '</div>';
echo '</div>'; echo '</div>';
} else { } else {
// Style position:absolute has been removed for Opera-compatibility. // Style position:absolute has been removed for Opera-compatibility.
//echo '<div id="image-message-container" style="float:right;display:inline;position:absolute;padding:3px;width:250px;" >'; //echo '<div id="image-message-container" style="float:right;display:inline;position:absolute;padding:3px;width:250px;" >';
@ -858,6 +841,4 @@ if (api_get_setting('allow_social_tool') == 'true') {
echo '</div>'; echo '</div>';
$form->display(); $form->display();
} }
Display :: display_footer();
Display :: display_footer();

62
main/social/profile.php
Unescape View File

@ -252,8 +252,6 @@ echo ' </div>';
echo ' <div id="social-content-right">'; echo ' <div id="social-content-right">';
echo ' <div class="rounded_div" style="width:300px">'; echo ' <div class="rounded_div" style="width:300px">';
if (!empty($user_info['firstname']) || !empty($user_info['lastname'])) { if (!empty($user_info['firstname']) || !empty($user_info['lastname'])) {
@ -265,6 +263,7 @@ if (!empty($user_info['firstname']) || !empty($user_info['lastname'])) {
if ($show_full_profile) { if ($show_full_profile) {
echo '<div class="social-profile-info">'; echo '<div class="social-profile-info">';
echo '<dl>';
echo '<dt>'.get_lang('UserName').'</dt><dd>'. $user_info['username'].' </dd>'; echo '<dt>'.get_lang('UserName').'</dt><dd>'. $user_info['username'].' </dd>';
if (!empty($user_info['firstname']) || !empty($user_info['lastname'])) if (!empty($user_info['firstname']) || !empty($user_info['lastname']))
echo '<dt>'.get_lang('Name').'</dt><dd>'. api_get_person_name($user_info['firstname'], $user_info['lastname']).'</dd>'; echo '<dt>'.get_lang('Name').'</dt><dd>'. api_get_person_name($user_info['firstname'], $user_info['lastname']).'</dd>';
@ -282,6 +281,7 @@ if ($show_full_profile) {
echo '<dl>'; echo '<dl>';
if (!empty($user_info['username'])) if (!empty($user_info['username']))
echo '<dt>'.get_lang('UserName').'</dt><dd>'. $user_info['username'].'</dd>'; echo '<dt>'.get_lang('UserName').'</dt><dd>'. $user_info['username'].'</dd>';
echo '</dl>';
echo '</div>'; echo '</div>';
} }
@ -295,7 +295,7 @@ if ($show_full_profile) {
$extra_user_data = UserManager::get_extra_user_data($user_id); $extra_user_data = UserManager::get_extra_user_data($user_id);
$extra_information = ''; $extra_information = '';
if (is_array($extra_user_data) && count($extra_user_data)>0 ) { if (is_array($extra_user_data) && count($extra_user_data)>0 ) {
$extra_information = '<br />';
$extra_information .= '<div><h3>'.get_lang('ExtraInformation').'</h3></div>'; $extra_information .= '<div><h3>'.get_lang('ExtraInformation').'</h3></div>';
$extra_information .='<div class="social-profile-info">'; $extra_information .='<div class="social-profile-info">';
$extra_information_value = ''; $extra_information_value = '';
@ -355,7 +355,7 @@ if ($show_full_profile) {
if (!empty($extra_information_value)) { if (!empty($extra_information_value)) {
$extra_information .= $extra_information_value; $extra_information .= $extra_information_value;
} }
$extra_information .= '</div>'; $extra_information .= '</div>'; //social-profile-info
} }
// if there are information to show // if there are information to show
if (!empty($extra_information_value)) echo $extra_information; if (!empty($extra_information_value)) echo $extra_information;
@ -382,7 +382,7 @@ if ($show_full_profile) {
if ($number_friends != 0) { if ($number_friends != 0) {
$friend_html.= '<div><h3>'.get_lang('SocialFriend').'</h3></div>'; $friend_html.= '<div><h3>'.get_lang('SocialFriend').'</h3></div>';
$friend_html.= '<div id="friend-container" class="social-friend-container">'; $friend_html.= '<div id="friend-container" class="social-friend-container">';
$friend_html.= '<div id="friend-header" >'; $friend_html.= '<div id="friend-header">';
if ($number_friends == 1) { if ($number_friends == 1) {
$friend_html.= '<div style="float:left;width:80%">'.$number_friends.' '.get_lang('Friend').'</div>'; $friend_html.= '<div style="float:left;width:80%">'.$number_friends.' '.get_lang('Friend').'</div>';
@ -500,30 +500,31 @@ if ($show_full_profile) {
} }
// COURSES LIST // COURSES LIST
if ( is_array($list) ) { if ( is_array($list) ) {
echo '<div class="rounded_div" style="width:90%">'; echo '<div class="rounded_div" style="width:90%">';
echo '<div><h3>'.api_ucfirst(get_lang('MyCourses')).'</h3></div>'; echo '<div><h3>'.api_ucfirst(get_lang('MyCourses')).'</h3></div>';
echo '<div class="social-content-training">'; echo '<div class="social-content-training">';
//Courses whithout sessions //Courses whithout sessions
$old_user_category = 0; $old_user_category = 0;
$i=1; $i=1;
foreach($list as $key=>$value) { foreach($list as $key=>$value) {
if ( empty($value[2]) ) { //if out of any session if ( empty($value[2]) ) { //if out of any session
echo $value[1]; echo $value[1];
echo '<div id="social_content'.$i.'" style="background : #EFEFEF; padding:0px; ">'; echo '<div id="social_content'.$i.'" style="background : #EFEFEF; padding:0px; ">';
echo '</div>'; echo '</div>';
$i++; $i++;
} }
} }
$listActives = $listInactives = $listCourses = array(); $listActives = $listInactives = $listCourses = array();
foreach ( $list as $key=>$value ) { foreach ( $list as $key=>$value ) {
if ( $value['active'] ) { //if the session is still active (as told by get_logged_user_course_html()) if ( $value['active'] ) { //if the session is still active (as told by get_logged_user_course_html())
$listActives[] = $value; $listActives[] = $value;
} elseif ( !empty($value[2]) ) { //if there is a session but it is not active } elseif ( !empty($value[2]) ) { //if there is a session but it is not active
$listInactives[] = $value; $listInactives[] = $value;
} }
} }
echo '</div>'; echo '</div>';
echo '</div>';
} }
// user feeds // user feeds
$user_feeds = SocialManager::get_user_feeds($user_id); $user_feeds = SocialManager::get_user_feeds($user_id);
@ -533,8 +534,7 @@ if ($show_full_profile) {
echo '<div><h3>'.get_lang('RSSFeeds').'</h3></div>'; echo '<div><h3>'.get_lang('RSSFeeds').'</h3></div>';
echo '<div class="social-content-training">'.$user_feeds.'</div>'; echo '<div class="social-content-training">'.$user_feeds.'</div>';
//echo '<div class="clear"></div>'; //echo '<div class="clear"></div>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
} }

Write Preview
Loading…
Cancel
Save