From d5b9f4780626ceab283ca1b59ee1801d44e3d977 Mon Sep 17 00:00:00 2001 From: aragonc Date: Mon, 11 May 2015 14:25:57 -0500 Subject: [PATCH] fix block certificates icons CT#7539 --- index.php | 1 - main/img/icons/22/graduation.png | Bin 0 -> 1192 bytes main/img/icons/22/search_graduation.png | Bin 0 -> 1293 bytes main/inc/lib/userportal.lib.php | 94 +++++++++++------------- user_portal.php | 2 - 5 files changed, 43 insertions(+), 54 deletions(-) create mode 100644 main/img/icons/22/graduation.png create mode 100644 main/img/icons/22/search_graduation.png diff --git a/index.php b/index.php index 72b5876d6a..f7bca34ea7 100755 --- a/index.php +++ b/index.php @@ -165,7 +165,6 @@ $controller->tpl->assign('navigation_course_links', $controller->return_navigati $controller->tpl->assign('notice_block', $controller->return_notice()); $controller->tpl->assign('main_navigation_block', $controller->return_navigation_links()); $controller->tpl->assign('help_block', $controller->return_help()); -$controller->tpl->assign('certificates_search_block', $controller->returnCertificatesSearchBlock()); if (api_is_platform_admin() || api_is_drh()) { $controller->tpl->assign('skills_block', $controller->return_skills_links()); diff --git a/main/img/icons/22/graduation.png b/main/img/icons/22/graduation.png new file mode 100644 index 0000000000000000000000000000000000000000..22e732e753d2406db55629164239ce5d006a4a90 GIT binary patch literal 1192 zcmV;Z1XufsP)n8mfJi>a7WM1*?E7S z=kCL^j-8E3bbomsu9x3+-PiSpTL6rXj`jfi4a2CBQfmCqqm)v`V)2%yX|L)4LWoU% zzrVY^y&WOM0$C1BUx3ic`@-Y#cuOo6dtS~~k{*v|VW^dYvm4>Zez^K66mG+G6!KH^ zLcLxuLI_RXxBU5y@U0JyHGuvdv^kJ`7mn1y;SRX8d%;wFL65Q_eiD}Cpc614_m>B6 zBo95n8DQcR^eJHeO|{Mgm;95CwewoeZaSaH(o*dqs4GPD6VQ%9AE1Gqme|(~GSfjk zjX7uqCMV(i2~_1QK@})7G!HDRLV=R5>*%_EPj0c(aM%6y)}|?%-ZGR7B>ik4G-bQl zabN-nSIr+qA)6VTNxJQ6hK^E-;^2M^e>>XoT`+7>G^$8<*Ai}-U@F>-bw!5~@D-GX z58^z!0p^0co_gj3>DXJ!@>L2Y4T>vwFmvNFwO@Qg{j-x0as73VOh5?O3;CNN=vZHd zR;XgG;oq}5YAs{kc!24BK9&X(n5G38I2~^x>loZLo7iO8n7USx51{{k`sX2EwL9b5 zrlmkLN-44>o41nvq+N;ATfENETf5kq?`N;-cPRzPk6vMG-->x)X_rdNGN}}qREm5y zQ||c4pK;PftDG=uwsHB5QydCDU2((RBWEeu_B>U{?!h%5bqx&CH84m+O9XHO4n!v_ z0G;6=Jr73M{$y{3eJqjW>(M{T;BvtxNd+%5@yaxwpKziU0^08W)Ejr`~6hvuqrtSnM&% z{@43faQNa?)-G>Fmy$i3*5J$;#XnDzQ!Ey790wr;Z+Aw@g?6lLV?3R!Sd8D)Ik;^D znh<5Xn2j$K3Mi#)0p-W^b0LH&rCi{B`fta!?Tn^r+x`YkcJs&2eHj4&0000xhAKe z@M1~D{FHlm&tslzo7LdMUlYk$-4`DW^xW?4do-Q0T)^vozkl}w;ijf0o5SJwLATkK zSI-;m^K^e$Vc|emy1)*MDOf=#N+L#}dXLc^o7ve#*xt5D@1=*zlb6(q}?P-CII5Q9RLD;7GakWpB1U*m9%i1#xV?lsWoyv0^RfYl zq9`@fU?D`g*W-;MG|b$mL4jFIZZecAgE1fm7;wkRL-ku|875j{6eSf$sM-M;}yB&7tn=Qe70$Buzpw>Ff{S&894 zjQzK*IGeYTvC1IVI|xWX5V@HRMtHlnr910cr7n6>%+{-Ms()gyfYPBeU~#$(pet<^j}BMjj8`m5Th%qnS&+s)dWo-8s1j(x!9@A%|5}eeJ-d$o0PfpuOfy1CENl00000NkvXXu0mjf DGPq?J literal 0 HcmV?d00001 diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php index 19176a1f5a..66c5f78a7d 100755 --- a/main/inc/lib/userportal.lib.php +++ b/main/inc/lib/userportal.lib.php @@ -323,19 +323,56 @@ class IndexManager function return_skills_links() { $html = ''; + $content = ''; + $content .= '
    '; + /** + * Generate the block for show a panel with links to My Certificates and Certificates Search pages + * @return string The HTML code for the panel + */ + $certificatesItem = null; + + if (!api_is_anonymous()) { + $certificatesItem = Display::tag( + 'li', + Display::url(Display::return_icon('graduation.png',get_lang('MyCertificates'),null,ICON_SIZE_SMALL). + get_lang('MyCertificates'), + api_get_path(WEB_CODE_PATH) . "gradebook/my_certificates.php" + ) + ); + } + + $searchItem = null; + + if (api_get_setting('allow_public_certificates') == 'true') { + $searchItem = Display::tag( + 'li', + Display::url(Display::return_icon('search_graduation.png',get_lang('Search'),null,ICON_SIZE_SMALL). + get_lang('Search'), + api_get_path(WEB_CODE_PATH) . "gradebook/search.php" + ) + ); + } + + if (empty($certificatesItem) && empty($searchItem)) { + return null; + }else{ + $content.= $certificatesItem; + $content.= $searchItem; + } + if (api_get_setting('allow_skills_tool') == 'true') { - $content = '
      '; $content .= Display::tag('li', Display::url(Display::return_icon('skill-badges.png',get_lang('MySkills'),null,ICON_SIZE_SMALL).get_lang('MySkills'), api_get_path(WEB_CODE_PATH).'social/my_skills_report.php')); - $allowSkillsManagement = api_get_setting('allow_hr_skills_management') == 'true'; - if (($allowSkillsManagement && api_is_drh()) || api_is_platform_admin()) { - $content .= Display::tag('li', Display::url(Display::return_icon('edit-skill.png',get_lang('MySkills'),null,ICON_SIZE_SMALL).get_lang('ManageSkills'), api_get_path(WEB_CODE_PATH).'admin/skills_wheel.php')); + $content .= Display::tag('li', + Display::url(Display::return_icon('edit-skill.png', get_lang('MySkills'), null, + ICON_SIZE_SMALL) . get_lang('ManageSkills'), + api_get_path(WEB_CODE_PATH) . 'admin/skills_wheel.php')); } - $content .= '
    '; - $html = self::show_right_block(get_lang("Skills"), $content, 'skill_block'); } + $content .= '
'; + $html = self::show_right_block(get_lang("Skills"), $content, 'skill_block'); return $html; } @@ -1423,49 +1460,4 @@ class IndexManager return CourseManager::return_hot_courses(); } - /** - * Generate the block for show a panel with links to My Certificates and Certificates Search pages - * @return string The HTML code for the panel - */ - public function returnCertificatesSearchBlock() - { - - $certificatesItem = null; - - if (!api_is_anonymous()) { - $certificatesItem = Display::tag( - 'li', - Display::url( - get_lang('MyCertificates'), - api_get_path(WEB_CODE_PATH) . "gradebook/my_certificates.php" - ) - ); - } - - $searchItem = null; - - if (api_get_setting('allow_public_certificates') == 'true') { - $searchItem = Display::tag( - 'li', - Display::url( - get_lang('Search'), - api_get_path(WEB_CODE_PATH) . "gradebook/search.php" - ) - ); - } - - if (empty($certificatesItem) && empty($searchItem)) { - return null; - } - - return Display::panel( - Display::tag( - 'ul', - implode(' ', [$certificatesItem, $searchItem]), - ['class' => 'nav nav-pills nav-stacked'] - ), - get_lang('Certificates') - ); - } - } diff --git a/user_portal.php b/user_portal.php index d016f996da..3ec45f4f82 100755 --- a/user_portal.php +++ b/user_portal.php @@ -183,8 +183,6 @@ $controller->tpl->assign('course_block', $controller->return_course_block()); $controller->tpl->assign('navigation_course_links', $controller->return_navigation_links()); $controller->tpl->assign('search_block', $controller->return_search_block()); $controller->tpl->assign('classes_block', $controller->return_classes_block()); -$controller->tpl->assign('certificates_search_block', $controller->returnCertificatesSearchBlock()); - //if (api_is_platform_admin() || api_is_drh()) { $controller->tpl->assign('skills_block', $controller->return_skills_links()); //}