Merge branch 'master' of github.com:chamilo/chamilo-lms

Author: ywarnier

assets/css/app.scss

@@ -997,22 +997,6 @@ img.course-tool__icon {
   }
 }
 
-.course-card {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-}
-
-.course-card :deep(.p-card-body) {
-  flex: 1 1 auto;
-  display: flex;
-  flex-direction: column;
-}
-
-.course-card :deep(.p-card-footer) {
-  margin-top: auto;
-}
-
 @layer components {
   .form-group:focus-within,
   .field:focus-within,

assets/css/scss/organisms/_cards.scss

@@ -1,13 +1,13 @@
 .p-card {
-  @apply rounded-lg bg-white shadow-lg;
+  @apply rounded-lg bg-white drop-shadow-lg;
 
   .p-card-body {
-    @apply flex flex-col space-y-4 p-4;
+    @apply h-full flex flex-col space-y-4 p-4  border-b border-r border-l border-b-support-1 border-r-support-1 border-l-support-1 rounded-b-lg rounded-r-lg rounded-l-lg;
   }
 
   .p-card-header {
     img {
-      @apply rounded-t-lg;
+      @apply rounded-t-lg aspect-video;
     }
   }
 

assets/css/scss/organisms/_course_card.scss

@@ -3,7 +3,7 @@
     @apply bg-gray-15;
 
     &__title {
-      @apply text-gray-90 text-body-1 font-semibold space-y-2;
+      @apply text-gray-90 text-body-1 font-semibold space-y-2 flex items-center gap-2;
 
       .session {
         &__title {

assets/vue/components/Login.vue

@@ -95,6 +95,9 @@
     </form>
 
     <LoginOAuth2Buttons />
+    <div class="mt-3">
+      <CategoryLinks category="menu_links" />
+    </div>
   </div>
 </template>
 
@@ -125,6 +128,7 @@ import { useLogin } from "../composables/auth/login"
 import LoginOAuth2Buttons from "./login/LoginOAuth2Buttons.vue"
 import { usePlatformConfig } from "../store/platformConfig"
 import { useRouter } from "vue-router"
+import CategoryLinks from "./page/CategoryLinks.vue"
 
 const { t } = useI18n()
 const router = useRouter()

assets/vue/components/admin/AdminBlock.vue

@@ -23,6 +23,8 @@
         method="get"
       >
         <BaseInputGroup
+          :id="inputId"
+          :button-id="buttonId"
           :button-label="t('Search')"
           :input-placeholder="t('Keyword')"
           button-icon="search"
@@ -99,6 +101,15 @@ const props = defineProps({
   items: { type: Array, required: true, default: () => [] },
 })
 
+// computed IDs for search input and button derived from the title
+const inputId = computed(() => {
+  const raw = (props.title || "").toString().trim()
+  const normalized = raw.replace(/\s+/g, "_").toLowerCase()
+  return (normalized || "search") + "_search"
+})
+
+const buttonId = computed(() => `${inputId.value}_button`)
+
 const visibleItems = computed(() =>
   props.items
     .map((item) => {

assets/vue/components/basecomponents/BaseButton.vue

@@ -14,6 +14,7 @@
     :title="tooltip || (onlyIcon ? label : undefined)"
     :type="isSubmit ? 'submit' : 'button'"
     :name="name"
+    :id="id"
     class="cursor-pointer"
     @click="$emit('click', $event)"
   />
@@ -76,6 +77,11 @@ const props = defineProps({
     required: false,
     default: undefined,
   },
+  id: {
+    type: String,
+    required: false,
+    default: undefined,
+  },
 })
 
 defineEmits(["click"])

assets/vue/components/basecomponents/BaseInputGroup.vue

@@ -1,13 +1,15 @@
 <template>
   <div class="p-inputgroup">
     <InputText
+      :id="id"
       :name="inputName"
       :placeholder="inputPlaceholder"
       type="text"
     />
     <BaseButton
       :icon="buttonIcon"
       :label="buttonLabel"
+      :id="buttonId"
       is-submit
       type="primary"
       @click="$emit('button-click', $event)"
@@ -36,6 +38,16 @@ defineProps({
     type: String,
     required: true,
   },
+  id: {
+    type: String,
+    required: false,
+    default: undefined,
+  },
+  buttonId: {
+    type: String,
+    required: false,
+    default: undefined,
+  },
 })
 
 defineEmits(["button-click"])

assets/vue/components/course/AdminCourseCard.vue

@@ -1,7 +1,7 @@
 <template>
   <Card class="course-card rounded-2xl overflow-hidden bg-white shadow-sm">
     <template #header>
-      <div class="relative aspect-[16/9] w-full overflow-hidden bg-gray-100">
+      <div class="relative aspect-video w-full overflow-hidden bg-gray-100">
         <img
           :alt="course.title || 'Course illustration'"
           :src="imageUrl"

assets/vue/components/course/AdvancedCourseFilters.vue

@@ -212,7 +212,10 @@
       <!-- TEXT / INTEGER / FLOAT / DURATION  -->
       <div v-else>
         <label class="block text-sm font-medium mb-1">{{ f.title }}</label>
-        <InputText v-model="model.extra[f.variable]" :id="`extra-${f.variable}`" />
+        <InputText
+          v-model="model.extra[f.variable]"
+          :id="`extra-${f.variable}`"
+        />
       </div>
     </template>
 
@@ -328,15 +331,33 @@ function clear() {
 }
 
 function apply() {
-  const payload = {}
-  if (model.title?.trim()) payload.title = model.title.trim()
+  const payload = {
+    title: "",
+    extraFields: [],
+    extraFieldValues: [],
+  }
+
+  payload.title = model.title.trim()
+
+  for (let [key, value] of Object.entries(model.extra)) {
+    const fieldInfo = props.fields.find((f) => f.variable === key)
+
+    if (!fieldInfo) {
+      continue
+    }
+
+    if (isCheckbox(fieldInfo)) {
+      if (value === true) {
+        value = "1"
+      } else {
+        key = undefined
+        value = undefined
+      }
+    }
 
-  Object.entries(model.extra).forEach(([k, v]) => {
-    if (v === null || v === undefined) return
-    if (Array.isArray(v) && v.length === 0) return
-    if (typeof v === "string" && v.trim() === "") return
-    payload[`extra_${k}`] = v
-  })
+    payload.extraFields.push(key)
+    payload.extraFieldValues.push(value)
+  }
 
   emit("apply", payload)
 }

assets/vue/components/course/CourseCard.vue

@@ -1,7 +1,7 @@
 <template>
   <Card class="course-card">
     <template #header>
-      <div class="relative aspect-[16/9] w-full overflow-hidden rounded-t-2xl bg-gray-100">
+      <div class="relative aspect-video w-full overflow-hidden rounded-t-2xl bg-gray-100">
         <img
           v-if="isLocked"
           :alt="course.title || 'Course illustration'"
@@ -27,7 +27,7 @@
       </div>
     </template>
     <template #title>
-      <div class="course-card__title flex items-center gap-2">
+      <div class="course-card__title">
         <div v-if="isLocked">
           <div
             v-if="session"