Browse Source

Some fixes in the who is online code

Julio Montoya 13 years ago
parent
commit
1ba14f8c2f

+ 9 - 9
main/css/base.css

@@ -3374,22 +3374,22 @@ a:active{
 }
 
 .online_user_in_text {
-    background: url("online.png") no-repeat scroll right center transparent;
-    float: left;
-    height: 16px;
-    left: 0;
+    background: url("online.png") no-repeat scroll right center transparent;    
+    height: 16px;    
     width: 17px;
-    display:block;
+    display: inline-block;    
     margin-right: 4px;    
 }
 
+.thumbnail .caption {
+    text-align:center;
+}
+
 .offline_user_in_text {
     background: url("offline.png") no-repeat scroll right center transparent;
-    float: left;
-    height: 16px;
-    left: 0;
+    height: 16px;    
     width: 17px;
-    display:block;
+    display: inline-block;    
     margin-right: 4px;    
 }
 

+ 1 - 7
main/inc/ajax/online.ajax.php

@@ -24,13 +24,7 @@ switch($action) {
             } else {                
                 $page_rows = $page*10;
                 $user_list = who_is_online($page_rows, $page_rows + 10);		
-            }  
-            /*
-            if ($page == 1) {            
-                $_SESSION['online_user_items'] = array();
-            }*/
-        
-            //$_SESSION['online_user_items'][] = $page;         
+            } 
             if (!empty($user_list)) {
                 echo SocialManager::display_user_list($user_list);
                 exit;

+ 1 - 1
main/inc/lib/social.lib.php

@@ -781,7 +781,7 @@ class SocialManager extends UserManager {
                     $friends_profile = UserManager::get_picture_user($uid, $image_array['file'], 80, USER_IMAGE_SIZE_ORIGINAL);                                        
                     $img = '<img title = "'.$name.'" alt="'.$name.'" src="'.$friends_profile['file'].'">';                                                                        
                 }           
-				$name = Display::div($status_icon).'<a href="'.$url.'">'.$name.'</a><br>';
+				$name = '<a href="'.$url.'">'.$status_icon.$name.'</a><br>';
                 $html .= '<li class="span9"><div class="thumbnail">'.$img.'<div class="caption">'.$name.'</div</div></li>';				
 			}			
             $counter = $_SESSION['who_is_online_counter'];

+ 3 - 9
main/inc/lib/usermanager.lib.php

@@ -2811,17 +2811,11 @@ class UserManager {
 	 *
 	 */
 	public static function get_search_form($query) {
-		return '<div class="social-groups-home-title"><b>'.get_lang('Search').'</b > ('.get_lang('UsersGroups').')</div>
-		<form method="GET" action="'.api_get_path(WEB_PATH).'main/social/search.php">
-		<table cellspacing="0" cellpadding="0">
-		<tr>
-		<td>			
+		return '<div class="span9"><b>'.get_lang('Search').'</b > ('.get_lang('UsersGroups').')
+		<form method="GET" action="'.api_get_path(WEB_PATH).'main/social/search.php">				
 				<input type="text" size="25" value="'.api_htmlentities(Security::remove_XSS($query)).'" name="q"/> &nbsp;
 				<button class="search" type="submit" value="search">'.get_lang('Search').'</button>
-			</div>
-		</td>
-		</tr>
-		</table></form>';
+		</form></div>';
 	}
 	//deprecated
 	public static function get_public_users($keyword, $from = 0, $number_of_items= 20, $column=2, $direction='ASC') {

+ 14 - 21
main/social/search.php

@@ -39,43 +39,34 @@ $social_right_content = UserManager::get_search_form($query);
         if (empty($users) && empty($groups)) {
             $social_right_content .= get_lang('SorryNoResults');	
         }
-
-        $results = array();
+        
+        $results .= '<div class="span9">';
+        
         if (is_array($users) && count($users)> 0) {
-            $social_right_content .=  '<h2>'.get_lang('Users').'</h2>';			
+            $results .=  '<h2>'.get_lang('Users').'</h2>';			
+            $results .= '<ul class="thumbnails">';   
             foreach($users as $user) {
                 $user_info = api_get_user_info($user['user_id'], true);
                 $url = api_get_path(WEB_PATH).'main/social/profile.php?u='.$user['user_id'];
 
                 if (empty($user['picture_uri'])) {
                     $picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown_180_100.jpg';
-                    $img = Display::url('<img title class="social-home-anonymous-online" src="'.$picture['file'].'">', $url); 
+                    $img = '<img src="'.$picture['file'].'">'; 
                 } else {
                     $picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'], 80, USER_IMAGE_SIZE_ORIGINAL );
-
-                    $img = '<img src="'.$picture['file'].'">';                        
-                    $clip = 'clip_vertical';                    
-                    if ($picture['original_height'] > $picture['original_width']) {
-                        $clip = 'clip_horizontal';    
-                    }                    
-                    $img = Display::url(Display::div(Display::div($img, array('class'=>$clip)), array('class'=>'clip-wrapper')) , $url);
+                    $img = '<img src="'.$picture['file'].'">';                    
                 }                             
                 if ($user_info['user_is_online']) {
                     $status_icon = Display::span('', array('class' => 'online_user_in_text'));
                 } else {
                     $status_icon = Display::span('', array('class' => 'offline_user_in_text'));    
                 }                    
-                $img = $img;
-                
                 $user['tag'] = isset($user['tag']) ? $user['tag'] : null;
-                $user_info['complete_name'] = Display::url($user_info['complete_name'], $url).'<br >'.$user['tag'];                
-                
-                $results[] = array($img, $status_icon.$user_info['complete_name'], $user['tag']);			
-            }					
-
-            $social_right_content .=  '<div id="div_content_table">';				
-            $social_right_content .= Display::return_sortable_grid('online', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false ,true);
-            $social_right_content .=  '</div>';											
+                $user_info['complete_name'] = Display::url($status_icon.$user_info['complete_name'], $url).'<br />'.$user['tag'];                
+                $results .= '<li class="span9"><div class="thumbnail">'.$img.'<div class="caption">'.$user_info['complete_name'].$user['tag'].'</div</div></li>';				
+            }	
+            $results .='</ul></div>';
+            $social_right_content .=  $results;                        
         }
 
         //Get users from tags this loop does not make sense for now ... 
@@ -121,6 +112,7 @@ $social_right_content = UserManager::get_search_form($query);
 
         $grid_groups = array();
         if (is_array($groups) && count($groups)>0) {
+            $social_right_content .= '<div class="span9">';
             $social_right_content .=  '<h2>'.get_lang('Groups').'</h2>';
             foreach($groups as $group) {	
                 $group['name'] = Security::remove_XSS($group['name'], STUDENT, true);
@@ -161,6 +153,7 @@ $social_right_content = UserManager::get_search_form($query);
         $visibility = array(true,true,true,true,true);
         $social_right_content .= Display::return_sortable_grid('mygroups', array(), $grid_groups, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false, $visibility);
     }									
+    $social_right_content .= '</div>';
 $social_right_content .= '</div>';
 
 $tpl = new Template($tool_name);

+ 1 - 1
main/template/default/layout/social_layout.tpl

@@ -7,7 +7,7 @@
     <div class="span9">
         <div class="row">
         {$social_right_content}        
-        <div id="display_response_id"></div>        
+        <div class="span9" id="display_response_id"></div>        
         </div>
     </div>
 </div>

+ 2 - 4
whoisonline.php

@@ -112,7 +112,7 @@ $(document).ready(function() {
         page = $("#link_load_more_items").attr("data_link");
         $.ajax({
                 beforeSend: function(objeto) {
-                    $("#display_response_id").html("Loading"); 
+                    $("#display_response_id").html("'.addslashes(get_lang('Loading')).'"); 
                 },
                 type: "GET",
                 url: "main/inc/ajax/online.ajax.php?a=load_online_user",
@@ -129,8 +129,6 @@ $(document).ready(function() {
                 }
             });           
     });
-
-  
 });        
 </script>';
 
@@ -171,7 +169,7 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
 			if (api_get_setting('allow_social_tool') == 'true') {				
 				if (!api_is_anonymous()) {
 				    $query = isset($_GET['q']) ? $_GET['q']: null;				    
-					$social_right_content .= '<div class="span9">'.UserManager::get_search_form($query).'</div>';
+					$social_right_content .= UserManager::get_search_form($query);
 				}
 			}			
 			$social_right_content .= SocialManager::display_user_list($user_list);