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

Adding font_awesome icons + adding in the search see #6015

Browse Source
1.9.x
Julio Montoya 12 years ago
parent 44aae56772
commit a0f9a677ee
2 changed files with 95 additions and 91 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. 6
      main/inc/lib/template.lib.php
  2. 180
      main/social/search.php

6
main/inc/lib/template.lib.php
Unescape View File

@ -420,6 +420,8 @@ class Template
$css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/chat/css/chat.css';
}
$css[] = api_get_path(WEB_CSS_PATH).'font_awesome/css/font-awesome.css';
$css_file_to_string = null;
foreach ($css as $file) {
$css_file_to_string .= api_get_css($file);
@ -442,9 +444,7 @@ class Template
$navigator_info = api_get_navigator();
if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
$css_file_to_string .= 'img, div { behavior: url('.api_get_path(
WEB_LIBRARY_PATH
).'javascript/iepngfix/iepngfix.htc) } '."\n";
$css_file_to_string .= 'img, div { behavior: url('.api_get_path(WEB_LIBRARY_PATH).'javascript/iepngfix/iepngfix.htc) } '."\n";
}
if (!$disable_js_and_css_files) {

180
main/social/search.php
Unescape View File

@ -8,8 +8,8 @@
* Initialization
*/
// name of the language file that needs to be included
$language_file = array('registration','admin','userInfo');
$cidReset = true;
$language_file = array('registration', 'admin', 'userInfo');
$cidReset = true;
require_once '../inc/global.inc.php';
require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
require_once api_get_path(LIBRARY_PATH).'magpierss/rss_fetch.inc';
@ -37,12 +37,12 @@ function send_message_to_user(user_id) {
modal:true,
height:350,
buttons: {
"'. addslashes(get_lang('Sent')).'": function() {
"'.addslashes(get_lang('Sent')).'": function() {
var bValid = true;
bValid = bValid && checkLength( subject, "subject", 1, 255 );
bValid = bValid && checkLength( content, "content", 1, 255 );
if ( bValid ) {
if (bValid) {
var url = "'.$ajax_url.'?a=send_message&user_id="+user_id;
var params = $("#send_message_form").serialize();
$.ajax({
@ -75,7 +75,7 @@ function send_invitation_to_user(user_id) {
$("#send_invitation_div").dialog({
modal:true,
buttons: {
"'. addslashes(get_lang('SendInvitation')).'": function() {
"'.addslashes(get_lang('SendInvitation')).'": function() {
var bValid = true;
bValid = bValid && checkLength( content, "content", 1, 255 );
if (bValid) {
@ -131,23 +131,23 @@ $(document).ready(function (){
</script>';
if (api_get_setting('allow_social_tool') !='true') {
if (api_get_setting('allow_social_tool') != 'true') {
api_not_allowed();
}
$this_section = SECTION_SOCIAL;
$tool_name = get_lang('Search');
$interbreadcrumb[]= array ('url' =>'profile.php','name' => get_lang('SocialNetwork'));
$this_section = SECTION_SOCIAL;
$tool_name = get_lang('Search');
$interbreadcrumb[] = array('url' => 'profile.php', 'name' => get_lang('SocialNetwork'));
$query_vars = array();
$query = isset($_GET['q']) ? $_GET['q'] : null;
$query = isset($_GET['q']) ? $_GET['q'] : null;
$social_left_content = SocialManager::show_social_menu('search');
$social_right_content = '<div class="span9">'.UserManager::get_search_form($query).'</div>';
//I'm searching something
if ($query !='') {
if ($query != '') {
//get users from tags
$users = UserManager::get_all_user_tags($_GET['q'], 0, 0, 5);
$groups = GroupPortalManager::get_all_group_tags($_GET['q']);
@ -157,123 +157,127 @@ if ($query !='') {
}
$results = '<div id="online_grid_container"><div class="span9">';
if (is_array($users) && count($users)> 0) {
$results .= Display::page_subheader(get_lang('Users'));
if (is_array($users) && count($users) > 0) {
$results .= Display::page_subheader(get_lang('Users'));
$results .= '<ul class="thumbnails">';
foreach($users as $user) {
$send_inv = '<button class="btn btn-mini disabled ">'.get_lang('SendInvitation').'</button><br /><br />';
$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'];
foreach ($users as $user) {
$send_inv = '<button class="btn btn-mini disabled "><i class="icon-user"></i> '.get_lang('SendInvitation').'</button><br /><br />';
$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'];
//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="javascript:void(0);" onclick="javascript:send_invitation_to_user(\''.$user['user_id'].'\');"/><button class="btn btn-mini">'.get_lang('SendInvitation').'</button></a><br /><br />';
$send_inv = '<a href="javascript:void(0);" onclick="javascript:send_invitation_to_user(\''.$user['user_id'].'\');"/>
<button class="btn btn-mini"><i class="icon-user"></i> '.get_lang('SendInvitation').'</button></a><br /><br />';
}
$send_msg = '<a href="javascript:void(0);" onclick="javascript:send_message_to_user(\''.$user['user_id'].'\');"/><button class="btn btn-mini">'.get_lang('SendMessage').'</button></a>';
$send_msg = '<a href="javascript:void(0);" onclick="javascript:send_message_to_user(\''.$user['user_id'].'\');"/>
<button class="btn btn-mini"><i class="icon-envelope"></i> '.get_lang('SendMessage').'</button></a>';
if (empty($user['picture_uri'])) {
$picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown.jpg';
$img = '<img src="'.$picture['file'].'">';
$img = '<img src="'.$picture['file'].'">';
} else {
$picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'], 50, USER_IMAGE_SIZE_ORIGINAL );
$picture = UserManager::get_picture_user(
$user['user_id'],
$user['picture_uri'],
50,
USER_IMAGE_SIZE_ORIGINAL
);
$img = '<img src="'.$picture['file'].'" width="100" height="100">';
}
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'));
}
$user['tag'] = isset($user['tag']) ? $user['tag'] : null;
$user_info['complete_name'] = Display::url($status_icon.$user_info['complete_name'], $url).'<br /><br />'.$user['tag'];
$invitations = $user['tag'].$send_inv.$send_msg;
$results .= '<li class="span3 ">'.$user_info['complete_name'].'<div class="left">'.$img.'</div><div class="btn-invitations">'.$invitations.'</div></li>';
}
$results .='</ul></div></div>';
$social_right_content .= $results;
}
//Get users from tags this loop does not make sense for now ...
/*
if (is_array($results) && count($results) > 0) {
foreach ($results as $result) {
$id = $result['id'];
$url_open = '<a href="groups.php?id='.$id.'">';
$url_close = '</a>';
$name = api_strtoupper(cut($result['name'],25,true));
if (isset($result['relation_type']) && $result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
$name .= Display::return_icon('social_group_admin.png', get_lang('Admin'), array('style'=>'vertical-align:middle'));
} elseif (isset($result['relation_type']) && $result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
$name .= Display::return_icon('social_group_moderator.png', get_lang('Moderator'), array('style'=>'vertical-align:middle'));
}
$count_users_group = count(GroupPortalManager::get_all_users_by_group($id));
if ($count_users_group == 1 ) {
$count_users_group = $count_users_group.' '.get_lang('Member');
} else {
$count_users_group = $count_users_group.' '.get_lang('Members');
}
$user['tag'] = isset($user['tag']) ? $user['tag'] : null;
$picture = GroupPortalManager::get_picture_group($id, $result['picture_uri'],80);
$user_info['complete_name'] = Display::url(
$status_icon.$user_info['complete_name'],
$url
).'<br /><br />'.$user['tag'];
$result['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';
$grid_item_1 = Display::return_icon('boxmygroups.jpg');
$item_1 = '<div>'.$url_open.$result['picture_uri'].'<strong>'.$name.'<br />('.$count_users_group.')</strong>'.$url_close.'</div>';
$invitations = $user['tag'].$send_inv.$send_msg;
if ($result['description'] != '') {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2">'.get_lang('Description').'</span></div>';
$item_3 = '<div class="box_description_group_content" >'.cut($result['description'],100,true).'</div>';
} else {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
$item_3 = '<div class="box_description_group_content" ></div>';
}
$item_4 = '<div class="box_description_group_actions" >'.$url_open.get_lang('SeeMore').$url_close.'</div>';
$grid_item_2 = $item_1.$item_2.$item_3.$item_4;
$grid_my_groups[]= array($grid_item_1,$grid_item_2);
$results .= '<li class="span3">
<div class="">
<div class="row-fluid">
<div class="span12">
'.$user_info['complete_name'].'
</div>
<div class="span4">
<div class="media">
'.$img.'
</div>
</div>
<div class="span5">
<div class="media">
'.$invitations.'
</div>
</div>
</div>
</div>
</li>';
}
}*/
$results .= '</ul></div></div>';
$social_right_content .= $results;
}
$grid_groups = array();
if (is_array($groups) && count($groups)>0) {
if (is_array($groups) && count($groups) > 0) {
$social_right_content .= '<div class="span9">';
$social_right_content .= Display::page_subheader(get_lang('Groups'));
foreach($groups as $group) {
$group['name'] = Security::remove_XSS($group['name'], STUDENT, true);
$social_right_content .= Display::page_subheader(get_lang('Groups'));
foreach ($groups as $group) {
$group['name'] = Security::remove_XSS($group['name'], STUDENT, true);
$$group['description'] = Security::remove_XSS($group['description'], STUDENT, true);
$id = $group['id'];
$url_open = '<a href="groups.php?id='.$id.'" >';
$url_close = '</a>';
$name = cut($group['name'],25,true);
$count_users_group = count(GroupPortalManager::get_all_users_by_group($id));
if ($count_users_group == 1 ) {
$id = $group['id'];
$url_open = '<a href="groups.php?id='.$id.'" >';
$url_close = '</a>';
$name = cut($group['name'], 25, true);
$count_users_group = count(GroupPortalManager::get_all_users_by_group($id));
if ($count_users_group == 1) {
$count_users_group = $count_users_group.' '.get_lang('Member');
} else {
$count_users_group = $count_users_group.' '.get_lang('Members');
}
$picture = GroupPortalManager::get_picture_group($group['id'], $group['picture_uri'],80);
$tags = GroupPortalManager::get_group_tags($group['id']);
$picture = GroupPortalManager::get_picture_group($group['id'], $group['picture_uri'], 80);
$tags = GroupPortalManager::get_group_tags($group['id']);
$group['picture_uri'] = '<img class="social-groups-image" src="'.$picture['file'].'" hspace="4" height="50" border="2" align="left" width="50" />';
$item_0 = Display::div($group['picture_uri'], array('class'=>'box_description_group_image'));
$members = Display::span($count_users_group, array('class'=>'box_description_group_member'));
$item_1 = Display::div(Display::tag('h3', $url_open.$name.$url_close).$members, array('class'=>'box_description_group_title'));
$item_0 = Display::div($group['picture_uri'], array('class' => 'box_description_group_image'));
$members = Display::span($count_users_group, array('class' => 'box_description_group_member'));
$item_1 = Display::div(
Display::tag('h3', $url_open.$name.$url_close).$members,
array('class' => 'box_description_group_title')
);
$item_2 = '';
$item_3 = '';
if ($group['description'] != '') {
$item_3 = '<div class="box_description_group_content" >'.cut($group['description'],100,true).'</div>';
$item_3 = '<div class="box_description_group_content" >'.cut($group['description'], 100, true).'</div>';
} else {
$item_2 = '<div class="box_description_group_title" ><span class="social-groups-text2"></span></div>';
$item_3 = '<div class="box_description_group_content" ></div>';
}
$item_4 = '<div class="box_description_group_tags" >'.$tags.'</div>';
$item_5 = '<div class="box_description_group_actions" >'.$url_open.get_lang('SeeMore').$url_close.'</div>';
$grid_item_2 = $item_0.$item_1.$item_2.$item_3.$item_4.$item_5;
$grid_groups[]= array('',$grid_item_2);
$item_4 = '<div class="box_description_group_tags" >'.$tags.'</div>';
$item_5 = '<div class="box_description_group_actions" >'.$url_open.get_lang('SeeMore').$url_close.'</div>';
$grid_item_2 = $item_0.$item_1.$item_2.$item_3.$item_4.$item_5;
$grid_groups[] = array('', $grid_item_2);
}
}
$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);
$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 .= MessageManager::generate_message_form('send_message');
$social_right_content .= MessageManager::generate_invitation_form('send_invitation');

Write Preview
Loading…
Cancel
Save