Browse Source

Removing old "social "column.

Julio Montoya 11 years ago
parent
commit
edb49d87bc

+ 13 - 12
main/auth/profile.php

@@ -804,24 +804,25 @@ $url_big_image = $big_image.'?rnd='.time();
 $show_delete_account_button = api_get_setting('platform_unsubscribe_allowed') == 'true' ? true : false;
 
 if (api_get_setting('allow_social_tool') == 'true') {
-    echo '<div class="row-fluid">';
+    /*echo '<div class="row-fluid">';
     echo '<div class="span3">';
     echo SocialManager::show_social_menu('home', null, api_get_user_id(), false, $show_delete_account_button);
     echo '</div>';
     echo '<div class="span9">';
     $form->display();
-    echo '</div>';
+    echo '</div>';*/
 } else {
-    // 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;padding:3px;width:230px;" >';
 
-    if ($image == 'unknown.jpg') {
-        echo '<img '.$img_attributes.' />';
-    } else {
-        echo '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
-    }
-    echo '</div>';
-    $form->display();
 }
+// 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;padding:3px;width:230px;" >';
+
+if ($image == 'unknown.jpg') {
+    echo '<img '.$img_attributes.' />';
+} else {
+    echo '<input type="image" '.$img_attributes.' onclick="javascript: return show_image(\''.$url_big_image.'\',\''.$big_image_width.'\',\''.$big_image_height.'\');"/>';
+}
+echo '</div>';
+$form->display();
 Display :: display_footer();

+ 7 - 12
main/messages/inbox.php

@@ -167,15 +167,10 @@ if (api_get_setting('allow_social_tool') == 'true') {
 }
 
 $tpl = $app['template'];
-if (api_get_setting('allow_social_tool') == 'true') {
-    $tpl->assign('social_left_content', $social_left_content);
-    $tpl->assign('social_right_content', $social_right_content);
-    $social_layout = $tpl->get_template('layout/social_layout.tpl');
-    $tpl->display($social_layout);
-} else {
-    $content = $social_right_content;
-    $tpl->assign('actions', $actions);
-    $tpl->assign('message', $show_message);
-    $tpl->assign('content', $content);
-    $tpl->display_one_col_template();
-}
+
+$content = $social_right_content;
+$tpl->assign('actions', $actions);
+$tpl->assign('message', $show_message);
+$tpl->assign('content', $content);
+$tpl->display_one_col_template();
+

+ 5 - 12
main/messages/new_message.php

@@ -353,15 +353,8 @@ if (api_get_setting('allow_social_tool') == 'true') {
 $app['title'] = get_lang('ComposeMessage');
 $tpl = $app['template'];
 
-if (api_get_setting('allow_social_tool') == 'true') {
-    $tpl->assign('social_left_content', $social_left_content);
-    $tpl->assign('social_right_content', $social_right_content);
-    $social_layout = $tpl->get_template('layout/social_layout.tpl');
-    $tpl->display($social_layout);
-} else {
-    $content = $social_right_content;
-    $tpl->assign('actions', $actions);
-    $tpl->assign('message', $show_message);
-    $tpl->assign('content', $content);
-    $tpl->display_one_col_template();
-}
+$content = $social_right_content;
+$tpl->assign('actions', $actions);
+$tpl->assign('message', $show_message);
+$tpl->assign('content', $content);
+$tpl->display_one_col_template();

+ 5 - 13
main/messages/outbox.php

@@ -153,16 +153,8 @@ if (api_get_setting('allow_social_tool') == 'true') {
 $app['title'] = get_lang('ComposeMessage');
 $tpl = $app['template'];
 
-if (api_get_setting('allow_social_tool') == 'true') {
-    $tpl->assign('social_left_content', $social_left_content);
-    $tpl->assign('social_left_menu', $social_left_menu);
-    $tpl->assign('social_right_content', $social_right_content);
-    $social_layout = $tpl->get_template('layout/social_layout.tpl');
-    $tpl->display($social_layout);
-} else {
-    $content = $social_right_content;
-    $tpl->assign('actions', $actions);
-    $tpl->assign('message', $show_message);
-    $tpl->assign('content', $content);
-    $tpl->display_one_col_template();
-}
+$content = $social_right_content;
+$tpl->assign('actions', $actions);
+$tpl->assign('message', $show_message);
+$tpl->assign('content', $content);
+$tpl->display_one_col_template();

+ 5 - 12
main/messages/view_message.php

@@ -81,16 +81,9 @@ if (!empty($message)) {
 $app['title'] = get_lang('View');
 $tpl = $app['template'];
 
-if (api_get_setting('allow_social_tool') == 'true') {
-    $tpl->assign('social_left_content', $social_left_content);
-    $tpl->assign('social_right_content', $social_right_content);
-    $social_layout = $tpl->get_template('layout/social_layout.tpl');
-    $tpl->display($social_layout);
-} else {
-    $content = $social_right_content;
+$content = $social_right_content;
 
-    $tpl->assign('actions', $actions);
-    $tpl->assign('message', $message);
-    $tpl->assign('content', $content);
-    $tpl->display_one_col_template();
-}
+$tpl->assign('actions', $actions);
+$tpl->assign('message', $message);
+$tpl->assign('content', $content);
+$tpl->display_one_col_template();

+ 3 - 4
main/social/home.php

@@ -180,12 +180,11 @@ if (count($groups_pop) > 0) {
     $social_right_content .= '<div class="social-groups-home-title">'.get_lang('Popular').'</div>';
     $social_right_content .= Display::return_sortable_grid('home_group', array(), $groups_pop, array('hide_navigation'=>true, 'per_page' => 100), array(), false, array(true, true, true,true,true));
 }
+
 $social_right_content .= '</div>';
 
 $app['title'] = get_lang('SocialNetwork');
 $tpl = $app['template'];
 
-$tpl->assign('social_left_content', $social_left_content);
-$tpl->assign('social_right_content', $social_right_content);
-$social_layout = $tpl->get_template('layout/social_layout.tpl');
-$tpl->display($social_layout);
+$tpl->assign('content', $social_right_content);
+$tpl->display_one_col_template();