Skip to content

Commit 3ceeb86

Browse files
ywarnierywarnier
authored
Merge branch 'master' into chamiloGH-3197 
2 parents fa65574 + 831d146 commit 3ceeb86

File tree

653 files changed

+19924
-10054
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

653 files changed

+19924
-10054
lines changed

‎.env.dist

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DATABASE_PASSWORD='{{DATABASE_PASSWORD}}'
1919
APP_ENV='dev'
2020
APP_SECRET='{{APP_SECRET}}'
2121
APP_DEBUG='1'
22-
#TRUSTED_PROXIES=127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16
22+
TRUSTED_PROXIES=127.0.0.1
2323
#TRUSTED_HOSTS='^(localhost|example\.com)$'
2424
###< symfony/framework-bundle ###
2525

‎.gitignore

+4
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ var/upload/*
2626
/config/configuration.php
2727
/main/inc/conf/configuration.php
2828

29+
/config/authentication.yaml
30+
/config/hosting_limits.yaml
31+
/config/plugin.yaml
32+
2933
# Home
3034
components/*
3135

‎.yarn/releases/yarn-4.4.1.cjs

-925
This file was deleted.

‎.yarn/releases/yarn-4.6.0.cjs

+934
Large diffs are not rendered by default.

‎.yarnrc.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
nodeLinker: node-modules
22

3-
yarnPath: .yarn/releases/yarn-4.4.1.cjs
3+
yarnPath: .yarn/releases/yarn-4.6.0.cjs

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ On Ubuntu 24.04+, the following should take care of most dependencies.
3434
~~~~
3535
sudo apt update
3636
sudo apt -y upgrade
37-
sudo apt install apache2 libapache2-mod-php mariadb-client mariadb-server redis php-pear php-{apcu,bcmath,cli,curl,dev,gd,intl,mbstring,mysql,redis,soap,xml,zip} git unzip
37+
sudo apt install apache2 libapache2-mod-php mariadb-client mariadb-server redis php-pear php-{apcu,bcmath,cli,curl,dev,gd,intl,mbstring,mysql,redis,soap,xml,zip} git unzip curl
3838
sudo mysql
3939
mysql> GRANT ALL PRIVILEGES ON chamilo.* TO chamilo@localhost IDENTIFIED BY '{password}';
4040
mysql> exit
@@ -49,7 +49,7 @@ sudo apt -y upgrade
4949
sudo apt -y install ca-certificates curl gnupg software-properties-common
5050
sudo add-apt-repository ppa:ondrej/php
5151
sudo apt update
52-
sudo apt install apache2 libapache2-mod-php8.3 mariadb-client mariadb-server redis php-pear php8.3-{apcu,bcmath,cli,curl,dev,gd,intl,mbstring,mysql,redis,soap,xml,zip} git unzip
52+
sudo apt install apache2 libapache2-mod-php8.3 mariadb-client mariadb-server redis php-pear php8.3-{apcu,bcmath,cli,curl,dev,gd,intl,mbstring,mysql,redis,soap,xml,zip} git unzip curl
5353
~~~~
5454
(replace 'chamilo' by the database name and user you want, and '{password}' by a more secure password)
5555

‎assets/css/app.scss

+77-4
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,10 @@
292292
}
293293
}
294294

295+
.mdi {
296+
@apply font-normal text-base leading-none;
297+
}
298+
295299
.field > small.p-error {
296300
@apply text-error;
297301
}
@@ -777,6 +781,70 @@ form .field {
777781
}
778782
}
779783

784+
.attendance-page {
785+
canvas {
786+
width: 100%;
787+
height: 100%;
788+
display: block;
789+
}
790+
791+
tr {
792+
height: 100px;
793+
}
794+
795+
th,
796+
td {
797+
height: 100px;
798+
vertical-align: middle;
799+
}
800+
801+
.flex {
802+
display: flex;
803+
}
804+
805+
.flex-col {
806+
flex-direction: column;
807+
}
808+
809+
.align-middle {
810+
vertical-align: middle;
811+
}
812+
813+
.mt-1 {
814+
margin-top: 4px;
815+
}
816+
817+
.gap-2 {
818+
gap: 8px;
819+
}
820+
821+
.opacity-50 {
822+
opacity: 0.5;
823+
}
824+
825+
.cursor-not-allowed {
826+
cursor: not-allowed;
827+
}
828+
829+
.loader {
830+
border: 4px solid #f3f3f3;
831+
border-top: 4px solid #3498db;
832+
border-radius: 50%;
833+
width: 40px;
834+
height: 40px;
835+
animation: spin 1s linear infinite;
836+
}
837+
838+
@keyframes spin {
839+
0% {
840+
transform: rotate(0deg);
841+
}
842+
100% {
843+
transform: rotate(360deg);
844+
}
845+
}
846+
}
847+
780848
.row {
781849
@apply flex flex-wrap -mx-4;
782850
}
@@ -787,10 +855,6 @@ form .field {
787855
@apply w-full md:w-1/2 px-4;
788856
}
789857

790-
.section-header__title {
791-
@apply mt-4;
792-
}
793-
794858
.stats_table {
795859
thead th {
796860
@apply bg-gray-20 text-gray-90 font-semibold text-left px-4 py-3 border-b border-gray-30;
@@ -803,6 +867,15 @@ form .field {
803867
}
804868
}
805869

870+
/* Loader */
871+
.loader {
872+
@apply w-10 h-10 border-4 border-gray-20 border-l-primary rounded-full animate-spin;
873+
}
874+
875+
.loader-overlay {
876+
@apply absolute inset-0 flex items-center justify-center bg-white bg-opacity-40 backdrop-blur-sm;
877+
}
878+
806879
//@import "~jquery-ui-timepicker-addon/dist/jquery-ui-timepicker-addon.css";
807880
@import "~@fancyapps/fancybox/dist/jquery.fancybox.css";
808881
@import "~timepicker/jquery.timepicker.min.css";

‎assets/css/scss/_catalog_course.scss

-37
Original file line numberDiff line numberDiff line change
@@ -1,37 +0,0 @@
1-
::v-deep(.p-paginator) {
2-
.p-paginator-current {
3-
margin-left: auto;
4-
}
5-
}
6-
.course-image {
7-
width: 130px;
8-
box-shadow: 0 3px 6px rgba(0, 0, 0, 0.16), 0 3px 6px rgba(0, 0, 0, 0.23)
9-
}
10-
.p-input-icon-left > i:first-of-type {
11-
left: 0.75rem;
12-
color: #6c757d;
13-
}
14-
.p-input-icon-left > i, .p-input-icon-right > i {
15-
margin-top: -.5rem;
16-
position: absolute;
17-
top: 50%;
18-
}
19-
::v-deep(.p-datatable.p-datatable-courses) {
20-
.p-datatable-header {
21-
padding: 1rem;
22-
text-align: left;
23-
font-size: 1.5rem;
24-
}
25-
26-
.p-paginator {
27-
padding: 1rem;
28-
}
29-
30-
.p-datatable-thead > tr > th {
31-
text-align: left;
32-
}
33-
34-
.p-datatable-tbody > tr > td {
35-
cursor: auto;
36-
}
37-
}

‎assets/css/scss/atoms/_buttons.scss

+21-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
.btn {
2-
@apply cursor-default font-semibold gap-2 inline-flex justify-center px-6 py-2 rounded-md transition flex-none;
3-
font-size: 16px;
2+
@apply cursor-default font-semibold gap-2 inline-flex justify-center px-6 py-2 rounded-md transition flex-none text-base;
3+
4+
.mdi {
5+
@apply text-base;
6+
}
47

58
&--primary {
69
@apply bg-primary text-white;
@@ -231,8 +234,6 @@ $border-color_12: #9333EA;
231234
@include filled-style('primary', 'support-4');
232235
@apply cursor-pointer font-semibold gap-2 inline-flex justify-center items-center px-4 py-2 rounded-md transition;
233236

234-
font-size: 16px;
235-
236237
&:focus {
237238
@apply outline-none;
238239
}
@@ -259,16 +260,28 @@ $border-color_12: #9333EA;
259260

260261
&.p-button-sm {
261262
@apply px-2 py-1;
262-
font-size: 13px;
263+
264+
.p-button-icon,
265+
.p-button-label {
266+
font-size: 13px;
267+
}
263268
}
264269

265270
&.p-button-lg {
266271
@apply px-8 py-4;
267-
font-size: 18px;
272+
273+
.p-button-icon,
274+
.p-button-label {
275+
font-size: 18px;
276+
}
277+
}
278+
279+
.p-button-icon {
280+
@apply text-base;
268281
}
269282

270283
.p-button-label {
271-
@apply align-middle font-semibold;
284+
@apply align-middle font-semibold text-base;
272285
}
273286

274287
&.p-button-icon-only {
@@ -289,7 +302,7 @@ $border-color_12: #9333EA;
289302
@apply bg-gray-10;
290303

291304
.p-button-label {
292-
text-decoration: underline;
305+
@apply underline;
293306
}
294307
}
295308
}

‎assets/css/scss/atoms/_inputgroup.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
}
6060

6161
.p-inputgroup-addon {
62-
@apply flex items-center justify-center bg-white border-t border-l border-b border-support-3 px-4 py-3
62+
@apply flex items-center justify-center bg-white border-t border-l border-b border-support-3 px-4 py-2
6363
last:border-r last:rounded-r-lg
6464
first:rounded-l-lg;
6565
}

‎assets/css/scss/atoms/_rating.scss

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
.p-rating {
2+
@apply relative flex items-center gap-1;
3+
4+
&-item {
5+
@apply inline-flex items-center cursor-pointer outline-none rounded-lg
6+
hover:outline-none hover:drop-shadow-lg;
7+
8+
.p-rating-icon {
9+
@apply transition-none text-gray-50;
10+
11+
font-size: 1rem;
12+
13+
&.p-icon {
14+
@apply w-4 h-4;
15+
16+
&.p-rating-cancel {
17+
@apply text-danger;
18+
}
19+
}
20+
}
21+
22+
&.p-focus {
23+
@apply outline-none drop-shadow-lg;
24+
}
25+
26+
&.p-rating-item-active {
27+
& .p-rating-icon {
28+
@apply text-warning;
29+
}
30+
}
31+
}
32+
33+
&.p-readonly &-item {
34+
@apply cursor-default;
35+
}
36+
37+
&:not(.p-disabled):not(.p-readonly) &-item:hover &-icon {
38+
@apply text-warning;
39+
}
40+
41+
&:not(.p-disabled):not(.p-readonly) &-item:hover &-icon.p-rating-cancel {
42+
@apply text-danger;
43+
}
44+
}

‎assets/css/scss/index.scss

+1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
@include meta.load-css("atoms/platform_logo");
4848
@include meta.load-css("atoms/progressbar");
4949
@include meta.load-css("atoms/radio");
50+
@include meta.load-css("atoms/rating");
5051
@include meta.load-css("atoms/skeleton");
5152
@include meta.load-css("atoms/tags");
5253
@include meta.load-css("atoms/toast");

‎assets/css/scss/molecules/_course_tool.scss

+2-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313
&__icon {
1414
@apply text-transparent bg-clip-text bg-gradient-to-br from-primary to-primary-gradient leading-none;
1515

16-
font-size: 52px;
17-
18-
&::before {
16+
&.mdi {
17+
font-size: 52px;
1918
}
2019
}
2120

‎assets/css/scss/molecules/_empty_state.scss

+5-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@
77
}
88

99
&__icon {
10-
@apply mb-4 text-9xl text-transparent bg-clip-text bg-gradient-to-br from-primary to-primary-gradient w-32 h-32;
10+
@apply mb-4 text-transparent bg-clip-text bg-gradient-to-br from-primary to-primary-gradient w-32 h-32;
11+
12+
&.mdi {
13+
font-size: 8rem;
14+
}
1115
}
1216

1317
&__summary {

‎assets/css/scss/molecules/_toolbar.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
&-group-left,
55
&-group-right {
6-
@apply flex flex-row flex-wrap gap-2;
6+
@apply flex flex-row flex-wrap gap-2 items-center;
77
}
88

99
&-separator {

‎assets/css/scss/organisms/_section_header.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
}
1919

2020
&__actions {
21-
@apply flex gap-2 flex-wrap;
21+
@apply flex gap-2 flex-wrap justify-center;
2222
}
2323

2424
h1, h2, h3, h4, h5, h6 {

‎assets/locales/ar.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -576,5 +576,9 @@
576576
"Move": "\u0646\u0642\u0644",
577577
"Select the destination folder": "Select the destination folder",
578578
"Select a folder": "Select a folder",
579-
"Move document": "\u0646\u0642\u0644 \u0627\u0644\u0645\u0633\u062a\u0646\u062f"
579+
"Move document": "\u0646\u0642\u0644 \u0627\u0644\u0645\u0633\u062a\u0646\u062f",
580+
"Reminders": "Reminders",
581+
"Add reminder": "Add reminder",
582+
"Update introduction links": "Update introduction links",
583+
"Conference Room": "Conference Room"
580584
}

‎assets/locales/ast_ES.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -481,5 +481,9 @@
481481
"Move": "Mover",
482482
"Select the destination folder": "Select the destination folder",
483483
"Select a folder": "Select a folder",
484-
"Move document": "Mover el documentu"
484+
"Move document": "Mover el documentu",
485+
"Reminders": "Reminders",
486+
"Add reminder": "Add reminder",
487+
"Update introduction links": "Update introduction links",
488+
"Conference Room": "Conference Room"
485489
}

‎assets/locales/bg.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -497,5 +497,9 @@
497497
"Move": "\u041f\u0440\u0435\u043c\u0435\u0441\u0442\u0432\u0430\u043d\u0435",
498498
"Select the destination folder": "Select the destination folder",
499499
"Select a folder": "Select a folder",
500-
"Move document": "\u041f\u0440\u0435\u043c\u0435\u0441\u0442\u0432\u0430\u043d\u0435 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430"
500+
"Move document": "\u041f\u0440\u0435\u043c\u0435\u0441\u0442\u0432\u0430\u043d\u0435 \u043d\u0430 \u0434\u043e\u043a\u0443\u043c\u0435\u043d\u0442\u0430",
501+
"Reminders": "Reminders",
502+
"Add reminder": "Add reminder",
503+
"Update introduction links": "Update introduction links",
504+
"Conference Room": "Conference Room"
501505
}

0 commit comments

Comments
 (0)