Request merging Moodlecpd 4.1 LTS to Medicine branch #14
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,142 +1,198 @@ | ||
| FROM lthub/moodle:4.1.13 | ||
| MAINTAINER Tyler Cinkant <[email protected]> | ||
|
|
||
| ##6May2024: production release | ||
| ##Version 4.1.9 | ||
| ##FROM dangtue2020/moodlecore:419stg2-41ec0380b10f | ||
|
|
||
| ##Version 4.1.10 | ||
| ##FROM dangtue2020/moodlecore:4110-2d9b62e726d4 | ||
|
|
||
|
|
||
| #Updated to newer questionnaire 10Dec2023 | ||
| RUN curl -L https://moodle.org/plugins/download.php/29228/mod_questionnaire_moodle42_2022092202.zip -o /questionnaire.zip \ | ||
| && cp /questionnaire.zip /var/www/html/mod/ \ | ||
| && cd /var/www/html/mod \ | ||
| && unzip questionnaire.zip \ | ||
| && rm questionnaire.zip \ | ||
|
|
||
| #This is the latest version of choicegroup plugin 18Jun2024 | ||
| #REMOVED no confirmation from Kate for production 30July2024 | ||
| #&& curl -L https://moodle.org/plugins/download.php/30464/mod_choicegroup_moodle43_2023110900.zip -o /choicegroup.zip \ | ||
| #&& cp /choicegroup.zip /var/www/html/mod/ \ | ||
| #&& cd /var/www/html/mod \ | ||
| #&& unzip choicegroup.zip \ | ||
| #&& rm choicegroup.zip \ | ||
|
|
||
|
There was a problem hiding this comment. this can be deleted and move above comment to commit message. |
||
| #This is the latest version of plugin moodle33 as of 20Dec2022 and 11Dec2023 | ||
| && curl -L https://moodle.org/plugins/download.php/11565/mod_certificate_moodle33_2016052300.zip -o /certificate.zip \ | ||
| && cp /certificate.zip /var/www/html/mod/ \ | ||
| && cd /var/www/html/mod \ | ||
| && unzip certificate.zip \ | ||
| && rm certificate.zip \ | ||
|
|
||
| #Updated to newer hvp 10Dec2023 and 18Apr2024 | ||
| && curl -L https://moodle.org/plugins/download.php/30739/mod_hvp_moodle43_2023122500.zip -o /hvp.zip \ | ||
|
There was a problem hiding this comment. You don't need to add this kind of comment. The information can be reflect in the commit and commit message. |
||
| && cp /hvp.zip /var/www/html/mod/ \ | ||
| && cd /var/www/html/mod \ | ||
| && unzip hvp.zip \ | ||
| && rm hvp.zip \ | ||
|
|
||
| #This is the latest version: And pending on Kate verification with her team. | ||
| #This is the latest version of plugin moodle33 as of 11Dec2023 | ||
| && curl -L https://moodle.org/plugins/download.php/16906/block_poll_moodle37_2018052500.zip -o /poll.zip \ | ||
|
There was a problem hiding this comment. are those statement still valid? |
||
| && cp /poll.zip /var/www/html/blocks/ \ | ||
| && cd /var/www/html/blocks \ | ||
| && unzip poll.zip \ | ||
| && rm poll.zip \ | ||
|
|
||
| #This is the latest version of plugin moodle31 as of 11Dec2023 | ||
| && curl -L https://moodle.org/plugins/download.php/26177/report_customsql_moodle40_2022031800.zip -o /customsql.zip \ | ||
|
|
||
| && cp /customsql.zip /var/www/html/report/ \ | ||
| && cd /var/www/html/report \ | ||
| && unzip customsql.zip \ | ||
| && rm customsql.zip \ | ||
|
|
||
| #Updated as of 11Dec2023 and 18Apr2024 | ||
| && curl -L https://moodle.org/plugins/download.php/31635/format_grid_moodle41_2022112609.zip -o /grid.zip \ | ||
|
|
||
| && cp /grid.zip /var/www/html/course/format/ \ | ||
| && cd /var/www/html/course/format \ | ||
| && unzip grid.zip \ | ||
| && rm grid.zip \ | ||
|
|
||
| #Updated as of 11Dec2023 and 18Apr2024 | ||
| && curl -L https://moodle.org/plugins/download.php/30735/format_flexsections_moodle43_2023122300.zip -o /flex.zip \ | ||
| && cp /flex.zip /var/www/html/course/format/ \ | ||
| && cd /var/www/html/course/format \ | ||
| && unzip flex.zip \ | ||
| && rm flex.zip \ | ||
|
|
||
| # Kate requested to remove: | ||
| # && curl -L https://moodle.org/plugins/download.php/25559/mod_facetoface_moodle311_2021113000.zip -o /facetoface.zip \ | ||
|
There was a problem hiding this comment. please remove this section and include the comment in the commit message |
||
| # && cp /facetoface.zip /var/www/html/mod/ \ | ||
| # && cd /var/www/html/mod \ | ||
| # && unzip facetoface.zip \ | ||
| # && rm facetoface.zip \ | ||
| # | ||
|
|
||
| #Updated as of 11Dec2023 | ||
| && curl -L https://moodle.org/plugins/download.php/30331/local_mass_enroll_moodle43_2023102300.zip -o /mass.zip \ | ||
|
|
||
| && cp /mass.zip /var/www/html/local/ \ | ||
| && cd /var/www/html/local \ | ||
| && unzip mass.zip \ | ||
| && rm mass.zip \ | ||
|
|
||
| #Updated as of 11Dec2023 | ||
| && curl -L https://moodle.org/plugins/download.php/30267/block_course_modulenavigation_moodle43_2023101700.zip -o /modulenav.zip \ | ||
| && cp /modulenav.zip /var/www/html/blocks/ \ | ||
| && cd /var/www/html/blocks \ | ||
| && unzip modulenav.zip \ | ||
| && rm modulenav.zip \ | ||
|
|
||
| #This is the latest version of this plugin for moodle310 as of 11Jan2023 and 11Dec2023: | ||
| && curl -L https://moodle.org/plugins/download.php/22758/block_configurable_reports_moodle310_2020110300.zip -o /configurable.zip \ | ||
| && cp /configurable.zip /var/www/html/blocks/ \ | ||
| && cd /var/www/html/blocks \ | ||
| && unzip configurable.zip \ | ||
| && rm configurable.zip \ | ||
|
|
||
| #No change as of 11Dec2023 | ||
| && curl -L https://moodle.org/plugins/download.php/27010/local_boostnavigation_moodle311_2021071501.zip -o /boostnavig.zip \ | ||
| && cp /boostnavig.zip /var/www/html/local/ \ | ||
| && cd /var/www/html/local \ | ||
| && unzip boostnavig.zip \ | ||
| && rm boostnavig.zip \ | ||
|
|
||
| && curl -L https://moodle.org/plugins/download.php/28943/tool_mergeusers_moodle41_2023040402.zip -o /mergeuser.zip \ | ||
| && cp /mergeuser.zip /var/www/html/admin/tool/ \ | ||
| && cd /var/www/html/admin/tool \ | ||
| && unzip mergeuser.zip \ | ||
| && rm mergeuser.zip \ | ||
|
|
||
| #Updated as of 11Dec2023 and 18Apr2024 | ||
| && curl -L https://moodle.org/plugins/download.php/31000/filter_multilang2_moodle43_2024013101.zip -o /multi.zip \ | ||
| && cp /multi.zip /var/www/html/filter/ \ | ||
| && cd /var/www/html/filter \ | ||
| && unzip multi.zip \ | ||
| && rm multi.zip \ | ||
|
|
||
| #Updated as of 11Dec2023 | ||
| && curl -L https://moodle.org/plugins/download.php/30198/availability_language_moodle43_2023101400.zip -o /avail.zip \ | ||
| && cp /avail.zip /var/www/html/availability/condition/ \ | ||
| && cd /var/www/html/availability/condition \ | ||
| && unzip avail.zip \ | ||
| && rm avail.zip \ | ||
|
|
||
| #Pending on Kate verification with her team. | ||
| #Updated as of 11Dec2023 | ||
| && curl -L https://moodle.org/plugins/download.php/29980/block_panopto_moodle42_2023091800.zip -o /panopto.zip \ | ||
| && cp /panopto.zip /var/www/html/blocks/ \ | ||
| && cd /var/www/html/blocks \ | ||
| && unzip panopto.zip \ | ||
| && rm panopto.zip \ | ||
|
|
||
| #Updated as of 11Dec2023 and 18Apr2024 | ||
| && curl -L https://moodle.org/plugins/download.php/31207/local_recompletion_moodle42_2023112702.zip -o /recomplete.zip \ | ||
| && cp /recomplete.zip /var/www/html/local/ \ | ||
| && cd /var/www/html/local \ | ||
| && unzip recomplete.zip \ | ||
| && rm recomplete.zip | ||
|
|
||
| #This is the latest version of this plugin ARLO v4.1.4 - checked again on 23Jan2024 12:38: | ||
| #ARLO plugin requires Arlo_connection setting. | ||
| # && curl -L https://moodle.org/plugins/download.php/30634/enrol_arlo_moodle42_2023110900.zip -o /enrolarlo.zip \ | ||
| # && cp /enrolarlo.zip /var/www/html/enrol/ \ | ||
| # && cd /var/www/html/enrol \ | ||
| # && unzip enrolarlo.zip \ | ||
| # && rm enrolarlo.zip | ||
|
|
||
| # add arlo version 4.1.4 | ||
| COPY plugin/enrol_arlo_moodle42_2023110900.zip /var/www/html/enrol/enrolarlo.zip | ||
| RUN cd /var/www/html/enrol \ | ||
| && unzip enrolarlo.zip \ | ||
| && rm enrolarlo.zip | ||
|
|
||
|
|
||
| # add custom cert | ||
| COPY certificate.php /var/www/html/mod/certificate/type/letter_non_embedded/ | ||
|
|
||
| # add custom moove theme | ||
| COPY themes/moove_premium.zip /var/www/html/theme/ | ||
| RUN cd /var/www/html/theme \ | ||
| && unzip moove_premium.zip \ | ||
| && rm moove_premium.zip | ||
|
|
||
| # add custom theme | ||
| COPY themes/maker-v10.0-moodle-4.1.zip /var/www/html/theme/ | ||
| RUN cd /var/www/html/theme \ | ||
| && unzip maker-v10.0-moodle-4.1.zip \ | ||
| && rm maker-v10.0-moodle-4.1.zip | ||
|
|
||
| # add tinymce for panopto | ||
| COPY plugin/panoptobutton.zip /var/www/html/lib/editor/tinymce/plugins/ | ||
|
|
||
| RUN cd /var/www/html/lib/editor/tinymce/plugins/ \ | ||
| && unzip panoptobutton.zip \ | ||
| && rm panoptobutton.zip | ||
|
|
||
| # add new config file for mergeusers plugin | ||
| COPY plugin/config.local.php /var/www/html/admin/tool/mergeusers/config/ | ||
|
|
||
|
|
||
| RUN cd /var/www/html/theme/maker/pix/ \ | ||
| && rm favicon.ico | ||
|
|
||
| COPY themes/favicon.ico /var/www/html/theme/maker/pix/ | ||
|
|
||
| # add favicon to moove | ||
| COPY themes/favicon.ico /var/www/html/theme/moove/pix/ | ||
|
|
||
| # add custom font | ||
| COPY fonts /var/www/html/theme/maker/fonts | ||
|
|
||
| # add custom font to moove | ||
| COPY fonts /var/www/html/theme/moove/fonts | ||
|
|
||
| RUN chown -R www-data /var/www/html | ||
|
|
||
| # install odbc for shib sp | ||
|
|
@@ -154,4 +210,17 @@ COPY moodle-shib.conf /etc/apache2/conf-enabled/ | |
| COPY docker-entrypoint.d/* /docker-entrypoint.d/ | ||
| COPY 000-default.conf /etc/apache2/sites-available/ | ||
|
|
||
| # add modified files for Language Icon | ||
| COPY themes/maker-header.mustache /var/www/html/theme/maker/templates/header.mustache | ||
| COPY themes/boost-language_menu.mustache /var/www/html/theme/boost/templates/language_menu.mustache | ||
| COPY themes/updated-icon-designs-4.1/mod/ /var/www/html/theme/maker/pix_plugins/mod | ||
|
|
||
|
There was a problem hiding this comment. It would be very useful to add some comments about how we got those files. Did you write them or sent by Kate? So for future updates, we can trace them back to the source. Same for the fonts and favicon above. There was a problem hiding this comment. These mustache codes were modified to meet Kate's requirements based on the UX/UI specifications. |
||
| COPY themes/updated-icon-designs-4.1/core/f/ /var/www/html/pix/f/ | ||
|
|
||
| ##COPY themes/lib/outputrenderers.php /var/www/html/lib/ | ||
| RUN sed -i.bak '/public function lang_menu/ i\ public function get_language() {return current_language();}\n' /var/www/html/lib/outputrenderers.php | ||
|
|
||
| RUN sleep 3 && echo "\$THEME->removedprimarynavitems = ['courses'];" >> /var/www/html/theme/maker/config.php | ||
| ##RUN sleep 3 && sed -i "\$a\\n\\n\$THEME->removedprimarynavitems = ['courses'];" /var/www/html/theme/maker/config.php | ||
|
|
||
|
There was a problem hiding this comment. Yes, for line 223—this is a requirement from Kate to ensure that the course is not displayed in the students' menu. |
||
| RUN chmod -R 755 /docker-entrypoint.d/ | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| {{! | ||
| This file is part of Moodle - http://moodle.org/ | ||
|
|
||
| Moodle is free software: you can redistribute it and/or modify | ||
| it under the terms of the GNU General Public License as published by | ||
| the Free Software Foundation, either version 3 of the License, or | ||
| (at your option) any later version. | ||
|
|
||
| Moodle is distributed in the hope that it will be useful, | ||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| GNU General Public License for more details. | ||
|
|
||
| You should have received a copy of the GNU General Public License | ||
| along with Moodle. If not, see <http://www.gnu.org/licenses/>. | ||
| }} | ||
| {{! | ||
| @template theme_boost/language_menu | ||
|
|
||
| Language menu template. | ||
|
|
||
| Context variables required for this template: | ||
| * title - The title of the menu (displays the text of the currently active language). | ||
| * items - Array of data representing the available languages to be displayed in the language menu. | ||
| * link - If a link is provided render it. | ||
| * title - The title of the language item. | ||
| * text - The text displayed for the language item. | ||
| * url - The url link to activate the given language. | ||
| * isactive - Whether the language is currently active. | ||
|
|
||
| Example context (json): | ||
| { | ||
| "title": "English (en)", | ||
| "items": { | ||
| "link": { | ||
| "title": "English (en)", | ||
| "text": "English (en)", | ||
| "url": "http://example.com", | ||
| "isactive": 0 | ||
| } | ||
| } | ||
| } | ||
| }} | ||
|
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This can be moved to commit message