diff --git a/blocks/microsoft/block_microsoft.php b/blocks/microsoft/block_microsoft.php index 7789faee9..48296f0bc 100644 --- a/blocks/microsoft/block_microsoft.php +++ b/blocks/microsoft/block_microsoft.php @@ -390,6 +390,31 @@ protected function get_user_content_connected() { } } + // Microsoft Word. + if (!empty($this->globalconfig->settings_showword)) { + $wordurl = 'https://word.cloud.microsoft'; + $wordattrs = ['target' => '_blank', 'rel' => 'noopener noreferrer', 'class' => 'servicelink block_microsoft_word']; + $items[] = html_writer::link($wordurl, get_string('linkword', 'block_microsoft'), $wordattrs); + } + + // Microsoft Excel. + if (!empty($this->globalconfig->settings_showexcel)) { + $excelurl = 'https://excel.cloud.microsoft'; + $excelattrs = ['target' => '_blank', 'rel' => 'noopener noreferrer', 'class' => 'servicelink block_microsoft_excel']; + $items[] = html_writer::link($excelurl, get_string('linkexcel', 'block_microsoft'), $excelattrs); + } + + // Microsoft PowerPoint. + if (!empty($this->globalconfig->settings_showpowerpoint)) { + $powerpointurl = 'https://powerpoint.cloud.microsoft'; + $powerpointattrs = [ + 'target' => '_blank', + 'rel' => 'noopener noreferrer', + 'class' => 'servicelink block_microsoft_powerpoint', + ]; + $items[] = html_writer::link($powerpointurl, get_string('linkpowerpoint', 'block_microsoft'), $powerpointattrs); + } + // Microsoft Stream (on SharePoint). if (!empty($this->globalconfig->settings_showmsstreamonsharepoint)) { $streamurl = 'https://www.microsoft365.com/launch/stream'; @@ -415,6 +440,28 @@ protected function get_user_content_connected() { $items[] = html_writer::link($teamsurl, get_string('linkmsteams', 'block_microsoft'), $teamsattrs); } + // Viva Engage. + if (!empty($this->globalconfig->settings_showvivaengage)) { + $vivaengageurl = 'https://engage.cloud.microsoft'; + $vivaengageattrs = [ + 'target' => '_blank', + 'rel' => 'noopener noreferrer', + 'class' => 'servicelink block_microsoft_vivaengage', + ]; + $items[] = html_writer::link($vivaengageurl, get_string('linkvivaengage', 'block_microsoft'), $vivaengageattrs); + } + + // Viva Learning. + if (!empty($this->globalconfig->settings_showvivalearning)) { + $vivalearningurl = 'https://learning.cloud.microsoft'; + $vivalearningattrs = [ + 'target' => '_blank', + 'rel' => 'noopener noreferrer', + 'class' => 'servicelink block_microsoft_vivalearning', + ]; + $items[] = html_writer::link($vivalearningurl, get_string('linkvivalearning', 'block_microsoft'), $vivalearningattrs); + } + // My Sways. if (!empty($this->globalconfig->settings_showsways) && !empty($userupn)) { $swayurl = 'https://www.sway.com/my?auth_pvr=OrgId&auth_upn=' . $userupn; diff --git a/blocks/microsoft/lang/en/block_microsoft.php b/blocks/microsoft/lang/en/block_microsoft.php index 18f27e76f..38ff0dae0 100644 --- a/blocks/microsoft/lang/en/block_microsoft.php +++ b/blocks/microsoft/lang/en/block_microsoft.php @@ -36,6 +36,11 @@ $string['linkmsstream'] = 'Microsoft Stream'; $string['linkmsstreamclassic'] = 'Microsoft Stream (classic)'; $string['linkmsteams'] = 'Microsoft Teams'; +$string['linkword'] = 'Microsoft Word'; +$string['linkexcel'] = 'Microsoft Excel'; +$string['linkpowerpoint'] = 'Microsoft PowerPoint'; +$string['linkvivaengage'] = 'Viva Engage'; +$string['linkvivalearning'] = 'Viva Learning'; $string['linkemail'] = 'My Email'; $string['linkonenote_unavailable'] = 'OneNote unavailable'; $string['linksharepoint'] = 'Course SharePoint site'; @@ -84,6 +89,16 @@ $string['settings_showmsstreamclassic_desc'] = 'Enable or disable the "Microsoft Stream (classic)" link in the block.'; $string['settings_showmsteams'] = 'Show "Microsoft Teams"'; $string['settings_showmsteams_desc'] = 'Enable or disable the "Microsoft Teams" link in the block.'; +$string['settings_showword'] = 'Show "Microsoft Word"'; +$string['settings_showword_desc'] = 'Enable or disable the "Microsoft Word" link in the block.'; +$string['settings_showexcel'] = 'Show "Microsoft Excel"'; +$string['settings_showexcel_desc'] = 'Enable or disable the "Microsoft Excel" link in the block.'; +$string['settings_showpowerpoint'] = 'Show "Microsoft PowerPoint"'; +$string['settings_showpowerpoint_desc'] = 'Enable or disable the "Microsoft PowerPoint" link in the block.'; +$string['settings_showvivaengage'] = 'Show "Viva Engage"'; +$string['settings_showvivaengage_desc'] = 'Enable or disable the "Viva Engage" link in the block.'; +$string['settings_showvivalearning'] = 'Show "Viva Learning"'; +$string['settings_showvivalearning_desc'] = 'Enable or disable the "Viva Learning" link in the block.'; $string['settings_showonedrive'] = 'Show "My OneDrive"'; $string['settings_showonedrive_desc'] = 'Enable or disable the "My OneDrive" link in the block.'; $string['settings_showonenotenotebook'] = 'Show "My OneNote Notebook"'; diff --git a/blocks/microsoft/pix/excel.png b/blocks/microsoft/pix/excel.png new file mode 100644 index 000000000..b1b807a09 Binary files /dev/null and b/blocks/microsoft/pix/excel.png differ diff --git a/blocks/microsoft/pix/formscolor.png b/blocks/microsoft/pix/formscolor.png index 7b38cb8ba..5eadfd9a9 100644 Binary files a/blocks/microsoft/pix/formscolor.png and b/blocks/microsoft/pix/formscolor.png differ diff --git a/blocks/microsoft/pix/msstream.png b/blocks/microsoft/pix/msstream.png index ec10af05f..36981b7c0 100644 Binary files a/blocks/microsoft/pix/msstream.png and b/blocks/microsoft/pix/msstream.png differ diff --git a/blocks/microsoft/pix/msteams.png b/blocks/microsoft/pix/msteams.png index e03468f98..9dba9efce 100644 Binary files a/blocks/microsoft/pix/msteams.png and b/blocks/microsoft/pix/msteams.png differ diff --git a/blocks/microsoft/pix/onedriveicon.png b/blocks/microsoft/pix/onedriveicon.png index ee559c2b3..41cbb79db 100644 Binary files a/blocks/microsoft/pix/onedriveicon.png and b/blocks/microsoft/pix/onedriveicon.png differ diff --git a/blocks/microsoft/pix/onenotecolor.png b/blocks/microsoft/pix/onenotecolor.png index 50d9b722b..ae1c48c60 100644 Binary files a/blocks/microsoft/pix/onenotecolor.png and b/blocks/microsoft/pix/onenotecolor.png differ diff --git a/blocks/microsoft/pix/outlookcolor.png b/blocks/microsoft/pix/outlookcolor.png index e6ddd1e8e..f79ad7a42 100644 Binary files a/blocks/microsoft/pix/outlookcolor.png and b/blocks/microsoft/pix/outlookcolor.png differ diff --git a/blocks/microsoft/pix/powerpoint.png b/blocks/microsoft/pix/powerpoint.png new file mode 100644 index 000000000..5d4d5f221 Binary files /dev/null and b/blocks/microsoft/pix/powerpoint.png differ diff --git a/blocks/microsoft/pix/sharepointcolor.png b/blocks/microsoft/pix/sharepointcolor.png index 827cefd76..e538ec579 100644 Binary files a/blocks/microsoft/pix/sharepointcolor.png and b/blocks/microsoft/pix/sharepointcolor.png differ diff --git a/blocks/microsoft/pix/vivaengage.png b/blocks/microsoft/pix/vivaengage.png new file mode 100644 index 000000000..bc57bcecd Binary files /dev/null and b/blocks/microsoft/pix/vivaengage.png differ diff --git a/blocks/microsoft/pix/vivalearning.png b/blocks/microsoft/pix/vivalearning.png new file mode 100644 index 000000000..f78164621 Binary files /dev/null and b/blocks/microsoft/pix/vivalearning.png differ diff --git a/blocks/microsoft/pix/word.png b/blocks/microsoft/pix/word.png new file mode 100644 index 000000000..5104de879 Binary files /dev/null and b/blocks/microsoft/pix/word.png differ diff --git a/blocks/microsoft/settings.php b/blocks/microsoft/settings.php index db42d7efb..dd45bfe46 100644 --- a/blocks/microsoft/settings.php +++ b/blocks/microsoft/settings.php @@ -50,6 +50,21 @@ $desc = new lang_string('settings_showonedrive_desc', 'block_microsoft'); $settings->add(new admin_setting_configcheckbox('block_microsoft/settings_showonedrive', $label, $desc, 1)); +// Settings to show Microsoft Word link in the block. +$label = new lang_string('settings_showword', 'block_microsoft'); +$desc = new lang_string('settings_showword_desc', 'block_microsoft'); +$settings->add(new admin_setting_configcheckbox('block_microsoft/settings_showword', $label, $desc, 0)); + +// Settings to show Microsoft Excel link in the block. +$label = new lang_string('settings_showexcel', 'block_microsoft'); +$desc = new lang_string('settings_showexcel_desc', 'block_microsoft'); +$settings->add(new admin_setting_configcheckbox('block_microsoft/settings_showexcel', $label, $desc, 0)); + +// Settings to show Microsoft PowerPoint link in the block. +$label = new lang_string('settings_showpowerpoint', 'block_microsoft'); +$desc = new lang_string('settings_showpowerpoint_desc', 'block_microsoft'); +$settings->add(new admin_setting_configcheckbox('block_microsoft/settings_showpowerpoint', $label, $desc, 0)); + // Settings to show Microsoft Stream (on SharePoint) link in the block. $label = new lang_string('settings_showmsstream', 'block_microsoft'); $desc = new lang_string('settings_showmsstream_desc', 'block_microsoft'); @@ -65,6 +80,16 @@ $desc = new lang_string('settings_showmsteams_desc', 'block_microsoft'); $settings->add(new admin_setting_configcheckbox('block_microsoft/settings_showmsteams', $label, $desc, 1)); +// Settings to show Viva Engage link in the block. +$label = new lang_string('settings_showvivaengage', 'block_microsoft'); +$desc = new lang_string('settings_showvivaengage_desc', 'block_microsoft'); +$settings->add(new admin_setting_configcheckbox('block_microsoft/settings_showvivaengage', $label, $desc, 0)); + +// Settings to show Viva Learning link in the block. +$label = new lang_string('settings_showvivalearning', 'block_microsoft'); +$desc = new lang_string('settings_showvivalearning_desc', 'block_microsoft'); +$settings->add(new admin_setting_configcheckbox('block_microsoft/settings_showvivalearning', $label, $desc, 0)); + // Settings to show sways link in the block. $label = new lang_string('settings_showsways', 'block_microsoft'); $desc = new lang_string('settings_showsways_desc', 'block_microsoft'); diff --git a/blocks/microsoft/styles.css b/blocks/microsoft/styles.css index f9c2d90ab..76ef3e8c2 100644 --- a/blocks/microsoft/styles.css +++ b/blocks/microsoft/styles.css @@ -41,6 +41,26 @@ background-image: url([[pix:block_microsoft|msteams]]); } +.block_microsoft .block_microsoft_word { + background-image: url([[pix:block_microsoft|word]]); +} + +.block_microsoft .block_microsoft_excel { + background-image: url([[pix:block_microsoft|excel]]); +} + +.block_microsoft .block_microsoft_powerpoint { + background-image: url([[pix:block_microsoft|powerpoint]]); +} + +.block_microsoft .block_microsoft_vivaengage { + background-image: url([[pix:block_microsoft|vivaengage]]); +} + +.block_microsoft .block_microsoft_vivalearning { + background-image: url([[pix:block_microsoft|vivalearning]]); +} + .block_microsoft .block_microsoft_onenote { background-image: url([[pix:block_microsoft|onenotecolor]]); } diff --git a/local/o365/pix/onenotecolor.png b/local/o365/pix/onenotecolor.png index 50d9b722b..ae1c48c60 100644 Binary files a/local/o365/pix/onenotecolor.png and b/local/o365/pix/onenotecolor.png differ diff --git a/local/o365/pix/outlookcolor.png b/local/o365/pix/outlookcolor.png index e6ddd1e8e..f79ad7a42 100644 Binary files a/local/o365/pix/outlookcolor.png and b/local/o365/pix/outlookcolor.png differ diff --git a/local/onenote/pix/onenote.png b/local/onenote/pix/onenote.png index 58bb1986e..ae1c48c60 100644 Binary files a/local/onenote/pix/onenote.png and b/local/onenote/pix/onenote.png differ diff --git a/repository/office365/pix/onedrive.png b/repository/office365/pix/onedrive.png index 1944b4c65..41cbb79db 100644 Binary files a/repository/office365/pix/onedrive.png and b/repository/office365/pix/onedrive.png differ diff --git a/repository/office365/pix/sharepoint.png b/repository/office365/pix/sharepoint.png index fdc9d989a..e538ec579 100644 Binary files a/repository/office365/pix/sharepoint.png and b/repository/office365/pix/sharepoint.png differ