add welcome course - refs #2681

.htaccess

@@ -41,8 +41,8 @@ RewriteRule ^courses/([^/]+)/upload/([^/]+)/(.*)$ main/document/download_uploade
 # Rewrite everything in the work folder
 RewriteRule ^courses/([^/]+)/work/(.*)$ main/work/download.php?file=work/$2&cDir=$1 [QSA,L]
 
-RewriteRule ^courses/([^/]+)/course-pic85x85.png$ main/inc/ajax/course.ajax.php?a=get_course_image&code=$1&image=course_image_source [QSA,L]
-RewriteRule ^courses/([^/]+)/course-pic.png$ main/inc/ajax/course.ajax.php?a=get_course_image&code=$1&image=course_image_large_source [QSA,L]
+RewriteRule ^courses/([^/]+)/course-pic85x85.png$ var/courses/$1/course-pic85x85.png [QSA,L]
+RewriteRule ^courses/([^/]+)/course-pic.png$ var/courses/$1/course-pic.png [QSA,L]
 
 # Redirect all courses/ to app/courses/
 RewriteRule ^courses/([^/]+)/(.*)$ app/courses/$1/$2 [QSA,L]

src/ThemeBundle/Resources/views/Index/userportal.html.twig

@@ -3,7 +3,11 @@
 {% block page_content %}
     {% autoescape false %}
 
-       <nav>
+        {% if show_welcome_course %}
+            {% include '@ChamiloTheme/Layout/welcome_to_course.html.twig' %}
+        {% endif %}
+
+        <nav>
             <div class="nav nav-tabs" id="nav-tab" role="tablist">
                 <a class="nav-item nav-link active" id="nav-courses-tab" data-toggle="tab" href="#nav-courses" role="tab" aria-controls="nav-courses" aria-selected="true">
                     {{ "My Courses"|trans }}
@@ -23,9 +27,7 @@
         </div>
 
 
-        {#{% if show_welcome_course %}
-            {% include '@ChamiloTheme/Layout/welcome_to_course.html.twig' %}
-        {% endif %}#}
+
 
     {% endautoescape %}
 {% endblock %}

src/ThemeBundle/Resources/views/Layout/welcome_to_course.html.twig

@@ -1,13 +1,12 @@
 {% autoescape false %}
     {{ "HelloXAsYouCanSeeYourCourseListIsEmpty" | trans | format(app.user.completeName) }}
 
-    {% if count_courses == 0 %}
+    {#{% if count_courses == 0 %}
         {{ "PleaseAllowUsALittleTimeToSubscribeYouToOneOfOurCourses"|trans }}
     {% else %}
 
-        {% if chamilo_settings_get("display.allow_students_to_browse_courses")  == 'true' %}
-            {{
-            "GoAheadAndBrowseOurCourseCatalogXOnceRegisteredYouWillSeeTheCourseHereX" | trans |
+        {% if chamilo_settings_get("display.allow_students_to_browse_courses")  === 'true' %}
+            {{            "GoAheadAndBrowseOurCourseCatalogXOnceRegisteredYouWillSeeTheCourseHereX" | trans |
             format(
                 '<a href="' ~ url('main', {'name': 'auth/courses.php'}) ~ '"/> '~ "here" | trans ~'</a>',
                 '<a href="' ~ url('userportal') ~ '"/> '~ "here" | trans ~'</a>'
@@ -19,5 +18,5 @@
         {% else %}
             {{ "PleaseAllowUsALittleTimeToSubscribeYouToOneOfOurCourses"|trans }}
         {% endif %}
-    {% endif %}
+    {% endif %}#}
 {% endautoescape %}

user_portal.php

@@ -237,15 +237,15 @@ if (api_get_setting('go_to_course_after_login') === 'true') {
     }
 }
 
-/*$showWelcomeCourse = false;
+$showWelcomeCourse = false;
 // Show the chamilo mascot
-if (empty($courseAndSessions['html']) && !isset($_GET['history'])) {
+if (empty($courseAndSessions['html_courses']) && !isset($_GET['history'])) {
     $controller->setWelComeCourse();
     $showWelcomeCourse = true;
 }
 
 
-$controller->tpl->assign('show_welcome_course', $showWelcomeCourse);*/
+$controller->tpl->assign('show_welcome_course', $showWelcomeCourse);
 $controller->tpl->assign('html_sessions', $courseAndSessions['html_sessions']);
 $controller->tpl->assign('html_courses', $courseAndSessions['html_courses']);