From 7ede2e192f8771cb8043fba9e2f900735d23924e Mon Sep 17 00:00:00 2001
From: aragonc <aragcar@gmail.com>
Date: Fri, 7 Aug 2015 11:12:41 -0500
Subject: [PATCH] add session_default.png fix hot course and catalog session
 BT#7683

---
 app/Resources/public/css/base.css |   9 +++++++++
 main/img/session_default.png      | Bin 0 -> 3630 bytes
 main/inc/lib/api.lib.php          |   2 +-
 main/inc/lib/course.lib.php       |   2 +-
 main/inc/lib/userportal.lib.php   |   4 ++--
 5 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 main/img/session_default.png

diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index b97663488f..49bc9a9975 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -6159,6 +6159,15 @@ div#chat-remote-video video {
   font-size: 10px;
   color: #666666;
 }
+.hot-course-head{
+  padding-top: 10px;
+  padding-bottom: 10px;
+}
+.hot-course-head .hot-course-title{
+  padding-bottom: 10px;
+  border-bottom: 1px solid #E5E5E5;
+  font-size: 21px;
+}
 #whoisonline .items-user{
   text-align: center;
   /*border:1px solid #dddddd; */
diff --git a/main/img/session_default.png b/main/img/session_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..91326231d2a80f7ed8228f086d3ed4e3480b7453
GIT binary patch
literal 3630
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

literal 0
HcmV?d00001

diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 97e966a523..d4809269ea 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -1868,7 +1868,7 @@ function api_format_course_array($course_data)
     if (file_exists(api_get_path(SYS_COURSE_PATH).$course_data['directory'].'/course-pic.png')) {
         $url_image = api_get_path(WEB_COURSE_PATH).$course_data['directory'].'/course-pic.png';
     } else {
-        $url_image = Display::return_icon('course.png', null, null, ICON_SIZE_BIG, null, true);
+        $url_image = Display::return_icon('session_default.png',null,null,null,null,true);
     }
     $_course['course_image_large'] = $url_image;
 
diff --git a/main/inc/lib/course.lib.php b/main/inc/lib/course.lib.php
index ceda783856..62895ecd24 100755
--- a/main/inc/lib/course.lib.php
+++ b/main/inc/lib/course.lib.php
@@ -4464,7 +4464,7 @@ class CourseManager
             $courses = Database::store_result($result, 'ASSOC');
             $courses = self::process_hot_course_item($courses, $my_course_code_list);
         }
-
+        var_dump($courses);
         return $courses;
     }
 
diff --git a/main/inc/lib/userportal.lib.php b/main/inc/lib/userportal.lib.php
index 9ac9b2bd41..d1766f0d7e 100755
--- a/main/inc/lib/userportal.lib.php
+++ b/main/inc/lib/userportal.lib.php
@@ -763,10 +763,10 @@ class IndexManager
 
             if (api_get_setting('allow_social_tool') == 'true') {
                 $content .= '<a style="text-align:center" href="' . api_get_path(WEB_PATH) . 'main/social/home.php">
-                <img src="' . $userPicture . '" ></a>';
+                <img class="img-circle" src="' . $userPicture . '" ></a>';
             } else {
                 $content .= '<a style="text-align:center" href="' . api_get_path(WEB_PATH) . 'main/auth/profile.php">
-                <img title="' . get_lang('EditProfile') . '" src="' . $userPicture. '" ></a>';
+                <img class="img-circle" title="' . get_lang('EditProfile') . '" src="' . $userPicture. '" ></a>';
             }
 
             $html = self::show_right_block(