Minor - fix icons use {{ 'pencil' | mdi_icon }} in tpls

pull/3984/head
Julio 4 years ago
parent ddae1a497c
commit 6a4f1c2f47
  1. 4
      public/main/course_progress/index.php
  2. 2
      public/main/exercise/exercise_result.php
  3. 2
      public/main/forum/forumfunction.inc.php
  4. 4
      public/main/forum/viewthread.php
  5. 6
      public/main/gradebook/lib/be/category.class.php
  6. 2
      public/main/gradebook/my_certificates.php
  7. 2
      public/main/inc/ajax/sequence.ajax.php
  8. 5
      public/main/inc/lib/display.lib.php
  9. 4
      public/main/inc/lib/internationalization.lib.php
  10. 6
      public/main/inc/lib/link.lib.php
  11. 7
      public/main/link/index.html
  12. 2
      public/main/lp/scorm.class.php
  13. 2
      public/main/survey/fillsurvey.php
  14. 2
      public/main/survey/preview.php
  15. 8
      public/main/template/default/course_progress/progress.html.twig
  16. 11
      public/main/template/default/exercise/partials/result_exercise.html.twig
  17. 2
      public/main/template/default/forum/list.html.twig
  18. 4
      public/main/template/default/glossary/list.html.twig
  19. 19
      public/main/template/default/my_space/partials/tracking_course_overview.html.twig
  20. 2
      public/main/template/default/my_space/partials/tracking_user_overview.html.twig
  21. 2
      public/main/template/default/my_space/user_details.html.twig
  22. 4
      public/main/template/default/skill/criteria.html.twig
  23. 2
      public/main/template/default/social/user_block.html.twig
  24. 4
      public/main/template/default/user_portal/list_courses.html.twig
  25. 2
      public/main/template/default/user_portal/list_sessions.html.twig
  26. 2
      public/main/work/work_list_all.php

@ -222,7 +222,7 @@ switch ($action) {
// Display form // Display form
$form = new FormValidator('thematic_add', 'POST', 'index.php?action=thematic_add&'.api_get_cidreq()); $form = new FormValidator('thematic_add', 'POST', 'index.php?action=thematic_add&'.api_get_cidreq());
if ('thematic_edit' === $action) { if ('thematic_edit' === $action) {
$form->addElement('header', '', get_lang('Edit thematic section')); $form->addHeader(get_lang('Edit thematic section'));
} }
$form->addHidden('sec_token', $token); $form->addHidden('sec_token', $token);
@ -524,7 +524,7 @@ switch ($action) {
$last_done_thematic_advance = null; $last_done_thematic_advance = null;
if ($thematicEntity) { if ($thematicEntity) {
$thematic_data[$thematicId] = $thematicEntity; $thematic_data[$thematicId] = $thematicEntity;
$data['total_average_of_advances'] = $thematicManager->get_average_of_advances_by_thematic($thematicId); $data['total_average_of_advances'] = $thematicManager->get_average_of_advances_by_thematic($thematicEntity);
} else { } else {
$thematic_data = $thematicManager->getThematicList($course, $session); $thematic_data = $thematicManager->getThematicList($course, $session);
//$max_thematic_item = $thematicManager->get_max_thematic_item($course, $session); //$max_thematic_item = $thematicManager->get_max_thematic_item($course, $session);

@ -153,7 +153,7 @@ if ('embeddable' !== $origin) {
'learnpath_item_id' => $learnpath_item_id, 'learnpath_item_id' => $learnpath_item_id,
'learnpath_item_view_id' => $learnpath_item_view_id, 'learnpath_item_view_id' => $learnpath_item_view_id,
]), ]),
'far fa-edit', 'pencil',
'info' 'info'
); );
} }

@ -6139,7 +6139,7 @@ function getPostStatus(CForum $forum, array $row, bool $addWrapper = true): stri
break; break;
case CForumPost::STATUS_WAITING_MODERATION: case CForumPost::STATUS_WAITING_MODERATION:
$label = get_lang('Waiting for moderation'); $label = get_lang('Waiting for moderation');
$icon = 'warning'; $icon = 'alert';
$buttonType = 'warning'; $buttonType = 'warning';
break; break;

@ -472,7 +472,7 @@ foreach ($posts as $post) {
$editButton = Display::toolbarButton( $editButton = Display::toolbarButton(
get_lang('Edit'), get_lang('Edit'),
$editUrl, $editUrl,
'pencil-alt', 'pencil',
'default' 'default'
); );
} }
@ -642,7 +642,7 @@ foreach ($posts as $post) {
'post' => $post['post_id'], 'post' => $post['post_id'],
'action' => 'quote', 'action' => 'quote',
]), ]),
'quote-left', 'comment-quote',
'success', 'success',
['id' => "quote-post-{$post['post_id']}"] ['id' => "quote-post-{$post['post_id']}"]
); );

@ -2070,7 +2070,7 @@ class Category implements GradebookItem
'badge_link' => Display::toolbarButton( 'badge_link' => Display::toolbarButton(
get_lang('Export badges'), get_lang('Export badges'),
api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id", api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id",
'external-link' 'open-in-new'
), ),
]; ];
} }
@ -2159,7 +2159,7 @@ class Category implements GradebookItem
$html['badge_link'] = Display::toolbarButton( $html['badge_link'] = Display::toolbarButton(
get_lang('Export badges'), get_lang('Export badges'),
api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id", api_get_path(WEB_CODE_PATH)."gradebook/get_badges.php?user=$user_id",
'external-link' 'open-in-new'
); );
} }
@ -2409,7 +2409,7 @@ class Category implements GradebookItem
$downloadLink = Display::toolbarButton( $downloadLink = Display::toolbarButton(
get_lang('Download certificate in PDF'), get_lang('Download certificate in PDF'),
$certificate['pdf_url'], $certificate['pdf_url'],
'file-pdf-o' 'file-pdf-box'
); );
$viewLink = $certificate['certificate_link']; $viewLink = $certificate['certificate_link'];

@ -54,7 +54,7 @@ if ('true' === api_get_setting('allow_public_certificates')) {
Display::toolbarButton( Display::toolbarButton(
get_lang('Search certificates'), get_lang('Search certificates'),
api_get_path(WEB_CODE_PATH).'gradebook/search.php', api_get_path(WEB_CODE_PATH).'gradebook/search.php',
'search', 'magnify',
'info' 'info'
) )
); );

@ -101,7 +101,7 @@ switch ($action) {
$linkDelete = Display::toolbarButton( $linkDelete = Display::toolbarButton(
get_lang('Delete'), get_lang('Delete'),
'#', '#',
'trash', 'delete',
'default', 'default',
[ [
'class' => 'delete_vertex btn btn-block btn-xs', 'class' => 'delete_vertex btn btn-block btn-xs',

@ -2377,9 +2377,10 @@ class Display
if (!empty($type)) { if (!empty($type)) {
$buttonClass = "btn btn-$type"; $buttonClass = "btn btn-$type";
} }
$icon = self::tag('i', null, ['class' => "fa fa-$icon fa-fw", 'aria-hidden' => 'true']); //$icon = self::tag('i', null, ['class' => "fa fa-$icon fa-fw", 'aria-hidden' => 'true']);
$icon = self::getMdiIcon($icon);
$attributes['class'] = isset($attributes['class']) ? "$buttonClass {$attributes['class']}" : $buttonClass; $attributes['class'] = isset($attributes['class']) ? "$buttonClass {$attributes['class']}" : $buttonClass;
$attributes['title'] = isset($attributes['title']) ? $attributes['title'] : $text; $attributes['title'] = $attributes['title'] ?? $text;
if (!$includeText) { if (!$includeText) {
$text = '<span class="sr-only">'.$text.'</span>'; $text = '<span class="sr-only">'.$text.'</span>';

@ -844,9 +844,9 @@ function api_utf8_encode($string, $from_encoding = 'UTF-8')
/** /**
* Converts a given string from UTF-8 encoding to a specified encoding. * Converts a given string from UTF-8 encoding to a specified encoding.
* *
* @param string $string the string being converted * @param string $string the string being converted
* @param string $toEncoding (optional) The encoding that $string is being converted to. * @param string $toEncoding (optional) The encoding that $string is being converted to.
* If it is omitted, the platform character set is assumed. * If it is omitted, the platform character set is assumed.
* *
* @return string Returns the converted string. * @return string Returns the converted string.
* This function is aimed at replacing the function utf8_decode() for human-language strings. * This function is aimed at replacing the function utf8_decode() for human-language strings.

@ -994,7 +994,7 @@ class Link extends Model
$toolbar .= Display::toolbarButton( $toolbar .= Display::toolbarButton(
'', '',
$url, $url,
'pencil-alt', 'pencil',
'secondary btn-sm', 'secondary btn-sm',
[ [
'title' => $title, 'title' => $title,
@ -1027,7 +1027,7 @@ class Link extends Model
$toolbar .= Display::toolbarButton( $toolbar .= Display::toolbarButton(
'', '',
$urlVisibility, $urlVisibility,
'eye-slash', 'eye-off',
'secondary btn-sm', 'secondary btn-sm',
[ [
'title' => $title, 'title' => $title,
@ -1070,7 +1070,7 @@ class Link extends Model
$toolbar .= Display::toolbarButton( $toolbar .= Display::toolbarButton(
'', '',
$url, $url,
'trash', 'delete',
'secondary btn-sm', 'secondary btn-sm',
[ [
'onclick' => $event, 'onclick' => $event,

@ -1,7 +0,0 @@
<html>
<head>
<meta http-equiv="refresh" content="0; url=link.php">
</head>
<body>
</body>
</html>

@ -473,7 +473,7 @@ class scorm extends learnpath
$lpToCheck = null, $lpToCheck = null,
$allowHtaccess = false $allowHtaccess = false
) { ) {
$this->debug= 100; $this->debug = 100;
if ($this->debug) { if ($this->debug) {
error_log( error_log(
'In scorm::import_package('.print_r($zipFileInfo, true).',"'.$currentDir.'") method' 'In scorm::import_package('.print_r($zipFileInfo, true).',"'.$currentDir.'") method'

@ -642,7 +642,7 @@ if (isset($_POST['finish_survey'])) {
echo Display::toolbarButton( echo Display::toolbarButton(
get_lang('Return to Course Homepage'), get_lang('Return to Course Homepage'),
api_get_course_url($courseInfo['real_id']), api_get_course_url($courseInfo['real_id']),
'home' 'home-outline'
); );
} }

@ -278,7 +278,7 @@ $form->display();
echo Display::toolbarButton( echo Display::toolbarButton(
get_lang('Return to Course Homepage'), get_lang('Return to Course Homepage'),
api_get_course_url($courseInfo['real_id']), api_get_course_url($courseInfo['real_id']),
'home' 'home-outline'
); );
Display::display_footer(); Display::display_footer();

@ -88,7 +88,7 @@
<a title="{{ 'Edit thematic section' | trans }}" <a title="{{ 'Edit thematic section' | trans }}"
href="index.php?{{ course_url_params }}&origin=thematic_details&action=thematic_plan_list&thematic_id={{ item.iid }}&width=700&height=500" href="index.php?{{ course_url_params }}&origin=thematic_details&action=thematic_plan_list&thematic_id={{ item.iid }}&width=700&height=500"
class="btn btn-outline-secondary btn-sm"> class="btn btn-outline-secondary btn-sm">
<i class="fas fa-pencil-alt"></i> {{ 'pencil' | mdi_icon }}
</a> </a>
</div> </div>
{% endif %} {% endif %}
@ -112,7 +112,7 @@
<a title="{{ 'New thematic advance' | trans }}" <a title="{{ 'New thematic advance' | trans }}"
href="index.php?{{ course_url_params }}&action=thematic_advance_add&thematic_id={{ item.iid }}" href="index.php?{{ course_url_params }}&action=thematic_advance_add&thematic_id={{ item.iid }}"
class="btn btn-outline-secondary btn-sm"> class="btn btn-outline-secondary btn-sm">
<i class="fa fa-plus-circle" aria-hidden="true"></i> {{ 'plus-circle' | mdi_icon }}
</a> </a>
</div> </div>
{% endif %} {% endif %}
@ -134,13 +134,13 @@
<a class="btn btn-default btn-sm" <a class="btn btn-default btn-sm"
href="index.php?{{ course_url_params }}&action=thematic_advance_edit&thematic_id={{ item.iid }}&thematic_advance_id={{ advance.iid }}" href="index.php?{{ course_url_params }}&action=thematic_advance_edit&thematic_id={{ item.iid }}&thematic_advance_id={{ advance.iid }}"
title="{{ 'Edit' |trans }}"> title="{{ 'Edit' |trans }}">
<i class="fa fa-pen" aria-hidden="true"></i> {{ 'pencil' | mdi_icon }}
</a> </a>
<a class="btn btn-default btn-sm" <a class="btn btn-default btn-sm"
onclick="javascript:if(!confirm('{{ 'Are you sure to delete' | trans }}')) return false;" onclick="javascript:if(!confirm('{{ 'Are you sure to delete' | trans }}')) return false;"
href="index.php?{{ course_url_params }}&action=thematic_advance_delete&thematic_id={{ item.iid }}&thematic_advance_id={{ advance.iid }}" href="index.php?{{ course_url_params }}&action=thematic_advance_delete&thematic_id={{ item.iid }}&thematic_advance_id={{ advance.iid }}"
title="{{ 'Delete' |trans }}"> title="{{ 'Delete' |trans }}">
<i class="fa fa-trash" aria-hidden="true"></i> {{ 'delete' | mdi_icon }}
</a> </a>
</div> </div>
</div> </div>

@ -27,27 +27,30 @@
<div class="group-data"> <div class="group-data">
<div class="list-data username"> <div class="list-data username">
<span class="item">{{ 'Username'|get_lang }}</span> <span class="item">{{ 'Username'|get_lang }}</span>
<i class="fa fa-fw fa-user" aria-hidden="true"></i> {{ data.username }} {{ 'account' | mdi_icon }} {{ data.username }}
</div> </div>
{% if data.start_date %} {% if data.start_date %}
<div class="list-data start-date"> <div class="list-data start-date">
<span class="item">{{ 'StartDate'|get_lang }}</span> <span class="item">{{ 'StartDate'|get_lang }}</span>
<i class="fa fa-fw fa-calendar" aria-hidden="true"></i> {{ data.start_date }} {{ 'calendar' | mdi_icon }}
{{ data.start_date }}
</div> </div>
{% endif %} {% endif %}
{% if data.duration %} {% if data.duration %}
<div class="list-data duration"> <div class="list-data duration">
<span class="item">{{ 'Duration'|get_lang }}</span> <span class="item">{{ 'Duration'|get_lang }}</span>
<i class="fa fa-fw fa-clock-o" aria-hidden="true"></i> {{ data.duration }} {{ 'alarm' | mdi_icon }}
{{ data.duration }}
</div> </div>
{% endif %} {% endif %}
{% if data.ip %} {% if data.ip %}
<div class="list-data ip"> <div class="list-data ip">
<span class="item">{{ 'IP'|get_lang }}</span> <span class="item">{{ 'IP'|get_lang }}</span>
<i class="fa fa-fw fa-laptop" aria-hidden="true"></i> {{ data.ip }} {{ 'laptop' | mdi_icon }}
{{ data.ip }}
</div> </div>
{% endif %} {% endif %}

@ -113,7 +113,7 @@
</h3> </h3>
{% if subitem.last_poster_id is not empty %} {% if subitem.last_poster_id is not empty %}
<div class="forum-date"> <div class="forum-date">
<i class="fa fa-comments" aria-hidden="true"></i> {{ 'comment' | mdi_icon }}
{{ subitem.last_poster_date }} {{ subitem.last_poster_date }}
« {{ subitem.last_post_title }} » « {{ subitem.last_post_title }} »
{{ "By"|trans }} {{ "By"|trans }}

@ -7,12 +7,12 @@
<div class="float-right"> <div class="float-right">
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a href="{{ item.edit }}" class="btn btn-light btn-sm"> <a href="{{ item.edit }}" class="btn btn-light btn-sm">
<i class="fas fa-pencil-alt"></i> {{ 'pencil' | mdi_icon }}
</a> </a>
<a <a
title="{{ 'Confirm if you want to delete'|trans }}" href="{{ item.delete }}" title="{{ 'Confirm if you want to delete'|trans }}" href="{{ item.delete }}"
class="btn btn-light btn-sm delete-swal"> class="btn btn-light btn-sm delete-swal">
<i class="far fa-trash-alt"></i> {{ 'delete' | mdi_icon }}
</a> </a>
</div> </div>
</div> </div>

@ -22,7 +22,8 @@
<div class="col-md-2"> <div class="col-md-2">
<div class="state"> <div class="state">
<div class="stat-text"> <div class="stat-text">
<i class="fa fa-clock-o" aria-hidden="true"></i> {{ data.time_spent }} {{ 'alarm' | mdi_icon }}
{{ data.time_spent }}
</div> </div>
<div class="stat-heading"> <div class="stat-heading">
{{ 'TimeSpentInTheCourse'|get_lang }} {{ 'TimeSpentInTheCourse'|get_lang }}
@ -64,28 +65,36 @@
<span title="{{ 'TotalNumberOfMessages'|get_lang }}">{{ 'TotalNumberOfMessages'|get_lang }}</span> <span title="{{ 'TotalNumberOfMessages'|get_lang }}">{{ 'TotalNumberOfMessages'|get_lang }}</span>
</dt> </dt>
<dd> <dd>
<span class="text-color"><i class="fa fa-comments" aria-hidden="true"></i></span> <span class="text-color">
{{ 'comment' | mdi_icon }}
</span>
<span class="text-color">{{ data.number_message }}</span> <span class="text-color">{{ data.number_message }}</span>
</dd> </dd>
<dt> <dt>
<span title="{{ 'TotalNumberOfAssignments'|get_lang }}">{{ 'TotalNumberOfAssignments'|get_lang }}</span> <span title="{{ 'TotalNumberOfAssignments'|get_lang }}">{{ 'TotalNumberOfAssignments'|get_lang }}</span>
</dt> </dt>
<dd> <dd>
<span class="text-color"><i class="fas fa-pencil-alt" aria-hidden="true"></i></span> <span class="text-color">
{{ 'pencil' | mdi_icon }}
</span>
<span class="text-color">{{ data.number_assignments }}</span> <span class="text-color">{{ data.number_assignments }}</span>
</dd> </dd>
<dt> <dt>
<span title="{{ 'TotalExercisesAnswered'|get_lang }}">{{ 'TotalExercisesAnswered'|get_lang }}</span> <span title="{{ 'TotalExercisesAnswered'|get_lang }}">{{ 'TotalExercisesAnswered'|get_lang }}</span>
</dt> </dt>
<dd> <dd>
<span class="text-color"><i class="fa fa-file-text" aria-hidden="true"></i></span> <span class="text-color">
{{ 'file' | mdi_icon }}
</span>
<span class="text-color">{{ data.questions_answered }}</span> <span class="text-color">{{ data.questions_answered }}</span>
</dd> </dd>
<dt> <dt>
<span title="{{ 'LatestLogin'|get_lang }}">{{ 'LatestLogin'|get_lang }}</span> <span title="{{ 'LatestLogin'|get_lang }}">{{ 'LatestLogin'|get_lang }}</span>
</dt> </dt>
<dd> <dd>
<span class="text-color"><i class="fa fa-clock-o" aria-hidden="true"></i></span> <span class="text-color">
{{ 'alarm' | mdi_icon }}
</span>
<span class="text-color">{{ data.last_login }}</span> <span class="text-color">{{ data.last_login }}</span>
</dd> </dd>
</dl> </dl>

@ -32,7 +32,7 @@
</div> </div>
<div class="box time-spent" data-toggle="tooltip" data-placement="top" <div class="box time-spent" data-toggle="tooltip" data-placement="top"
title="{{ 'CourseTimeInfo'|get_lang }}"> title="{{ 'CourseTimeInfo'|get_lang }}">
<i class="fa fa-clock-o" aria-hidden="true"></i> {{ 'alarm' | mdi_icon }}
{{ course.time_spent }} {{ course.time_spent }}
</div> </div>
<div class="box" data-toggle="tooltip" data-placement="top" <div class="box" data-toggle="tooltip" data-placement="top"

@ -102,7 +102,7 @@
<div class="card box-widget"> <div class="card box-widget">
<div class="card-body"> <div class="card-body">
<div class="stat-widget-five"> <div class="stat-widget-five">
<i class="fas fa-pencil-alt" aria-hidden="true"></i> {{ 'pencil' | mdi_icon }}
{{ user_extra.tools.tasks }} {{ user_extra.tools.tasks }}
<div class="box-name"> <div class="box-name">
{{ 'Assignments'|trans }} {{ 'Assignments'|trans }}

@ -7,7 +7,9 @@
<figcaption class="caption"> <figcaption class="caption">
<p class="name-badge text-center">{{ skill_info.name }}</p> <p class="name-badge text-center">{{ skill_info.name }}</p>
{% if skill_info.short_code %} {% if skill_info.short_code %}
<p class="code-badge text-center"><i class="fa fa-shield"></i> {{ skill_info.short_code }}</p> <p class="code-badge text-center">
{{ 'shield' | mdi_icon }}
{{ skill_info.short_code }}</p>
{% endif %} {% endif %}
</figcaption> </figcaption>
</figure> </figure>

@ -13,7 +13,7 @@
title="{{ "Edit"|get_lang }}" title="{{ "Edit"|get_lang }}"
href="{{ url('index') }}main/admin/user_edit.php?user_id={{ user.id }}" href="{{ url('index') }}main/admin/user_edit.php?user_id={{ user.id }}"
> >
<i class="fas fa-pencil-alt" aria-hidden="true"></i> {{ 'pencil' | mdi_icon }}
</a> </a>
</div> </div>
{% endif %} {% endif %}

@ -36,12 +36,12 @@
<div class="float-right"> <div class="float-right">
{% if item.document == '' %} {% if item.document == '' %}
<a class="btn btn-outline-primary btn-sm" href="{{ item.edit_actions }}"> <a class="btn btn-outline-primary btn-sm" href="{{ item.edit_actions }}">
<i class="fas fa-pencil-alt"></i> {{ 'pencil' | mdi_icon }}
</a> </a>
{% else %} {% else %}
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<a class="btn btn-outline-primary btn-sm" href="{{ item.edit_actions }}"> <a class="btn btn-outline-primary btn-sm" href="{{ item.edit_actions }}">
<i class="fas fa-pencil-alt"></i> {{ 'pencil' | mdi_icon }}
</a> </a>
{{ item.document }} {{ item.document }}
</div> </div>

@ -18,7 +18,7 @@
<div class="float-right"> <div class="float-right">
<a class="btn btn-outline-secondary btn-sm" title="{{ "Edit"|get_lang }}" <a class="btn btn-outline-secondary btn-sm" title="{{ "Edit"|get_lang }}"
href="{{ url('legacy_main', { 'name' : 'session/resume_session.php', 'id_session' : row.id }) }}"> href="{{ url('legacy_main', { 'name' : 'session/resume_session.php', 'id_session' : row.id }) }}">
<i class="fas fa-pencil-alt"></i> {{ 'pencil' | mdi_icon }}
</a> </a>
</div> </div>
{% endif %} {% endif %}

@ -231,7 +231,7 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !$isDrhOfC
*/ */
$url = api_get_path(WEB_CODE_PATH). $url = api_get_path(WEB_CODE_PATH).
'work/work_list_all.php?'.api_get_cidreq().'&id='.$workId.'&action=delete_correction'; 'work/work_list_all.php?'.api_get_cidreq().'&id='.$workId.'&action=delete_correction';
$actionsLeft .= Display::toolbarButton(get_lang('Delete all corrections'), $url, 'trash', 'danger'); $actionsLeft .= Display::toolbarButton(get_lang('Delete all corrections'), $url, 'delete', 'danger');
} }
echo Display::toolbarAction('toolbar-worklist', [$actionsLeft]); echo Display::toolbarAction('toolbar-worklist', [$actionsLeft]);

Loading…
Cancel
Save