From b14567684d62d55a13edd4f026beb23973678d11 Mon Sep 17 00:00:00 2001 From: christian Date: Wed, 1 Nov 2023 23:50:02 -0500 Subject: [PATCH 1/5] Course: Fix filemanager from editor and saving intro - refs #21046 --- assets/vue/components/ctoolintro/Form.vue | 8 +++++--- assets/vue/mixins/UpdateMixin.js | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/assets/vue/components/ctoolintro/Form.vue b/assets/vue/components/ctoolintro/Form.vue index 13b2eaa744..4a1b3aaa17 100644 --- a/assets/vue/components/ctoolintro/Form.vue +++ b/assets/vue/components/ctoolintro/Form.vue @@ -77,12 +77,14 @@ export default { }, methods: { browser(callback, value, meta) { - //const route = useRoute(); - let nodeId = this.$route.params["node"]; + let nodeId = this.$route.query.ctoolId; + if (!nodeId) { + nodeId = this.$route.params.courseTool; + } let folderParams = this.$route.query; let url = this.$router.resolve({ name: "DocumentForHtmlEditor", - params: { id: nodeId }, + params: { node: nodeId }, query: folderParams, }); url = url.fullPath; diff --git a/assets/vue/mixins/UpdateMixin.js b/assets/vue/mixins/UpdateMixin.js index c1bef5b23b..291857fde1 100644 --- a/assets/vue/mixins/UpdateMixin.js +++ b/assets/vue/mixins/UpdateMixin.js @@ -130,7 +130,8 @@ export default { updated(val) { console.log('updated'); - this.showMessage(`${val['@id']} updated.`); + //this.showMessage(`${val['@id']} updated.`); + this.$router.go(-1); }, retrieved(val) { From 4dbb9559cdc757965a150bf3e9b610ce3ab89353 Mon Sep 17 00:00:00 2001 From: christian Date: Mon, 6 Nov 2023 00:24:09 -0500 Subject: [PATCH 2/5] Course: Display resources in filemanager - refs BT#21046 --- assets/vue/components/ctoolintro/Form.vue | 11 ++++++----- assets/vue/views/course/CourseHome.vue | 5 +++-- assets/vue/views/ctoolintro/Update.vue | 14 ++++++-------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/assets/vue/components/ctoolintro/Form.vue b/assets/vue/components/ctoolintro/Form.vue index 4a1b3aaa17..bc0e7618bf 100644 --- a/assets/vue/components/ctoolintro/Form.vue +++ b/assets/vue/components/ctoolintro/Form.vue @@ -33,6 +33,7 @@ import useVuelidate from "@vuelidate/core"; import { ref } from "vue"; import { usePlatformConfig } from "../../store/platformConfig"; +import {useRoute} from "vue-router"; export default { name: "ToolIntroForm", props: { @@ -58,7 +59,10 @@ export default { extraPlugins.value = "translatehtml"; } - return { v$: useVuelidate(), extraPlugins }; + const route = useRoute(); + const parentResourceNodeId = ref(route.query.parentResourceNodeId); + + return { v$: useVuelidate(), extraPlugins, parentResourceNodeId}; }, data() { return { @@ -77,10 +81,7 @@ export default { }, methods: { browser(callback, value, meta) { - let nodeId = this.$route.query.ctoolId; - if (!nodeId) { - nodeId = this.$route.params.courseTool; - } + let nodeId = this.parentResourceNodeId; let folderParams = this.$route.query; let url = this.$router.resolve({ name: "DocumentForHtmlEditor", diff --git a/assets/vue/views/course/CourseHome.vue b/assets/vue/views/course/CourseHome.vue index 52c98897af..b487c06d13 100644 --- a/assets/vue/views/course/CourseHome.vue +++ b/assets/vue/views/course/CourseHome.vue @@ -94,7 +94,7 @@ :label="t('Edit introduction')" icon="edit" type="black" - @click="createInSession ? addIntro(course, intro) : updateIntro(intro)" + @click="createInSession ? addIntro(course, intro) : updateIntro(course, intro)" /> @@ -372,7 +372,7 @@ function addIntro(course, intro) { }) } -function updateIntro(intro) { +function updateIntro(course, intro) { return router.push({ name: "ToolIntroUpdate", params: { id: "/api/c_tool_intros/" + intro.iid }, @@ -381,6 +381,7 @@ function updateIntro(intro) { sid: sessionId, ctoolintroIid: intro.iid, ctoolId: intro.c_tool.iid, + parentResourceNodeId: course.resourceNode.id, id: "/api/c_tool_intros/" + intro.iid, }, }) diff --git a/assets/vue/views/ctoolintro/Update.vue b/assets/vue/views/ctoolintro/Update.vue index 23799f8cdf..ed7e5df16c 100644 --- a/assets/vue/views/ctoolintro/Update.vue +++ b/assets/vue/views/ctoolintro/Update.vue @@ -49,19 +49,17 @@ export default { let ctoolintroId = route.query.ctoolintroIid // Get the current intro text. - axios - .get(ENTRYPOINT + "c_tool_intros/" + ctoolintroId) + axios.get(ENTRYPOINT + "c_tool_intros/" + ctoolintroId) .then((response) => { - let data = response.data - item.value["introText"] = data.introText + let data = response.data; + item.value["introText"] = data.introText; + item.value["parentResourceNodeId"] = Number(route.query.parentResourceNodeId); }) .catch(function (error) { - console.log(error) - }) + console.error(error); + }); - item.value["parentResourceNodeId"] = Number(route.query.parentResourceNodeId) item.value["courseTool"] = "/api/c_tools/" + toolId - item.value["resourceLinkList"] = [ { sid, From 87267615e616d4e4c2ea38042a6e24f863d629f4 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 6 Nov 2023 16:45:20 +0100 Subject: [PATCH 3/5] Admin: Add CMS pages category Demo - refs BT#20999 --- assets/vue/pages/Demo.vue | 28 +++++++++++++++++++ assets/vue/router/index.js | 11 ++++++++ .../Component/Utils/CreateDefaultPages.php | 7 +++++ src/CoreBundle/Controller/IndexController.php | 1 + 4 files changed, 47 insertions(+) create mode 100644 assets/vue/pages/Demo.vue diff --git a/assets/vue/pages/Demo.vue b/assets/vue/pages/Demo.vue new file mode 100644 index 0000000000..869cf1197b --- /dev/null +++ b/assets/vue/pages/Demo.vue @@ -0,0 +1,28 @@ + + + diff --git a/assets/vue/router/index.js b/assets/vue/router/index.js index de4725ae65..d093c92ed1 100644 --- a/assets/vue/router/index.js +++ b/assets/vue/router/index.js @@ -35,6 +35,8 @@ import Home from "../pages/Home.vue" import Login from "../pages/Login.vue" import Faq from "../pages/Faq.vue" import Contact from "../pages/Contact.vue" +import Demo from "../pages/Demo.vue" + import { useCidReqStore } from "../store/cidReq" const router = createRouter({ @@ -84,6 +86,15 @@ const router = createRouter({ showBreadcrumb: false, }, }, + { + path: "/demo", + name: "Demo", + component: Demo, + meta: { + requiresAuth: false, + showBreadcrumb: false, + }, + }, { path: "/course/:id/home", name: "CourseHome", diff --git a/src/CoreBundle/Component/Utils/CreateDefaultPages.php b/src/CoreBundle/Component/Utils/CreateDefaultPages.php index 9d8ed061ea..7f8678d731 100644 --- a/src/CoreBundle/Component/Utils/CreateDefaultPages.php +++ b/src/CoreBundle/Component/Utils/CreateDefaultPages.php @@ -60,6 +60,13 @@ class CreateDefaultPages ; $this->pageCategoryRepository->update($indexCategory); + $indexCategory = (new PageCategory()) + ->setTitle('demo') + ->setType('grid') + ->setCreator($user) + ; + $this->pageCategoryRepository->update($indexCategory); + $page = (new Page()) ->setTitle('Welcome') ->setContent('Welcome to Chamilo') diff --git a/src/CoreBundle/Controller/IndexController.php b/src/CoreBundle/Controller/IndexController.php index a7402ac645..85b73ceb15 100644 --- a/src/CoreBundle/Controller/IndexController.php +++ b/src/CoreBundle/Controller/IndexController.php @@ -20,6 +20,7 @@ class IndexController extends BaseController * @Route("/login", name="login", methods={"GET", "POST"}, options={"expose"=true}) * @Route("/faq", name="faq", methods={"GET", "POST"}, options={"expose"=true}) * @Route("/contact", name="contact", methods={"GET", "POST"}, options={"expose"=true}) + * @Route("/demo", name="demo", methods={"GET", "POST"}, options={"expose"=true}) * * @Route("/course/{cid}/home", name="chamilo_core_course_home") * @Route("/courses", name="courses", methods={"GET", "POST"}, options={"expose"=true}) From 9ac8ea9e16e9094e6599cc4d0db56c5dfb217cb3 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Mon, 6 Nov 2023 16:54:47 +0100 Subject: [PATCH 4/5] Display: Update menu: Add demo page - refs BT#20999 --- assets/locales/ar.json | 3 ++- assets/locales/ast_ES.json | 3 ++- assets/locales/bg.json | 3 ++- assets/locales/bn_BD.json | 3 ++- assets/locales/bo_CN.json | 3 ++- assets/locales/bs_BA.json | 3 ++- assets/locales/ca_ES.json | 3 ++- assets/locales/cs_CZ.json | 3 ++- assets/locales/da.json | 3 ++- assets/locales/de.json | 3 ++- assets/locales/el.json | 3 ++- assets/locales/en.json | 3 ++- assets/locales/eo.json | 3 ++- assets/locales/es.json | 3 ++- assets/locales/eu_ES.json | 3 ++- assets/locales/fa_AF.json | 3 ++- assets/locales/fa_IR.json | 3 ++- assets/locales/fi_FI.json | 3 ++- assets/locales/fo_FO.json | 3 ++- assets/locales/fr_FR.json | 3 ++- assets/locales/fur.json | 3 ++- assets/locales/gl.json | 3 ++- assets/locales/he_IL.json | 3 ++- assets/locales/hi.json | 3 ++- assets/locales/hr_HR.json | 3 ++- assets/locales/hu_HU.json | 3 ++- assets/locales/id_ID.json | 3 ++- assets/locales/it.json | 3 ++- assets/locales/ja.json | 3 ++- assets/locales/ka_GE.json | 3 ++- assets/locales/ko_KR.json | 3 ++- assets/locales/lt_LT.json | 3 ++- assets/locales/lv_LV.json | 3 ++- assets/locales/mk_MK.json | 3 ++- assets/locales/ms_MY.json | 3 ++- assets/locales/nl.json | 3 ++- assets/locales/nn_NO.json | 3 ++- assets/locales/oc.json | 3 ++- assets/locales/pl_PL.json | 3 ++- assets/locales/ps.json | 3 ++- assets/locales/pt_PT.json | 3 ++- assets/locales/quz_PE.json | 3 ++- assets/locales/ro_RO.json | 3 ++- assets/locales/ru_RU.json | 3 ++- assets/locales/sk_SK.json | 3 ++- assets/locales/sl_SI.json | 3 ++- assets/locales/so_SO.json | 3 ++- assets/locales/sr_RS.json | 3 ++- assets/locales/sv_SE.json | 3 ++- assets/locales/sw_KE.json | 3 ++- assets/locales/th.json | 3 ++- assets/locales/tl_PH.json | 3 ++- assets/locales/tr.json | 3 ++- assets/locales/uk_UA.json | 3 ++- assets/locales/vi_VN.json | 3 ++- assets/locales/xh_ZA.json | 3 ++- assets/locales/yo_NG.json | 3 ++- assets/locales/zh_CN.json | 3 ++- assets/locales/zh_TW.json | 3 ++- .../components/layout/TopbarNotLoggedIn.vue | 26 +++++++++++-------- 60 files changed, 133 insertions(+), 70 deletions(-) diff --git a/assets/locales/ar.json b/assets/locales/ar.json index 70ac0a5813..ebc7cb2370 100644 --- a/assets/locales/ar.json +++ b/assets/locales/ar.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "\u062c\u0647\u0629 \u0627\u0644\u0627\u062a\u0635\u0627\u0644" + "Contact": "\u062c\u0647\u0629 \u0627\u0644\u0627\u062a\u0635\u0627\u0644", + "Registration": " \u062a\u0633\u062c\u064a\u0644" } \ No newline at end of file diff --git a/assets/locales/ast_ES.json b/assets/locales/ast_ES.json index 3a15fe5603..e3eae10b11 100644 --- a/assets/locales/ast_ES.json +++ b/assets/locales/ast_ES.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Rexistru" } \ No newline at end of file diff --git a/assets/locales/bg.json b/assets/locales/bg.json index 47238c7645..4b606e313c 100644 --- a/assets/locales/bg.json +++ b/assets/locales/bg.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "\u0421\u0430\u043c\u043e\u0441\u0442\u043e\u044f\u0442\u0435\u043b\u043d\u0430 \u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u043d\u0430 \u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0435\u043b\u0438\u0442\u0435" } \ No newline at end of file diff --git a/assets/locales/bn_BD.json b/assets/locales/bn_BD.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/bn_BD.json +++ b/assets/locales/bn_BD.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/bo_CN.json b/assets/locales/bo_CN.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/bo_CN.json +++ b/assets/locales/bo_CN.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/bs_BA.json b/assets/locales/bs_BA.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/bs_BA.json +++ b/assets/locales/bs_BA.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/ca_ES.json b/assets/locales/ca_ES.json index 5f26df8e21..ddfee47aee 100644 --- a/assets/locales/ca_ES.json +++ b/assets/locales/ca_ES.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "Contacte" + "Contact": "Contacte", + "Registration": "Inscripci\u00f3" } \ No newline at end of file diff --git a/assets/locales/cs_CZ.json b/assets/locales/cs_CZ.json index e6bd896ac4..38a61058f0 100644 --- a/assets/locales/cs_CZ.json +++ b/assets/locales/cs_CZ.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registrace" } \ No newline at end of file diff --git a/assets/locales/da.json b/assets/locales/da.json index 6efed275f8..0e4d93d73c 100644 --- a/assets/locales/da.json +++ b/assets/locales/da.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registrering" } \ No newline at end of file diff --git a/assets/locales/de.json b/assets/locales/de.json index b6e6f92943..cd6adce48d 100644 --- a/assets/locales/de.json +++ b/assets/locales/de.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "Kontakt" + "Contact": "Kontakt", + "Registration": "Selbst-Registrierung" } \ No newline at end of file diff --git a/assets/locales/el.json b/assets/locales/el.json index c170759c24..d7c69c8bab 100644 --- a/assets/locales/el.json +++ b/assets/locales/el.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "\u0395\u03b3\u03b3\u03c1\u03b1\u03c6\u03ae" } \ No newline at end of file diff --git a/assets/locales/en.json b/assets/locales/en.json index bdbbbee8ab..a3d9ad1c07 100644 --- a/assets/locales/en.json +++ b/assets/locales/en.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "Contact" + "Contact": "Contact", + "Registration": "Registration" } \ No newline at end of file diff --git a/assets/locales/eo.json b/assets/locales/eo.json index b1683062e9..b039e243b7 100644 --- a/assets/locales/eo.json +++ b/assets/locales/eo.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registrado" } \ No newline at end of file diff --git a/assets/locales/es.json b/assets/locales/es.json index e8f171a24b..4bde62c3ac 100644 --- a/assets/locales/es.json +++ b/assets/locales/es.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "Contacto" + "Contact": "Contacto", + "Registration": "Registro" } \ No newline at end of file diff --git a/assets/locales/eu_ES.json b/assets/locales/eu_ES.json index 414822d17c..c57690af84 100644 --- a/assets/locales/eu_ES.json +++ b/assets/locales/eu_ES.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Erregistroa" } \ No newline at end of file diff --git a/assets/locales/fa_AF.json b/assets/locales/fa_AF.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/fa_AF.json +++ b/assets/locales/fa_AF.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/fa_IR.json b/assets/locales/fa_IR.json index 3453331351..73ce0f07ba 100644 --- a/assets/locales/fa_IR.json +++ b/assets/locales/fa_IR.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "\u062b\u0628\u062a\u0646\u0627\u0645" } \ No newline at end of file diff --git a/assets/locales/fi_FI.json b/assets/locales/fi_FI.json index 8a2af3032a..00aef8e1c0 100644 --- a/assets/locales/fi_FI.json +++ b/assets/locales/fi_FI.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Rekister\u00f6inti" } \ No newline at end of file diff --git a/assets/locales/fo_FO.json b/assets/locales/fo_FO.json index 76facbd98a..0833c4155a 100644 --- a/assets/locales/fo_FO.json +++ b/assets/locales/fo_FO.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/fr_FR.json b/assets/locales/fr_FR.json index 00568c8b81..3fbacd8ae7 100644 --- a/assets/locales/fr_FR.json +++ b/assets/locales/fr_FR.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "Contact" + "Contact": "Contact", + "Registration": "Inscription" } \ No newline at end of file diff --git a/assets/locales/fur.json b/assets/locales/fur.json index bdbbbee8ab..a3d9ad1c07 100644 --- a/assets/locales/fur.json +++ b/assets/locales/fur.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "Contact" + "Contact": "Contact", + "Registration": "Registration" } \ No newline at end of file diff --git a/assets/locales/gl.json b/assets/locales/gl.json index bdbbbee8ab..a3d9ad1c07 100644 --- a/assets/locales/gl.json +++ b/assets/locales/gl.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "Contact" + "Contact": "Contact", + "Registration": "Registration" } \ No newline at end of file diff --git a/assets/locales/he_IL.json b/assets/locales/he_IL.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/he_IL.json +++ b/assets/locales/he_IL.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/hi.json b/assets/locales/hi.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/hi.json +++ b/assets/locales/hi.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/hr_HR.json b/assets/locales/hr_HR.json index fc317fdddc..92c3c56444 100644 --- a/assets/locales/hr_HR.json +++ b/assets/locales/hr_HR.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registracija" } \ No newline at end of file diff --git a/assets/locales/hu_HU.json b/assets/locales/hu_HU.json index 4ea51921da..30492d8b45 100644 --- a/assets/locales/hu_HU.json +++ b/assets/locales/hu_HU.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Regisztr\u00e1ci\u00f3" } \ No newline at end of file diff --git a/assets/locales/id_ID.json b/assets/locales/id_ID.json index b7e9d1b062..ac7c300566 100644 --- a/assets/locales/id_ID.json +++ b/assets/locales/id_ID.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Pendaftaran" } \ No newline at end of file diff --git a/assets/locales/it.json b/assets/locales/it.json index 7134ed5d04..a0b302879e 100644 --- a/assets/locales/it.json +++ b/assets/locales/it.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registrazione" } \ No newline at end of file diff --git a/assets/locales/ja.json b/assets/locales/ja.json index 42ed3d353a..7c4b98d4c0 100644 --- a/assets/locales/ja.json +++ b/assets/locales/ja.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "\u767b\u9332" } \ No newline at end of file diff --git a/assets/locales/ka_GE.json b/assets/locales/ka_GE.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/ka_GE.json +++ b/assets/locales/ka_GE.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/ko_KR.json b/assets/locales/ko_KR.json index 904002cc66..9270fefb84 100644 --- a/assets/locales/ko_KR.json +++ b/assets/locales/ko_KR.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "\ub4f1\ub85d" } \ No newline at end of file diff --git a/assets/locales/lt_LT.json b/assets/locales/lt_LT.json index 819b39d161..1cf689a85b 100644 --- a/assets/locales/lt_LT.json +++ b/assets/locales/lt_LT.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registracija" } \ No newline at end of file diff --git a/assets/locales/lv_LV.json b/assets/locales/lv_LV.json index 60b586eb1f..81298b3fde 100644 --- a/assets/locales/lv_LV.json +++ b/assets/locales/lv_LV.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Re\u0123istr\u0101cija platform\u0101" } \ No newline at end of file diff --git a/assets/locales/mk_MK.json b/assets/locales/mk_MK.json index 0dd216c5fc..5b1e2b4e52 100644 --- a/assets/locales/mk_MK.json +++ b/assets/locales/mk_MK.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u0458\u0430" } \ No newline at end of file diff --git a/assets/locales/ms_MY.json b/assets/locales/ms_MY.json index cafcf8b86e..c5a601000e 100644 --- a/assets/locales/ms_MY.json +++ b/assets/locales/ms_MY.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/nl.json b/assets/locales/nl.json index 7b9bef396a..9a79730b33 100644 --- a/assets/locales/nl.json +++ b/assets/locales/nl.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registratie" } \ No newline at end of file diff --git a/assets/locales/nn_NO.json b/assets/locales/nn_NO.json index d33f96dbce..50a967fc15 100644 --- a/assets/locales/nn_NO.json +++ b/assets/locales/nn_NO.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registrering" } \ No newline at end of file diff --git a/assets/locales/oc.json b/assets/locales/oc.json index bdbbbee8ab..a3d9ad1c07 100644 --- a/assets/locales/oc.json +++ b/assets/locales/oc.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "Contact" + "Contact": "Contact", + "Registration": "Registration" } \ No newline at end of file diff --git a/assets/locales/pl_PL.json b/assets/locales/pl_PL.json index 7cf85e462d..697a077785 100644 --- a/assets/locales/pl_PL.json +++ b/assets/locales/pl_PL.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Rejestracja" } \ No newline at end of file diff --git a/assets/locales/ps.json b/assets/locales/ps.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/ps.json +++ b/assets/locales/ps.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/pt_PT.json b/assets/locales/pt_PT.json index 6aa36471fe..c053785462 100644 --- a/assets/locales/pt_PT.json +++ b/assets/locales/pt_PT.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registro\/inscri\u00e7\u00e3o" } \ No newline at end of file diff --git a/assets/locales/quz_PE.json b/assets/locales/quz_PE.json index bdbbbee8ab..a3d9ad1c07 100644 --- a/assets/locales/quz_PE.json +++ b/assets/locales/quz_PE.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "Contact" + "Contact": "Contact", + "Registration": "Registration" } \ No newline at end of file diff --git a/assets/locales/ro_RO.json b/assets/locales/ro_RO.json index 9cb8d7d8e8..96c622a0fa 100644 --- a/assets/locales/ro_RO.json +++ b/assets/locales/ro_RO.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Inregistrare" } \ No newline at end of file diff --git a/assets/locales/ru_RU.json b/assets/locales/ru_RU.json index 477fff3940..5117c1a745 100644 --- a/assets/locales/ru_RU.json +++ b/assets/locales/ru_RU.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f" } \ No newline at end of file diff --git a/assets/locales/sk_SK.json b/assets/locales/sk_SK.json index a5561cd753..c4efc7dbe3 100644 --- a/assets/locales/sk_SK.json +++ b/assets/locales/sk_SK.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registr\u00e1cia" } \ No newline at end of file diff --git a/assets/locales/sl_SI.json b/assets/locales/sl_SI.json index f6b61bf706..d13180c5b9 100644 --- a/assets/locales/sl_SI.json +++ b/assets/locales/sl_SI.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "Kontakt" + "Contact": "Kontakt", + "Registration": "Dovoljenje za samoregistracijo" } \ No newline at end of file diff --git a/assets/locales/so_SO.json b/assets/locales/so_SO.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/so_SO.json +++ b/assets/locales/so_SO.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/sr_RS.json b/assets/locales/sr_RS.json index f930499007..faf1a42a3a 100644 --- a/assets/locales/sr_RS.json +++ b/assets/locales/sr_RS.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registracija" } \ No newline at end of file diff --git a/assets/locales/sv_SE.json b/assets/locales/sv_SE.json index bd78c3d716..50039dcb52 100644 --- a/assets/locales/sv_SE.json +++ b/assets/locales/sv_SE.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Registrering" } \ No newline at end of file diff --git a/assets/locales/sw_KE.json b/assets/locales/sw_KE.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/sw_KE.json +++ b/assets/locales/sw_KE.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/th.json b/assets/locales/th.json index c7c1e2ca4b..7a689abe9d 100644 --- a/assets/locales/th.json +++ b/assets/locales/th.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "\u0e01\u0e32\u0e23\u0e25\u0e07\u0e17\u0e30\u0e40\u0e1a\u0e35\u0e22\u0e19" } \ No newline at end of file diff --git a/assets/locales/tl_PH.json b/assets/locales/tl_PH.json index 17b9aaecb5..fb11e07230 100644 --- a/assets/locales/tl_PH.json +++ b/assets/locales/tl_PH.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Rehistrasyon" } \ No newline at end of file diff --git a/assets/locales/tr.json b/assets/locales/tr.json index 0e35a3acaf..7ca4dbe4cb 100644 --- a/assets/locales/tr.json +++ b/assets/locales/tr.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "Kay\u0131t \u0130\u015flemi" } \ No newline at end of file diff --git a/assets/locales/uk_UA.json b/assets/locales/uk_UA.json index 9719407c33..0583fc325d 100644 --- a/assets/locales/uk_UA.json +++ b/assets/locales/uk_UA.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "\u0420\u0435\u0454\u0441\u0442\u0440\u0430\u0446\u0456\u044f" } \ No newline at end of file diff --git a/assets/locales/vi_VN.json b/assets/locales/vi_VN.json index b0a4385021..809766e94f 100644 --- a/assets/locales/vi_VN.json +++ b/assets/locales/vi_VN.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/xh_ZA.json b/assets/locales/xh_ZA.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/xh_ZA.json +++ b/assets/locales/xh_ZA.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/yo_NG.json b/assets/locales/yo_NG.json index 74f4cf5974..5d661201c0 100644 --- a/assets/locales/yo_NG.json +++ b/assets/locales/yo_NG.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "" } \ No newline at end of file diff --git a/assets/locales/zh_CN.json b/assets/locales/zh_CN.json index a469552b51..a4cf851f88 100644 --- a/assets/locales/zh_CN.json +++ b/assets/locales/zh_CN.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "\u6ce8\u518c" } \ No newline at end of file diff --git a/assets/locales/zh_TW.json b/assets/locales/zh_TW.json index bc1b2df89b..3b45d9513c 100644 --- a/assets/locales/zh_TW.json +++ b/assets/locales/zh_TW.json @@ -157,5 +157,6 @@ "End of LearnPath": "End of LearnPath", "OfajEndLPSubject": "OfajEndLPSubject", "OfajEndLpDescription": "OfajEndLpDescription", - "Contact": "" + "Contact": "", + "Registration": "\u8a3b\u518a" } \ No newline at end of file diff --git a/assets/vue/components/layout/TopbarNotLoggedIn.vue b/assets/vue/components/layout/TopbarNotLoggedIn.vue index 84c6d14049..014b80956c 100644 --- a/assets/vue/components/layout/TopbarNotLoggedIn.vue +++ b/assets/vue/components/layout/TopbarNotLoggedIn.vue @@ -28,31 +28,35 @@ function setLanguage(event) { const menuItems = ref([ { - label: 'Register oneself', - url: '/main/auth/inscription.php', + label: "FAQ", + to: { name: "Faq" }, }, { - label: 'FAQ', - url: '/web/faq', + label: "Registration", + url: "/main/auth/inscription.php", }, { - label: 'Contact', - url: '/web/contact' + label: "Demo", + to: { name: "Demo" }, }, { - key: 'language_selector', - label: 'English', + label: "Contact", + to: { name: "Contact" }, + }, + { + key: "language_selector", + label: "English", items: [ { - label: 'English', + label: "English", command: setLanguage, }, { - label: 'French', + label: "French", command: setLanguage, }, { - label: 'Spanish', + label: "Spanish", command: setLanguage, }, ], From eeac28e2935d3ec8134f628af71edfef99b14dec Mon Sep 17 00:00:00 2001 From: christian Date: Mon, 6 Nov 2023 12:14:00 -0500 Subject: [PATCH 5/5] Course: fix display images in intro - refs BT#21046 --- src/CoreBundle/Controller/CourseController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CoreBundle/Controller/CourseController.php b/src/CoreBundle/Controller/CourseController.php index 3de974f678..c655584ac5 100644 --- a/src/CoreBundle/Controller/CourseController.php +++ b/src/CoreBundle/Controller/CourseController.php @@ -643,7 +643,7 @@ class CourseController extends ToolBaseController /** @var CToolIntro $ctoolintro */ $ctoolintro = $ctoolintroRepo->findOneBy(['courseTool' => $ctool]); if ($ctoolintro) { - $introText = preg_replace('/<[^>]*>(\s| )*<\/[^>]*>/', '', $ctoolintro->getIntroText()); + $introText = $ctoolintro->getIntroText(); $responseData = [ 'iid' => $ctoolintro->getIid(), 'introText' => $introText,