From ee063928ab1da67f6886513c34066a452e2e4cee Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Wed, 18 Nov 2020 18:21:44 +0100 Subject: [PATCH 1/2] Portfolio: Remove edit option. Add portfolio icon - refs #3626 --- main/img/icons/22/portfolio.png | Bin 0 -> 759 bytes main/img/icons/svg/portfolio.svg | 276 +++++++++++++++++++++++++++++++ main/inc/lib/social.lib.php | 16 +- 3 files changed, 281 insertions(+), 11 deletions(-) create mode 100644 main/img/icons/22/portfolio.png create mode 100644 main/img/icons/svg/portfolio.svg diff --git a/main/img/icons/22/portfolio.png b/main/img/icons/22/portfolio.png new file mode 100644 index 0000000000000000000000000000000000000000..44c25c4e81e651bb44d98311b8149aa5340dce1c GIT binary patch literal 759 zcmV%AuV;L85`$~&w2OVds<9y zR7N+B1btWMo^$x{J?Fv!{x>lIh~IvEgeex;4WOoZQg0t!9B1)cPws$N=Wak{@R5Ile4fVbArwdYgQu!KP0y8&d)9L~fW zVT7u1C{}}GbukQn{DhhLpSaL^65Qh{0oNHiyVP`$KkOY1Z~)LNI4t2{#j-HJltAyR zegJ@w5*=-)k;>*kL>QX*jQ1lGXpJ{OtXU;sUDu&ka0UR}O)90ZCTy(c^To!DX<|*- zu%!bc!sTru$V3sWl!8mIVOzNpsNe4g5v_waI<{?rV9<}8Wx?n37IIF(aZ^J*_Se;-GN7ZPdK<@c ztLtDQf+HpR2Zk{^`4yRLVVtLZZ!rF48dutyK}Qec`@#|?zs=%QV?FE*D|5v;Uyt1& z;N_T`Uw}u`3OoF(WGao{>17ZRGFcOeUug*8fRQQzYnrxs6-p_1Jsym7-`{dPx2L1M z1s&}z+xEEAZ*r`ZLL!kU7Iq@TFgAnTM>HDUG1OHFSSf{MGFg`6a5!9y`Nl#dQvQJ} zI%Xi6O_)kbiBu|8mg7(;gqg(^MF4StO}-eKtH}$ASao^VEty%S*JBF~7$&$Rd4r_Z p**E;7{GS5=h9rdQ+7;G6)gJ&MF*~dwYA^r*002ovPDHLkV1glENvZ$< literal 0 HcmV?d00001 diff --git a/main/img/icons/svg/portfolio.svg b/main/img/icons/svg/portfolio.svg new file mode 100644 index 0000000000..01a7fe210a --- /dev/null +++ b/main/img/icons/svg/portfolio.svg @@ -0,0 +1,276 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php index 25ced592f6..d04610523d 100755 --- a/main/inc/lib/social.lib.php +++ b/main/inc/lib/social.lib.php @@ -966,7 +966,7 @@ class SocialManager extends UserManager $portfolioIcon = Display::return_icon('wiki_task.png', get_lang('Portfolio')); $personalDataIcon = Display::return_icon('database.png', get_lang('PersonalDataReport')); $messageSocialIcon = Display::return_icon('promoted_message.png', get_lang('PromotedMessages')); - $portfolio = Display::return_icon('vcard.png', get_lang('Portfolio ')); + $portfolio = Display::return_icon('portfolio.png', get_lang('Portfolio ')); $forumCourseId = api_get_configuration_value('global_forums_course_id'); $groupUrl = api_get_path(WEB_CODE_PATH).'social/groups.php'; @@ -1003,11 +1003,9 @@ class SocialManager extends UserManager $active = $show === 'portfolio' ? 'active' : null; $links .= '
  • - + '.$portfolio.' '.get_lang('Portfolio').' - '.$myExtendedProfileEdit.'
  • '; } @@ -1135,11 +1133,9 @@ class SocialManager extends UserManager $active = $show === 'portfolio' ? 'active' : null; $links .= '
  • - - '.$portfolio.' '.get_lang('Portfolio').' + + '.$portfolio.' '.get_lang('Portfolio').' - '.$myExtendedProfileEdit.'
  • '; } $active = $show === 'invitations' ? 'active' : null; @@ -1238,11 +1234,9 @@ class SocialManager extends UserManager $active = $show === 'portfolio' ? 'active' : null; $links .= '
  • - + '.$portfolio.' '.get_lang('Portfolio').' - '.$myExtendedProfileEdit.'
  • '; } From f45eb5b33bc4a2755ec4df02f5e4754f61334f10 Mon Sep 17 00:00:00 2001 From: Angel Cubas Date: Wed, 18 Nov 2020 13:37:40 -0500 Subject: [PATCH 2/2] Tracking: Fix missing course selector in learning paths exercises results list - refs #3594 --- main/tracking/question_course_report.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/tracking/question_course_report.php b/main/tracking/question_course_report.php index 692c5799fd..f84b232eb6 100755 --- a/main/tracking/question_course_report.php +++ b/main/tracking/question_course_report.php @@ -62,7 +62,7 @@ foreach ($session_list as $sesion_item) { $my_session_list[$sesion_item['id']] = $sesion_item['name']; } -$form = new FormValidator('search_simple', 'POST', '', '', null, false); +$form = new FormValidator('search_simple', 'POST', '', '', null); $form->addElement( 'select', 'session_id', @@ -116,7 +116,7 @@ if (!empty($course_info)) { ); foreach ($question_list as $question_id) { - $question_data = Question::read($question_id); + $question_data = Question::read($question_id, $course_info); $main_question_list[$question_id] = $question_data; $quantity_exercises = 0; $question_result = 0;