Minor - Closing divs

skala
Julio Montoya 15 years ago
parent b40b1591a9
commit 3ddb6a4425
  1. 29
      main/auth/profile.php
  2. 12
      main/social/profile.php

@ -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') {
@ -837,14 +825,9 @@ if (api_get_setting('allow_social_tool') == 'true') {
} }
} }
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();

@ -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>';
@ -524,6 +524,7 @@ if ($show_full_profile) {
} }
} }
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);
@ -534,7 +535,6 @@ if ($show_full_profile) {
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>';
} }

Loading…
Cancel
Save