diff --git a/assets/css/app.scss b/assets/css/app.scss index fa46d51e81..d00a49e573 100644 --- a/assets/css/app.scss +++ b/assets/css/app.scss @@ -718,6 +718,32 @@ form .field { @apply flex flex-row flex-wrap; } } + +.btn:hover { + cursor: pointer; + color: #fff; +} + +.btn.btn--success.btn-large:hover { + background-color: #28a745; +} + +.btn.btn--warning.question-validate-btn:hover { + background-color: #ffc107; +} + +.btn.btn--info:hover { + background-color: #17a2b8; +} + +.btn.btn--success:hover { + background-color: #28a745; +} + +.btn.btn--danger:hover { + background-color: #dc3545; +} + //@import 'primevue-md-light-indigo/theme.css'; //@import '~primevue/resources/primevue.min.css'; //@import '~primeflex/primeflex.css'; diff --git a/assets/css/scss/course_home.scss b/assets/css/scss/course_home.scss index 22b869cd83..f4e4131a18 100644 --- a/assets/css/scss/course_home.scss +++ b/assets/css/scss/course_home.scss @@ -3,3 +3,92 @@ @apply grid grid-cols-[repeat(auto-fill,_minmax(120px,_1fr))] gap-y-8 gap-x-20 mt-4; } } + +.container-about-custom { + margin: 0 auto; + .row { + display: flex; + flex-wrap: wrap; + margin-left: -16px; + margin-right: -16px; + } + .col { + flex: 1; + padding-left: 16px; + padding-right: 16px; + min-width: 300px; + box-sizing: border-box; + } + .col-2 { + flex: 2; + } + .bg-white { + background-color: white; + } + .shadow { + box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1); + } + .rounded { + border-radius: 8px; + } + .p-4 { + padding: 16px; + } + .mb-4 { + margin-bottom: 16px; + } + .mt-4 { + margin-top: 16px; + } + .text-2xl { + font-size: 1.5rem; + } + .font-bold { + font-weight: bold; + } + .course-short ul { + padding: 0; + list-style-type: none; + } + .course-short ul li { + display: inline; + margin-right: 8px; + } + .text-lg { + font-size: 1.25rem; + } + .text-md { + font-size: 1rem; + } + .text-sm { + font-size: 0.875rem; + } + .font-semibold { + font-weight: 600; + } + .social-buttons { + display: flex; + gap: 8px; + align-items: center; + } + .social-buttons a { + display: flex; + align-items: center; + padding: 8px 12px; + border: 1px solid #ccc; + border-radius: 4px; + text-decoration: none; + } + .social-buttons a em { + margin-right: 8px; + } + .social-buttons a.facebook { + color: #3b5998; + } + .social-buttons a.twitter { + color: #1da1f2; + } + .social-buttons a.linkedin { + color: #0077b5; + } +} diff --git a/src/CoreBundle/Controller/CourseController.php b/src/CoreBundle/Controller/CourseController.php index a83cc7ecb4..81d9d38e87 100644 --- a/src/CoreBundle/Controller/CourseController.php +++ b/src/CoreBundle/Controller/CourseController.php @@ -360,7 +360,8 @@ class CourseController extends ToolBaseController Course $course, IllustrationRepository $illustrationRepository, CCourseDescriptionRepository $courseDescriptionRepository, - EntityManagerInterface $em + EntityManagerInterface $em, + Request $request ): Response { $courseId = $course->getId(); @@ -497,6 +498,7 @@ class CourseController extends ToolBaseController 'url' => '', 'is_premium' => '', 'token' => '', + 'base_url' => $request->getSchemeAndHttpHost(), ]; $metaInfo = ''; diff --git a/src/CoreBundle/Controller/SessionController.php b/src/CoreBundle/Controller/SessionController.php index aaee6c2ada..383180f50c 100644 --- a/src/CoreBundle/Controller/SessionController.php +++ b/src/CoreBundle/Controller/SessionController.php @@ -241,13 +241,6 @@ class SessionController extends AbstractController $session->getId(), api_get_user_id() ), - /*'subscribe_button' => \CoursesAndSessionsCatalog::getRegisteredInSessionButton( - $session->getId(), - $session->getName(), - $hasRequirements, - true, - true - ),*/ 'user_session_time' => SessionManager::getDayLeftInSession( [ 'id' => $session->getId(), @@ -255,6 +248,7 @@ class SessionController extends AbstractController ], api_get_user_id() ), + 'base_url' => $request->getSchemeAndHttpHost(), ]; return $this->render('@ChamiloCore/Session/about.html.twig', $params); diff --git a/src/CoreBundle/Resources/views/Course/about.html.twig b/src/CoreBundle/Resources/views/Course/about.html.twig index 8753b3453e..82341174f2 100644 --- a/src/CoreBundle/Resources/views/Course/about.html.twig +++ b/src/CoreBundle/Resources/views/Course/about.html.twig @@ -1,181 +1,165 @@ {% extends "@ChamiloCore/Layout/layout_one_col.html.twig" %} {% block content %} -{% autoescape false %} -
-
-

{{ course.title }}

-
-
    -
  • {{ "Professors"|trans }}
    • - {% for teacher in teachers %} -
  • {{ teacher.complete_name }} |
    • - {% endfor %} -
+ {% autoescape false %} +
+
+

{{ course.title }}

+ {% if not 'course_about_teacher_name_hide'|api_get_configuration_value %} +
+
    +
  • {{ "Professors"|trans }}:
    • + {% for teacher in teachers %} +
  • {{ teacher.complete_name }}{% if not loop.last %} |{% endif %}
    • + {% endfor %} +
+
+ {% endif %}
-
- {% set course_video = '' %} - {% for extra_field in extra_fields %} - {% if extra_field.value.getField().getVariable() == 'video_url' %} - {% set course_video = extra_field.value.getValue() %} - {% endif %} - {% endfor %} + {% set course_video = '' %} + {% for extra_field in extra_fields %} + {% if extra_field.value.getField().getVariable() == 'video_url' %} + {% set course_video = extra_field.value.getValue() %} + {% endif %} + {% endfor %} -
-
+
-
+
{% if course_video %} -
-
+
+
{{ essence.replace(course_video) }}
{% else %} -
- +
+
{% endif %} {% if "display.hide_social_media_links" | api_get_setting == 'false' %} - -
+
{{ description }}
{% if tags %} -
    -
  • {{ 'Tags'|trans }} :
    • - {% for tag in tags %} -
  • - {{ tag.getTag }} -
    • - {% endfor %} -
+
+
    +
  • {{ 'Tags'|trans }}:
    • + {% for tag in tags %} +
  • {{ tag.getTag }}
    • + {% endfor %} +
+
{% endif %}
-
-
-
-
-
-
-

{{ "CourseInformation"|trans }}

+
+
+
+
+

{{ "Course Information"|trans }}

- +
-
-
-
-
- {% if is_premium == false %} -
{{ 'CourseSubscription'|trans }}
-
+
+
+ {% if not is_premium %} +
{{ 'Course subscription'|trans }}
+
{% if not is_granted('IS_AUTHENTICATED') %} {% if 'allow_registration'|api_get_setting != 'false' %} - - {{ 'SignUp'|trans }} + + {{ 'Sign Up'|trans }} {% endif %} {% elseif subscription %} - {{ 'CourseHomepage'|trans }} + {{ 'Course Homepage'|trans }} {% else %} - {{ 'Subscribe'|trans }} + {{ 'Subscribe'|trans }} {% endif %}
{% else %} -
-
- {{ 'SalePrice'|trans }} +
+
+ {{ 'Sale price'|trans }}
-
+
{{ is_premium.iso_code }} {{ is_premium.price }}
-
- {{ 'BuyNow'|trans }} +
+ {{ 'Buy Now'|trans }}
{% endif %}
-
-
-
-
-
{{ "Coaches"|trans }}
-
- {% for teacher in teachers %} -
-
-
- {{ teacher.complete_name }} + {% if teachers and not 'course_about_teacher_name_hide'|api_get_configuration_value %} +
+
+
{{ "Coaches"|trans }}
+
+ {% for teacher in teachers %} +
+
+
+ {{ teacher.complete_name }} +
+
+
{{ teacher.complete_name }}
+

{{ teacher.diploma }}

+
-
-
{{ teacher.complete_name }}
-

{{ teacher.diploma }}

+
+ {{ teacher.openarea }}
-
- {{ teacher.openarea }} -
-
- {% endfor %} - -
+ {% endfor %} +
+ {% endif %}
-
-
-
+
+
- -{% endautoescape %} + }); + + {% endautoescape %} {% endblock %}