Merge remote-tracking branch 'upstream/master' into GH-7514

Author: christianbeeznest

.opensourcefinder-verify

@@ -147,6 +147,16 @@ chown -R root: .env config/
 
 Your Chamilo is ready to use!
 
+## Configuration
+
+Most configuration changes are made through the administration page inside Chamilo's web interface, but the database connection
+and other settings critical to the Symfony layer are located in the `.env` file at the root of Chamilo.
+
+Other core, Symfony-related, settings for advanced administration are located in the `config/packages/` folder (`*.yaml` files),
+but remember that these files are updated with each new version of Chamilo. Instead of modifying those directly, it is
+highly recommended to copy them into the `config/packages/prod/` folder and modifying them there (for your production 
+environment). This will improve maintainability through different Chamilo upgrades in the future.
+
 ## Documentation
 
 For more information on Chamilo 2, visit https://2.chamilo.org/documentation/index.html

README.md

@@ -1,5 +1,5 @@
 .p-card {
-  @apply rounded-lg bg-white border border-gray-25 transition
+  @apply rounded-lg bg-white border border-gray-25 transition isolate
     hover:shadow-xl;
 
   .p-card-body {
@@ -14,7 +14,7 @@
     @apply relative;
 
     img {
-      @apply rounded-t-lg object-cover;
+      @apply rounded-t-lg object-cover w-full h-auto;
     }
   }
 

assets/css/scss/organisms/_cards.scss

@@ -6,13 +6,15 @@
     }
 
     &__category-list {
-      @apply absolute top-2 left-2 flex flex-wrap gap-1;
+      @apply absolute top-2 left-2 flex flex-wrap gap-1 pointer-events-none;
     }
 
     &__title {
-      @apply text-gray-90 text-body-1 font-semibold space-y-2 flex items-center gap-2;
+      @apply text-gray-90 text-body-1 font-semibold flex flex-col flex-1 justify-center gap-1;
 
       .session {
+        @apply flex flex-col;
+
         &__title {
           @apply text-body-2 font-semibold;
         }
@@ -23,6 +25,22 @@
       }
     }
 
+    &__notification-button {
+      @apply absolute right-3 top-3 inline-flex h-9 w-9 items-center justify-center rounded-full text-gray-50 pointer-events-auto hover:bg-white/90;
+
+      &--badge::before {
+        @apply absolute right-0 top-0 h-4 w-4 rounded-full bg-danger content-[""];
+      }
+    }
+
+    &__completed-overlay {
+      @apply absolute rounded-t-lg pointer-events-none bg-support-3 w-full h-full flex items-center justify-center;
+
+      .mdi {
+        @apply text-white opacity-90 text-7xl/4;
+      }
+    }
+
     &__language {
       @apply absolute bottom-2 right-2;
     }

assets/css/scss/organisms/_course_card.scss

@@ -21,7 +21,7 @@ const props = defineProps({
   size: {
     type: String,
     default: "normal",
-    validator: (value) => ["big", "normal", "small"].includes(value),
+    validator: (value) => ["big", "normal", "small", "custom"].includes(value),
   },
   title: {
     type: String,

assets/vue/components/basecomponents/BaseIcon.vue

@@ -160,4 +160,6 @@ export const chamiloIconToClass = {
   "help": "mdi mdi-face-agent",
   "robot": "mdi mdi-robot",
   "compass": "mdi mdi-compass-outline",
+  "globe": "mdi mdi-web",
+  "notification": "mdi mdi-bell",
 }

assets/vue/components/basecomponents/ChamiloIcons.js

@@ -11,7 +11,10 @@
       />
     </div>
 
-    <CourseCategorySelect v-model="model.categories" />
+    <CourseCategorySelect
+      v-model="model.categories"
+      action="catalogue"
+    />
 
     <template
       v-for="f in fields"