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

Display: Update more tool icons in learnpath builder - refs BT#19044

Browse Source
pull/4004/head
Yannick Warnier 4 years ago
parent cc881616da
commit 4bf5655181
3 changed files with 46 additions and 124 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. 12
      public/main/inc/lib/display.lib.php
  2. 2
      public/main/inc/lib/document.lib.php
  3. 156
      public/main/lp/learnpath.class.php

12
public/main/inc/lib/display.lib.php
Unescape View File

@ -2319,23 +2319,23 @@ class Display
$ariaExpanded = $open ? 'true' : 'false'; $ariaExpanded = $open ? 'true' : 'false';
$html = <<<HTML $html = <<<HTML
<div class="card" id="$id"> <div class="v-card bg-white mx-2" id="$id">
<div class="card-header"> <div class="v-card-header text-xl my-2">
$title $title
</div> </div>
<div class="card-body">$content</div> <div class="v-card-text">$content</div>
</div> </div>
HTML; HTML;
} else { } else {
if (!empty($id)) { if (!empty($id)) {
$params['id'] = $id; $params['id'] = $id;
} }
$params['class'] = 'card'; $params['class'] = 'v-card bg-white mx-2';
$html = ''; $html = '';
if (!empty($title)) { if (!empty($title)) {
$html .= '<div class="card-header">'.$title.'</div>'.PHP_EOL; $html .= '<div class="v-card-header text-xl my-2">'.$title.'</div>'.PHP_EOL;
} }
$html .= '<div class="card-body">'.$content.'</div>'.PHP_EOL; $html .= '<div class="v-card-text">'.$content.'</div>'.PHP_EOL;
$html = self::div($html, $params); $html = self::div($html, $params);
} }

2
public/main/inc/lib/document.lib.php
Unescape View File

@ -2334,7 +2334,7 @@ class DocumentManager
$repo = Container::getDocumentRepository(); $repo = Container::getDocumentRepository();
$nodeRepository = $repo->getResourceNodeRepository(); $nodeRepository = $repo->getResourceNodeRepository();
$move = get_lang('Move'); $move = get_lang('Move');
$icon = Display::return_icon('move_everywhere.png', $move, null, ICON_SIZE_TINY); $icon = '<i class="mdi-cursor-move mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Move')).'"></i>';
$folderIcon = Display::return_icon('lp_folder.png'); $folderIcon = Display::return_icon('lp_folder.png');
$options = [ $options = [

156
public/main/lp/learnpath.class.php
Unescape View File

@ -4540,34 +4540,11 @@ class learnpath
public function getBuildTree($noWrapper = false, $dropElement = false): string public function getBuildTree($noWrapper = false, $dropElement = false): string
{ {
$mainUrl = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq(); $mainUrl = api_get_path(WEB_CODE_PATH).'lp/lp_controller.php?'.api_get_cidreq();
$upIcon = '<i class="mdi-arrow-up-bold mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Up')).'"></i>';
$disableUpIcon = '<i class="mdi-arrow-up-bold mdi v-icon ch-tool-icon-disabled" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Up')).'"></i>';
$downIcon = '<i class="mdi-arrow-down-bold mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Down')).'"></i>';
$previewImage = '<i class="mdi-magnify-plus-outline mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Preview')).'"></i>';
$upIcon = Display::return_icon(
'up.png',
get_lang('Up'),
[],
ICON_SIZE_TINY
);
$disableUpIcon = Display::return_icon(
'up_na.png',
get_lang('Up'),
[],
ICON_SIZE_TINY
);
$downIcon = Display::return_icon(
'down.png',
get_lang('Down'),
[],
ICON_SIZE_TINY
);
$previewImage = Display::return_icon(
'preview_view.png',
get_lang('Preview'),
[],
ICON_SIZE_TINY
);
$lpItemRepo = Container::getLpItemRepository(); $lpItemRepo = Container::getLpItemRepository();
$itemRoot = $lpItemRepo->getRootItem($this->get_id()); $itemRoot = $lpItemRepo->getRootItem($this->get_id());
@ -4615,22 +4592,27 @@ class learnpath
$moveIcon = ''; $moveIcon = '';
if (TOOL_LP_FINAL_ITEM !== $type) { if (TOOL_LP_FINAL_ITEM !== $type) {
$moveIcon .= '<a class="moved" href="#">'; $moveIcon .= '<a class="moved" href="#">';
$moveIcon .= Display::return_icon( $moveIcon .= '<i class="mdi-cursor-move mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Move')).'"></i>';
'move_everywhere.png',
get_lang('Move'),
[],
ICON_SIZE_TINY
);
$moveIcon .= '</a>'; $moveIcon .= '</a>';
} }
$iconName = str_replace(' ', '', $type); $iconName = str_replace(' ', '', $type);
$icon = Display::return_icon( $icon = '';
'lp_'.$iconName.'.png', switch ($iconName) {
'', case 'chapter':
[], case 'folder':
ICON_SIZE_TINY case 'dir':
); $icon = '<i class="mdi-bookmark-multiple mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Up')).'"></i>';
break;
default:
$icon = Display::return_icon(
'lp_'.$iconName.'.png',
'',
[],
ICON_SIZE_TINY
);
break;
}
$urlPreviewLink = $mainUrl.'&action=view_item&mode=preview_document&id='.$itemId.'&lp_id='.$lpId; $urlPreviewLink = $mainUrl.'&action=view_item&mode=preview_document&id='.$itemId.'&lp_id='.$lpId;
$previewIcon = Display::url( $previewIcon = Display::url(
@ -4646,26 +4628,16 @@ class learnpath
$url = $mainUrl.'&view=build&id='.$itemId.'&lp_id='.$lpId; $url = $mainUrl.'&view=build&id='.$itemId.'&lp_id='.$lpId;
$preRequisitesIcon = Display::url( $preRequisitesIcon = Display::url(
Display::return_icon( '<i class="mdi-graph mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Prerequisites')).'"></i>',
'accept.png',
get_lang('Prerequisites'),
[],
ICON_SIZE_TINY
),
$url.'&action=edit_item_prereq', $url.'&action=edit_item_prereq',
['class' => 'btn btn-default'] ['class' => '']
); );
$editIcon = '<a $editIcon = '<a
href="'.$mainUrl.'&action=edit_item&view=build&id='.$itemId.'&lp_id='.$lpId.'&path_item='.$node['path'].'" href="'.$mainUrl.'&action=edit_item&view=build&id='.$itemId.'&lp_id='.$lpId.'&path_item='.$node['path'].'"
class="btn btn-default" class=""
>'; >';
$editIcon .= Display::return_icon( $editIcon .= '<i class="mdi-pencil mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Edit section description/name')).'"></i>';
'edit.png',
get_lang('Edit section description/name'),
[],
ICON_SIZE_TINY
);
$editIcon .= '</a>'; $editIcon .= '</a>';
$orderIcons = ''; $orderIcons = '';
/*if ('final_item' !== $type) { /*if ('final_item' !== $type) {
@ -4686,13 +4658,8 @@ class learnpath
data-title = \''.addslashes($title).'\' data-title = \''.addslashes($title).'\'
href="javascript:void(0);" href="javascript:void(0);"
onclick="return deleteItem(this);" onclick="return deleteItem(this);"
class="btn btn-default">'; class="">';
$deleteIcon .= Display::return_icon( $deleteIcon .= '<i class="mdi-delete mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Delete section')).'"></i>';
'delete.png',
get_lang('Delete section'),
[],
ICON_SIZE_TINY
);
$deleteIcon .= '</a>'; $deleteIcon .= '</a>';
$extra = ''; $extra = '';
@ -4715,7 +4682,7 @@ class learnpath
); );
return return
"<div class='flex flex-row'> $moveIcon $icon <div>$title </div></div> "<div class='flex flex-row'> $moveIcon $icon <span class='mx-1'>$title </span></div>
$extra $extra
$buttons $buttons
" "
@ -4771,22 +4738,12 @@ class learnpath
$lpId = $this->lp_id; $lpId = $this->lp_id;
if (!isset($extraField['backTo']) && empty($extraField['backTo'])) { if (!isset($extraField['backTo']) && empty($extraField['backTo'])) {
$back = Display::url( $back = Display::url(
Display::return_icon( '<i class="mdi-arrow-left-bold-box mdi v-icon ch-tool-icon" style="font-size: 32px; width: 32px; height: 32px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Back to learning paths')).'"></i>',
'back.png',
get_lang('Back to learning paths'),
'',
ICON_SIZE_MEDIUM
),
'lp_controller.php?'.api_get_cidreq() 'lp_controller.php?'.api_get_cidreq()
); );
} else { } else {
$back = Display::url( $back = Display::url(
Display::return_icon( '<i class="mdi-arrow-left-bold-box mdi v-icon ch-tool-icon" style="font-size: 32px; width: 32px; height: 32px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Back')).'"></i>',
'back.png',
get_lang('Back'),
'',
ICON_SIZE_MEDIUM
),
$extraField['backTo'] $extraField['backTo']
); );
} }
@ -4806,12 +4763,7 @@ class learnpath
$actionsLeft = $back; $actionsLeft = $back;
$actionsLeft .= Display::url( $actionsLeft .= Display::url(
Display::return_icon( '<i class="mdi-magnify-plus-outline mdi v-icon ch-tool-icon" style="font-size: 32px; width: 32px; height: 32px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Preview')).'"></i>',
'preview_view.png',
get_lang('Preview'),
'',
ICON_SIZE_MEDIUM
),
'lp_controller.php?'.api_get_cidreq().'&'.http_build_query([ 'lp_controller.php?'.api_get_cidreq().'&'.http_build_query([
'action' => 'view', 'action' => 'view',
'lp_id' => $lpId, 'lp_id' => $lpId,
@ -4838,12 +4790,7 @@ class learnpath
$request = api_request_uri(); $request = api_request_uri();
if (false === strpos($request, 'edit')) { if (false === strpos($request, 'edit')) {
$actionsLeft .= Display::url( $actionsLeft .= Display::url(
Display::return_icon( '<i class="mdi-hammer-screwdriver mdi v-icon ch-tool-icon" style="font-size: 32px; width: 32px; height: 32px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Course settings')).'"></i>',
'settings.png',
get_lang('Course settings'),
'',
ICON_SIZE_MEDIUM
),
'lp_controller.php?'.api_get_cidreq().'&'.http_build_query([ 'lp_controller.php?'.api_get_cidreq().'&'.http_build_query([
'action' => 'edit', 'action' => 'edit',
'lp_id' => $lpId, 'lp_id' => $lpId,
@ -4856,12 +4803,7 @@ class learnpath
in_array($action, ['add_audio'], true) in_array($action, ['add_audio'], true)
) { ) {
$actionsLeft .= Display::url( $actionsLeft .= Display::url(
Display::return_icon( '<i class="mdi-pencil mdi v-icon ch-tool-icon" style="font-size: 32px; width: 32px; height: 32px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Edit')).'"></i>',
'edit.png',
get_lang('Edit'),
'',
ICON_SIZE_MEDIUM
),
'lp_controller.php?'.http_build_query([ 'lp_controller.php?'.http_build_query([
'action' => 'build', 'action' => 'build',
'lp_id' => $lpId, 'lp_id' => $lpId,
@ -4873,12 +4815,7 @@ class learnpath
if (1 == $this->subscribeUsers && if (1 == $this->subscribeUsers &&
$subscriptionSettings['allow_add_users_to_lp']) { $subscriptionSettings['allow_add_users_to_lp']) {
$actionsLeft .= Display::url( $actionsLeft .= Display::url(
Display::return_icon( '<i class="mdi-account-multiple-plus mdi v-icon ch-tool-icon" style="font-size: 32px; width: 32px; height: 32px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Subscribe users to learning path')).'"></i>',
'user.png',
get_lang('Subscribe users to learning path'),
'',
ICON_SIZE_MEDIUM
),
api_get_path(WEB_CODE_PATH)."lp/lp_subscribe_users.php?lp_id=$lpId&".api_get_cidreq() api_get_path(WEB_CODE_PATH)."lp/lp_subscribe_users.php?lp_id=$lpId&".api_get_cidreq()
); );
} }
@ -4929,12 +4866,7 @@ class learnpath
if (api_is_platform_admin() && isset($extraField['authorlp'])) { if (api_is_platform_admin() && isset($extraField['authorlp'])) {
$actionsLeft .= Display::url( $actionsLeft .= Display::url(
Display::return_icon( '<i class="mdi-account-multiple-plus mdi v-icon ch-tool-icon" style="font-size: 32px; width: 32px; height: 32px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Author')).'"></i>',
'add-groups.png',
get_lang('Author'),
'',
ICON_SIZE_MEDIUM
),
'lp_controller.php?'.api_get_cidreq().'&'.http_build_query([ 'lp_controller.php?'.api_get_cidreq().'&'.http_build_query([
'action' => 'author_view', 'action' => 'author_view',
'lp_id' => $lpId, 'lp_id' => $lpId,
@ -6550,7 +6482,7 @@ class learnpath
get_lang('Preview') get_lang('Preview')
); );
$quizIcon = Display::return_icon('quiz.png', '', [], ICON_SIZE_TINY); $quizIcon = Display::return_icon('quiz.png', '', [], ICON_SIZE_TINY);
$moveIcon = Display::return_icon('move_everywhere.png', get_lang('Move'), [], ICON_SIZE_TINY); $moveIcon = '<i class="mdi-cursor-move mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Move')).'"></i>';
$exerciseUrl = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq(); $exerciseUrl = api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq();
foreach ($exercises as $exercise) { foreach ($exercises as $exercise) {
$exerciseId = $exercise->getIid(); $exerciseId = $exercise->getIid();
@ -6612,12 +6544,7 @@ class learnpath
$courseIdReq = api_get_cidreq(); $courseIdReq = api_get_cidreq();
$userInfo = api_get_user_info(); $userInfo = api_get_user_info();
$moveEverywhereIcon = Display::return_icon( $moveEverywhereIcon = '<i class="mdi-cursor-move mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Move')).'"></i>';
'move_everywhere.png',
get_lang('Move'),
[],
ICON_SIZE_TINY
);
$categorizedLinks = []; $categorizedLinks = [];
$categories = []; $categories = [];
@ -6739,12 +6666,7 @@ class learnpath
data-id="'.$workId.'" data-id="'.$workId.'"
>'; >';
$return .= '<a class="moved" href="#">'; $return .= '<a class="moved" href="#">';
$return .= Display::return_icon( $return .= '<i class="mdi-cursor-move mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Move')).'"></i>';
'move_everywhere.png',
get_lang('Move'),
[],
ICON_SIZE_TINY
);
$return .= '</a> '; $return .= '</a> ';
$return .= $icon; $return .= $icon;
@ -6834,7 +6756,7 @@ class learnpath
} }
} }
</script>'; </script>';
$moveIcon = Display::return_icon('move_everywhere.png', get_lang('Move'), [], ICON_SIZE_TINY); $moveIcon = '<i class="mdi-cursor-move mdi v-icon ch-tool-icon" style="font-size: 16px; width: 16px; height: 16px;" aria-hidden="true" medium="" title="'.htmlentities(get_lang('Move')).'"></i>';
foreach ($a_forums as $forum) { foreach ($a_forums as $forum) {
$forumId = $forum->getIid(); $forumId = $forum->getIid();
$title = Security::remove_XSS($forum->getForumTitle()); $title = Security::remove_XSS($forum->getForumTitle());

Write Preview
Loading…
Cancel
Save