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

Fix search UI see #7539

Browse Source
1.10.x
Julio Montoya 10 years ago
parent 81cfe89573
commit 839c6b50fb
7 changed files with 111 additions and 61 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. 48
      main/css/base.css
  2. 8
      main/inc/ajax/online.ajax.php
  3. 28
      main/inc/lib/social.lib.php
  4. 42
      main/social/search.php
  5. 5
      main/template/default/social/home.tpl
  6. 34
      whoisonline.php
  7. 7
      whoisonlinesession.php

48
main/css/base.css
Unescape View File

@ -5768,3 +5768,51 @@ ul.holder li.bit-box{
display: block;
}
}
.src-image {
display: none;
}
.card {
overflow: hidden;
position: relative;
border: 1px solid #CCC;
border-radius: 8px;
text-align: center;
padding: 0;
/* background-color: #284c79; */
color: rgb(136, 172, 217);
margin-bottom: 20px;
}
.card .header-bg {
/* This stretches the canvas across the entire hero unit */
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 70px;
border-bottom: 1px #FFF solid;
/* This positions the canvas under the text */
z-index: 1;
}
.card .avatar {
position: relative;
margin-top: 15px;
z-index: 100;
}
.card .content {
margin-bottom: 15px;
}
.card .avatar img {
width: 100px;
height: 100px;
-webkit-border-radius: 50%;
-moz-border-radius: 50%;
border-radius: 50%;
border: 5px solid rgba(0,0,30,0.8);
}

8
main/inc/ajax/online.ajax.php
Unescape View File

@ -19,7 +19,13 @@ switch($action) {
if (!empty($max_page) && $page <= $max_page) {
if (isset($_GET['cidReq']) && strlen($_GET['cidReq']) > 0) {
$user_list = who_is_online_in_this_course($page_rows, $images_to_show, api_get_user_id(), api_get_setting('time_limit_whosonline'), $_GET['cidReq']);
$user_list = who_is_online_in_this_course(
$page_rows,
$images_to_show,
api_get_user_id(),
api_get_setting('time_limit_whosonline'),
$_GET['cidReq']
);
} else {
$user_list = who_is_online($page_rows, $images_to_show);
}

28
main/inc/lib/social.lib.php
Unescape View File

@ -928,15 +928,7 @@ class SocialManager extends UserManager
$course_url = '&amp;cidReq='.Security::remove_XSS($_GET['cidReq']);
}
if ($wrap) {
if ($add_row) {
$html .='<div class="row">';
}
$html .= '<div class="col-md-'.$column_size.'">';
$html .= '<ul id="online_grid_container" class="thumbnails">';
}
$html .= '<div class="row">';
foreach ($user_list as $uid) {
$user_info = api_get_user_info($uid);
@ -965,16 +957,26 @@ class SocialManager extends UserManager
}
$img = '<img title = "'.$name.'" alt="'.$name.'" src="'.$friends_profile['file'].'">';
$name = '<a href="'.$url.'">'.$status_icon.$user_status.$name.'</a><br>';
$html .= '<li class="col-md-'.($column_size / 3).' thumbnail">'.$img.'<div class="caption">'.$name.'</div></li>';
$name = '<a href="'.$url.'">'.$status_icon.$user_status.$name.'</a>';
$html .= '<div class="col-md-4">
<div class="card">
<div class="avatar">'.$img.'</div>
<div class="content">
'.$name.'
</div>
</div>
</div>';
}
$counter = $_SESSION['who_is_online_counter'];
if ($wrap) {
$html .= '</ul></div>';
$html .= '</div>';
}
if (count($user_list) >= 9) {
$html .= '<div class="col-md-'.$column_size.'"><a class="btn btn-large btn-default" id="link_load_more_items" data_link="'.$counter.'" >'.get_lang('More').'</a></div>';
$html .= '<div class="col-md-'.$column_size.'">
<a class="btn btn-large btn-default" id="link_load_more_items" data_link="'.$counter.'" >'.get_lang('More').'</a></div>';
}
if ($wrap && $add_row) {
$html .= '</div>';

42
main/social/search.php
Unescape View File

@ -68,24 +68,25 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
$social_right_content .= get_lang('SorryNoResults');
}
$results = '<div id="online_grid_container"><div class="span9">';
$results = '<div id="online_grid_container">';
if (is_array($users) && count($users) > 0) {
$results .= Display::page_subheader(get_lang('Users'));
$results .= '<ul class="thumbnails">';
$results .= '<div class="row">';
$buttonClass = 'btn btn-default btn-sm';
foreach ($users as $user) {
$send_inv = '<button class="btn btn-mini disabled "><i class="fa fa-user"></i> '.get_lang('SendInvitation').'</button><br /><br />';
$send_inv = '<button class="'.$buttonClass.' disabled "><i class="fa fa-user"></i> '.get_lang('SendInvitation').'</button>';
$relation_type = intval(SocialManager::get_relation_between_contacts(api_get_user_id(), $user['user_id']));
$user_info = api_get_user_info($user['user_id'], true);
$url = api_get_path(WEB_PATH).'main/social/profile.php?u='.$user['user_id'];
$url = api_get_path(WEB_PATH).'main/social/profile.php?u='.$user['user_id'];
// Show send invitation icon if they are not friends yet
if ($relation_type != 3 && $relation_type != 4 && $user['user_id'] != api_get_user_id()) {
$send_inv = '<a href="#" class="btn-to-send-invitation" data-send-to="' . $user['user_id'] . '">
<button class="btn btn-mini"><i class="fa fa-user"></i> '.get_lang('SendInvitation').'</button></a><br /><br />';
$send_inv = '<a href="#" class="'.$buttonClass.' btn-to-send-invitation" data-send-to="' . $user['user_id'] . '">
<i class="fa fa-user"></i> '.get_lang('SendInvitation').'</a>';
}
$send_msg = '<a href="#" class="btn-to-send-message" data-send-to="' . $user['user_id'] . '">
<button class="btn btn-mini"><i class="fa fa-envelope"></i> '.get_lang('SendMessage').'</button></a>';
$send_msg = '<a href="#" class="btn-to-send-message '.$buttonClass.'" data-send-to="' . $user['user_id'] . '">
<i class="fa fa-envelope"></i> '.get_lang('SendMessage').'</a>';
if (empty($user['picture_uri'])) {
$picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg';
$img = '<img src="'.$picture['file'].'">';
@ -109,25 +110,24 @@ if ($query != '' || ($query_vars['search_type']=='1' && count($query_vars)>2) )
$user_info['complete_name'] = Display::url($status_icon.$user_info['complete_name'], $url);
$invitations = $user['tag'].$send_inv.$send_msg;
$results .= '<li class="col-md-3">
<div class="row">
<div class="col-md-12">
'.$user_info['complete_name'].'
</div>
<div class="col-md-4">
<div class="media">
'.$img.'
</div>
$results .= '<div class="col-md-4">
<div class="card">
<canvas class="header-bg" width="250" height="70" id="header-blur"></canvas>
<div class="avatar">
'.$img.'
</div>
<div class="col-md-5">
<div class="media">
<div class="content">
'.$user_info['complete_name'].'
<div class="btn-group">
'.$invitations.'
</div>
</div>
</div>
</li>';
</div>';
}
$results .= '</ul></div></div>';
$results .= '</div></div>';
$social_right_content .= $results;
}

5
main/template/default/social/home.tpl
Unescape View File

@ -9,7 +9,7 @@
{{ social_menu_block }}
</div>
</div>
<div class="col-md-6">
<div class="col-md-9">
{{ social_search_block }}
{{ social_skill_block }}
{{ social_group_block }}
@ -17,8 +17,5 @@
<div id="display_response_id"></div>
{{ social_auto_extend_link }}
</div>
<div class="col-md-3">
</div>
</div>
{% endblock %}

34
whoisonline.php
Unescape View File

@ -66,23 +66,23 @@ $(document).ready(function() {
$("#link_load_more_items").click(function() {
page = $("#link_load_more_items").attr("data_link");
$.ajax({
beforeSend: function(objeto) {
$("#display_response_id").html("'.addslashes(get_lang('Loading')).'");
},
type: "GET",
url: "main/inc/ajax/online.ajax.php?a=load_online_user",
data: "online_page_nr="+page,
success: function(data) {
$("#display_response_id").html("");
if (data != "end") {
$("#link_load_more_items").remove();
var last = $("#online_grid_container li:last");
last.after(data);
} else {
$("#link_load_more_items").remove();
}
beforeSend: function(objeto) {
$("#display_response_id").html("'.addslashes(get_lang('Loading')).'");
},
type: "GET",
url: "main/inc/ajax/online.ajax.php?a=load_online_user",
data: "online_page_nr="+page,
success: function(data) {
$("#display_response_id").html("");
if (data != "end") {
$("#link_load_more_items").remove();
var last = $("#online_grid_container li:last");
last.after(data);
} else {
$("#link_load_more_items").remove();
}
});
}
});
});
});
</script>';
@ -127,7 +127,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);

7
whoisonlinesession.php
Unescape View File

@ -4,9 +4,6 @@
* Shows who is online in a specific session
* @package chamilo.main
*/
/**
* Initialization
*/
include_once './main/inc/global.inc.php';
api_block_anonymous_users();
@ -47,7 +44,7 @@ Display::display_header(get_lang('UserOnlineListSession'));
$session_is_coach = array();
if (isset($_user['user_id']) && $_user['user_id'] != '') {
$_user['user_id'] = intval($_user['user_id']);
$sql = "SELECT DISTINCT id,
$sql = "SELECT DISTINCT session.id,
name,
date_start,
date_end
@ -62,7 +59,7 @@ Display::display_header(get_lang('UserOnlineListSession'));
$session_is_coach[$session['id']] = $session;
}
$sql = "SELECT DISTINCT id,
$sql = "SELECT DISTINCT session.id,
name,
date_start,
date_end

Write Preview
Loading…
Cancel
Save