Minor - flint fixes

pull/2744/head
Julio Montoya 7 years ago
parent f2a4134b76
commit d712b93585
  1. 3
      main/inc/lib/message.lib.php
  2. 1
      main/messages/inbox.php
  3. 2
      main/messages/new_message.php
  4. 2
      main/messages/outbox.php
  5. 3
      main/messages/view_message.php
  6. 6
      src/CoreBundle/Component/Utils/ChamiloApi.php

@ -2166,7 +2166,8 @@ class MessageManager
2,
20,
'DESC',
null,'table-custom'
null,
'table-custom'
);
$table->set_header(0, '', false, ['style' => 'width:15px;']);
$table->set_header(1, get_lang('Messages'), false);

@ -174,4 +174,3 @@ $content = $tpl->fetch($social_layout);
$tpl->assign('message', $show_message);
$tpl->assign('content', $content);
$tpl->display_one_col_template();

@ -346,7 +346,6 @@ if ($group_id != 0) {
Display::return_icon('back.png', api_xml_http_response_encode(get_lang('ComposeMessage')), null, ICON_SIZE_MEDIUM).'</a>';
$actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php?group_id='.$group_id.'">'.
Display::return_icon('message_new.png', api_xml_http_response_encode(get_lang('ComposeMessage')), null, ICON_SIZE_MEDIUM).'</a>';
} else {
$actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
Display::return_icon('back.png', get_lang('Back'), null, ICON_SIZE_MEDIUM).'</a>';
@ -419,4 +418,3 @@ $social_layout = $tpl->get_template('message/inbox.tpl');
$content = $tpl->fetch($social_layout);
$tpl->assign('content', $content);
$tpl->display_one_col_template();

@ -68,7 +68,6 @@ if (isset($_REQUEST['action'])) {
$keyword = '';
$message_content = null;
$actions .= Display::toolbarAction(
'toolbar',
[$actionsLeft, $actionsRight]
@ -117,4 +116,3 @@ $content = $tpl->fetch($social_layout);
$tpl->assign('message', $show_message);
$tpl->assign('content', $content);
$tpl->display_one_col_template();

@ -35,7 +35,6 @@ if (api_get_setting('allow_message_tool') === 'true') {
Display::return_icon('outbox.png', get_lang('Outbox'), null, ICON_SIZE_MEDIUM).'</a>';
}
$actions .= Display::toolbarAction(
'toolbar',
[$actionsLeft]
@ -51,7 +50,6 @@ if (empty($_GET['id'])) {
$show_menu = 'messages_inbox';
}
// MAIN CONTENT
$message_content = MessageManager::showMessageBox($messageId, $source);
@ -73,4 +71,3 @@ $social_layout = $tpl->get_template('message/inbox.tpl');
$content = $tpl->fetch($social_layout);
$tpl->assign('content', $content);
$tpl->display_one_col_template();

@ -289,12 +289,15 @@ class ChamiloApi
return api_get_path(WEB_CSS_PATH).'editor_content.css';
}
/**
* Get a list of colors from the palette at main/palette/pchart/default.color
* and return it as an array of strings
* and return it as an array of strings.
*
* @param bool $decimalOpacity Whether to return the opacity as 0..100 or 0..1
* @param bool $wrapInRGBA Whether to return it as 1,1,1,100 or rgba(1,1,1,100)
* @param int $fillUpTo If the number of colors is smaller than this number, generate more colors
*
* @return array An array of string colors
*/
public static function getColorPalette(
@ -327,6 +330,7 @@ class ChamiloApi
$palette[$i] = $palette[$i % $count];
}
}
return $palette;
}
}

Loading…
Cancel
Save