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 online grid styles + adding user image when reading an email

Browse Source
skala
Julio Montoya 15 years ago
parent 022ed53484
commit ee3408c69b
27 changed files with 541 additions and 74 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. 21
      main/css/academica/default.css
  2. 21
      main/css/baby_orange/default.css
  3. 21
      main/css/blue_lagoon/default.css
  4. 20
      main/css/chamilo/default.css
  5. 21
      main/css/chamilo_electric_blue/default.css
  6. 21
      main/css/chamilo_green/default.css
  7. 21
      main/css/chamilo_orange/default.css
  8. 21
      main/css/chamilo_red/default.css
  9. 21
      main/css/cool_blue/default.css
  10. 22
      main/css/corporate/default.css
  11. 21
      main/css/cosmic_campus/default.css
  12. 21
      main/css/delicious_bordeaux/default.css
  13. 21
      main/css/dokeos_blue/default.css
  14. 21
      main/css/dokeos_classic/default.css
  15. 21
      main/css/dokeos_classic_2D/default.css
  16. 21
      main/css/empire_green/default.css
  17. 21
      main/css/fruity_orange/default.css
  18. 20
      main/css/public_admin/default.css
  19. 21
      main/css/royal_purple/default.css
  20. 21
      main/css/silver_line/default.css
  21. 21
      main/css/sober_brown/default.css
  22. 21
      main/css/steel_grey/default.css
  23. 21
      main/css/tasty_olive/default.css
  24. 56
      main/inc/lib/message.lib.php
  25. 2
      main/inc/lib/social.lib.php
  26. 15
      main/social/search.php
  27. 24
      whoisonline.php

21
main/css/academica/default.css
Unescape View File

@ -3661,3 +3661,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/baby_orange/default.css
Unescape View File

@ -3589,3 +3589,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/blue_lagoon/default.css
Unescape View File

@ -4275,3 +4275,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

20
main/css/chamilo/default.css
Unescape View File

@ -4614,3 +4614,23 @@ padding-top:10px;
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/chamilo_electric_blue/default.css
Unescape View File

@ -4607,3 +4607,24 @@ span.form_required {
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/chamilo_green/default.css
Unescape View File

@ -4615,3 +4615,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/chamilo_orange/default.css
Unescape View File

@ -4590,3 +4590,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/chamilo_red/default.css
Unescape View File

@ -4600,3 +4600,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/cool_blue/default.css
Unescape View File

@ -4142,3 +4142,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

22
main/css/corporate/default.css
Unescape View File

@ -3610,3 +3610,25 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/cosmic_campus/default.css
Unescape View File

@ -3673,3 +3673,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/delicious_bordeaux/default.css
Unescape View File

@ -4133,3 +4133,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/dokeos_blue/default.css
Unescape View File

@ -4182,3 +4182,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/dokeos_classic/default.css
Unescape View File

@ -4405,3 +4405,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/dokeos_classic_2D/default.css
Unescape View File

@ -4406,3 +4406,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/empire_green/default.css
Unescape View File

@ -4119,3 +4119,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/fruity_orange/default.css
Unescape View File

@ -4121,3 +4121,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

20
main/css/public_admin/default.css
Unescape View File

@ -4327,3 +4327,23 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/royal_purple/default.css
Unescape View File

@ -4117,3 +4117,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/silver_line/default.css
Unescape View File

@ -4062,3 +4062,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/sober_brown/default.css
Unescape View File

@ -4271,3 +4271,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/steel_grey/default.css
Unescape View File

@ -4120,3 +4120,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

21
main/css/tasty_olive/default.css
Unescape View File

@ -4122,3 +4122,24 @@ span.form_required {
border: 1px solid black;
cursor: pointer;
}
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
.online_grid_element_1, .online_grid_element_2 {
font-size:10px;
}

56
main/inc/lib/message.lib.php
Unescape View File

@ -711,37 +711,38 @@ class MessageManager
$row[5] = Security::remove_XSS($row[5]);
$message_content = '
<table>
$from_user = UserManager::get_user_info_by_id($row[1]);
$name = api_get_person_name($from_user['firstname'], $from_user['lastname']);
$user_image = UserManager::get_picture_user($row[1], $from_user['picture_uri'],80);
$user_image = Display::img($user_image['file'], $name, array('title'=>$name));
$message_content = '<table>
<tr>
<td width=10>&nbsp; </td>
<td vAlign=top width="100%">
<td width="10px">&nbsp; </td>
<td width="100%">
<table>
<tr>
<td width="100%">
<td valign="top" width="100%">
<h1>'.str_replace("\\","",$row[5]).'</h1>
</td>
<tr>';
if (api_get_setting('allow_social_tool') == 'true') {
$user_image = '';
/* @todo add user image
$user_image = UserManager::get_user_picture_path_by_id($row[1],'web', true,false);
$user_image = UserManager::get_picture_user($row[1], $user_image['file'],'40');
$user_image = '<img src="'.$user_image['file'].'" style="'.$user_image['style'].'" >';
*/
if ($source == 'outbox') {
$message_content .='<td>'.get_lang('From').' '.$user_image.'<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$row[1].'">'.GetFullUserName($row[1]).'</a> '.api_strtolower(get_lang('To')).'&nbsp;<b>'.GetFullUserName($row[2]).'</b> </TD>';
} else {
$message_content .='<td>'.get_lang('From').' '.$user_image.'<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$row[1].'">'.GetFullUserName($row[1]).'</a> '.api_strtolower(get_lang('To')).'&nbsp;<b>'.get_lang('Me').'</b> </TD>';
}
</td>';
if (api_get_setting('allow_social_tool') == 'true') {
$message_content .='<td width="100%">'.$user_image.'</td>';
}
} else {
if ($source == 'outbox') {
$message_content .='<td>'.get_lang('From').'&nbsp;'.GetFullUserName($row[1]).'</b> '.api_strtolower(get_lang('To')).' <b>'.GetFullUserName($row[2]).'</b> </TD>';
} else {
$message_content .='<td>'.get_lang('From').'&nbsp;'.GetFullUserName($row[1]).'</b> '.api_strtolower(get_lang('To')).' <b>'.get_lang('Me').'</b> </TD>';
}
}
$message_content .='<tr>';
if (api_get_setting('allow_social_tool') == 'true') {
if ($source == 'outbox') {
$message_content .='<td>'.get_lang('From').' <a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$row[1].'">'.$name.'</a> '.api_strtolower(get_lang('To')).'&nbsp;<b>'.GetFullUserName($row[2]).'</b> </td>';
} else {
$message_content .='<td>'.get_lang('From').' <a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$row[1].'">'.$name.'</a> '.api_strtolower(get_lang('To')).'&nbsp;<b>'.get_lang('Me').'</b> </td>';
}
} else {
if ($source == 'outbox') {
$message_content .='<td>'.get_lang('From').'&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.GetFullUserName($row[2]).'</b> </td>';
} else {
$message_content .='<td>'.get_lang('From').'&nbsp;'.$name.'</b> '.api_strtolower(get_lang('To')).' <b>'.get_lang('Me').'</b> </td>';
}
}
$message_content .='</tr>
<tr>
@ -750,9 +751,10 @@ class MessageManager
</tr>
</table>
<br />
<hr style="color:#ddd" />
<table height=209 width="100%">
<tr>
<td vAlign=top class="view-message-content">'.str_replace("\\","",$row[6]).'</td>
<td valign=top class="view-message-content">'.str_replace("\\","",$row[6]).'</td>
</tr>
</table>
<div id="message-attach">'.(!empty($files_attachments)?implode('&nbsp;|&nbsp;',$files_attachments):'').'</div>

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

@ -803,7 +803,7 @@ class SocialManager extends UserManager {
$name = api_get_person_name($user_info['firstName'], $user_info['lastName']);
$table_row[] = '<a href="'.$url.'"><img title = "'.$name.'" class="social-home-users-online" alt="'.$name.'" src="'.$friends_profile['file'].'"></a>';
$table_row[] = '<a href="'.$url.'" style="font-size:10px;">'.(cut($user_info['firstName'],16)).'<br />'.cut($user_info['lastName'],18).'</a>';
$table_row[] = '<a href="'.$url.'">'.(cut($user_info['firstName'],16)).'<br />'.cut($user_info['lastName'],18).'</a>';
$user_anonymous = api_get_anonymous_id();
$table_data[] = $table_row;

15
main/social/search.php
Unescape View File

@ -62,18 +62,25 @@ echo '<div id="social-content">';
if (is_array($users) && count($users)> 0) {
echo '<h2>'.get_lang('Users').'</h2>';
foreach($users as $user) {
$picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'],80);
if (empty($user['picture_uri'])) {
$picture['file'] = api_get_path(WEB_CODE_PATH).'img/unknown_180_100.jpg';
} else {
$picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'], 80, USER_IMAGE_SIZE_ORIGINAL );
}
//$picture = UserManager::get_picture_user($user['user_id'], $user['picture_uri'],'', USER_IMAGE_SIZE_ORIGINAL);
$url_open = '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$user['user_id'].'">';
$url_close ='</a>';
$img = $url_open.'<img src="'.$picture['file'].'" />'.$url_close;
$user['firstname'] = $url_open.$user['firstname'].$url_close;
$user['lastname'] = $url_open.$user['lastname'].$url_close;
$results[] = array($img, $user['firstname'],$user['lastname'], $user['tag']);
$user['lastname'] = $url_open.$user['lastname']. $url_close;
$results[] = array($img, $user['firstname'], $user['lastname'], $user['tag']);
}
echo '<div class="social-box-container2">';
echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Users')).'</div>';
echo '<div id="div_content_table" class="social-box-content2">';
Display::display_sortable_grid('search_user', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false ,true);
Display::display_sortable_grid('online', array(), $results, array('hide_navigation'=>true, 'per_page' => 5), $query_vars, false ,true);
echo '</div>';
echo '</div>';
}

24
whoisonline.php
Unescape View File

@ -151,31 +151,7 @@ if ((api_get_setting('showonline', 'world') == 'true' && !$_user['user_id']) ||
echo UserManager::get_search_form($_GET['q']);
}
}
//@todo move these style tag in the main/css
echo '
<style>
.online_grid_item {
float:left;
margin:10px;
text-align:center;
}
.online_grid_element_0 {
width: 100px;
height: 100px;
overflow: hidden;
}
/* input values to crop the image: top, right, bottom, left */
.online_grid_element_0 img{
width: 200px;
margin: -10px 0 0 -50px;
/* height: 150px; */
}
</style>';
SocialManager::display_user_list($user_list);
if (api_get_setting('allow_social_tool') == 'true') {
echo '</div>';
echo '</div>';

Write Preview
Loading…
Cancel
Save