Change params order returnFontAwesomeIcon

remotes/angel/1.11.x
jmontoyaa 8 years ago
parent 3906a32d4f
commit d17a0c3aca
  1. 4
      main/exercise/exercise_submit.php
  2. 6
      main/inc/lib/display.lib.php
  3. 2
      main/inc/lib/javascript/chat/video.php

@ -985,7 +985,7 @@ if (!empty($error)) {
// Only for the first time
$("#save_for_now_"+question_id).html(\'' . Display::returnFontAwesomeIcon('spinner', true, null, 'fa-spin') . '\');
$("#save_for_now_"+question_id).html(\'' . Display::returnFontAwesomeIcon('spinner', null, true, 'fa-spin') . '\');
$.ajax({
type:"post",
async: false,
@ -1049,7 +1049,7 @@ if (!empty($error)) {
free_answers = $.param(free_answers);
$("#save_all_reponse").html(\'' . Display::returnFontAwesomeIcon('spinner', true, null, 'fa-spin') . '\');
$("#save_all_reponse").html(\'' . Display::returnFontAwesomeIcon('spinner', null, true, 'fa-spin') . '\');
$.ajax({
type:"post",

@ -2400,17 +2400,17 @@ class Display
/**
* Get a HTML code for a icon by Font Awesome
* @param string $name The icon name
* @param int|string $size Optional. The size for the icon. (Example: lg, 2, 3, 4, 5)
* @param boolean $fixWidth Optional. Whether add the fw class
* @param int|string $size Optional. The size for the icon.
* @param string $additionalClass Optional. Additional class
*
* @return string
*/
public static function returnFontAwesomeIcon(
$name,
$size = '',
$fixWidth = false,
$size = null,
$additionalClass = null
$additionalClass = ''
) {
$className = "fa fa-$name";

@ -45,7 +45,7 @@ $template->assign('block_friends', $friend_html);
$content = $template->fetch('default/chat/video.tpl');
$templateHeader = Display::returnFontAwesomeIcon('video-camera', true, 'lg')
$templateHeader = Display::returnFontAwesomeIcon('video-camera', 'lg', true)
. $chatVideo->getRoomName();
$template->assign('header', $templateHeader);

Loading…
Cancel
Save