Skip to content

Commit 9948f1d

Browse files
ywarnierywarnier
committed
Merge branch 'master' of github.com:chamilo/chamilo-lms
2 parents c16fc5f + 54f9182 commit 9948f1d

38 files changed

+1014
-577
lines changed

‎assets/css/app.scss‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,17 @@ table#skill_holder {
451451
padding: 20px 0px;
452452
}
453453

454+
#date_fields label {
455+
top: 0px;
456+
left: 0.5rem;
457+
--tw-bg-opacity: 1;
458+
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
459+
padding-left: 0.25rem;
460+
padding-right: 0.25rem;
461+
--tw-text-opacity: 1;
462+
color: rgb(46 117 163 / var(--tw-text-opacity));
463+
}
464+
454465
/* ****************************************************
455466
END SKILL
456467
**************************************************** */

‎assets/vue/components/ccalendarevent/CCalendarEventForm.vue‎

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<template>
22
<form>
3-
<BaseInputText
4-
v-model="v$.item.title.$model"
5-
:error-text="v$.item.title.$errors.map((error) => error.$message).join('<br>')"
6-
:is-invalid="v$.item.title.$error"
7-
:label="t('Title')"
8-
/>
9-
10-
<div class="flex flex-col md:flex-row gap-x-5">
11-
<div class="md:w-1/2 flex flex-col">
3+
<div class="grid lg:grid-cols-2 md:gap-4">
4+
<BaseInputText
5+
v-model="v$.item.title.$model"
6+
:error-text="v$.item.title.$errors.map((error) => error.$message).join('<br>')"
7+
:is-invalid="v$.item.title.$error"
8+
:label="t('Title')"
9+
/>
10+
11+
<div class="grid md:grid-cols-2 md:gap-4">
1212
<div class="field">
1313
<div class="p-float-label">
1414
<Calendar
@@ -51,31 +51,36 @@
5151
class="p-error"
5252
/>
5353
</div>
54+
</div>
55+
</div>
5456

55-
<tiny-editor
56-
v-model="v$.item.content.$model"
57-
:init="{
58-
skin_url: '/build/libs/tinymce/skins/ui/oxide',
59-
content_css: '/build/libs/tinymce/skins/content/default/content.css',
60-
branding: false,
61-
relative_urls: false,
62-
height: 250,
63-
toolbar_mode: 'sliding',
64-
file_picker_callback: browser,
65-
autosave_ask_before_unload: true,
66-
plugins: [
67-
'advlist autolink lists link image charmap print preview anchor',
68-
'searchreplace visualblocks code fullscreen',
69-
'insertdatetime media table paste wordcount emoticons',
70-
],
71-
toolbar:
72-
'undo redo | bold italic underline strikethrough | insertfile image media template link | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent | numlist bullist | forecolor backcolor removeformat | pagebreak | charmap emoticons | fullscreen preview save print | code codesample | ltr rtl',
57+
<div class="grid md:grid-cols-2 md:gap-4">
58+
<tiny-editor
59+
v-model="v$.item.content.$model"
60+
:init="{
61+
skin_url: '/build/libs/tinymce/skins/ui/oxide',
62+
content_css: '/build/libs/tinymce/skins/content/default/content.css',
63+
branding: false,
64+
relative_urls: false,
65+
height: 250,
66+
toolbar_mode: 'sliding',
67+
file_picker_callback: browser,
68+
autosave_ask_before_unload: true,
69+
plugins: [
70+
'advlist autolink lists link image charmap print preview anchor',
71+
'searchreplace visualblocks code fullscreen',
72+
'insertdatetime media table paste wordcount emoticons',
73+
],
74+
toolbar:
75+
'undo redo | bold italic underline strikethrough | insertfile image media template link | fontselect fontsizeselect formatselect | alignleft aligncenter alignright alignjustify | outdent indent | numlist bullist | forecolor backcolor removeformat | pagebreak | charmap emoticons | fullscreen preview save print | code codesample | ltr rtl',
7376
}"
74-
required
75-
/>
76-
</div>
77+
required
78+
/>
7779

78-
<div class="md:w-1/2 flex flex-col">
80+
<div
81+
v-if="agendaCollectiveInvitations"
82+
class="flex flex-col"
83+
>
7984
<div
8085
v-t="'Invitees'"
8186
class="text-h6"
@@ -112,8 +117,12 @@ import Calendar from "primevue/calendar"
112117
import EditLinks from "../resource_links/EditLinks.vue"
113118
import BaseCheckbox from "../basecomponents/BaseCheckbox.vue"
114119
import { useI18n } from "vue-i18n"
120+
import { usePlatformConfig } from "../../store/platformConfig"
115121
116122
const store = useStore()
123+
const platformConfigStore = usePlatformConfig();
124+
125+
const agendaCollectiveInvitations = 'true' === platformConfigStore.getSetting('agenda.agenda_collective_invitations')
117126
118127
const { t } = useI18n()
119128

‎assets/vue/components/ccalendarevent/CCalendarEventInfo.vue‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@
1313

1414
<div v-html="event.content" />
1515

16-
<h6 v-t="'Invitees'" />
17-
18-
<ShowLinks
19-
:item="event"
20-
:show-status="false"
21-
/>
16+
<div
17+
v-if="event.resourceLinkListFromEntity && event.resourceLinkListFromEntity.length"
18+
>
19+
<h6 v-t="'Invitees'" />
20+
21+
<ShowLinks
22+
:item="event"
23+
:show-status="false"
24+
/>
25+
</div>
2226
</div>
2327
</template>
2428

‎assets/vue/components/documents/FormNewDocument.vue‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
<template>
22
<q-form>
3-
<q-input
4-
id="item_title"
5-
v-model="item.title"
6-
:error="v$.item.title.$error"
7-
:error-message="titleErrors"
8-
:placeholder="$t('Title')"
9-
@blur="v$.item.title.$touch()"
10-
@input="v$.item.title.$touch()"
11-
/>
3+
4+
<div class="p-field">
5+
<InputText
6+
id="item_title"
7+
v-model.trim="item.title"
8+
:error="v$.item.title.$error"
9+
:error-message="titleErrors"
10+
:placeholder="$t('Title')"
11+
@blur="v$.item.title.$touch()"
12+
@input="v$.item.title.$touch()"
13+
/>
14+
</div>
1215

1316
<TinyEditor
1417
v-if="

0 commit comments

Comments
 (0)