Merge pull request #628 from aragonc/bootstrap

Bootstrap fix display items category sessions

main/css/base.css

@@ -5455,6 +5455,8 @@ i.size-32.icon-new-work{
   margin-right: 5px;
 }
 .sessions .subtitle-session{
+  font-size: 12px;
+  font-style: italic;
 }
 /**
  * Modal for user avatar preview

main/css/chamilo/default.css

@@ -5,7 +5,31 @@
  * Licensed GLP
  * Based on Bootstrap
 */
-@import url(http://fonts.googleapis.com/css?family=Open+Sans:400,600,300,700);
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 300;
+  src: local('Open Sans Light'), local('OpenSans-Light'), url(fonts/OpenSans-Light.woff2) format('woff2'), url(fonts/OpenSans-Light.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Open Sans'), local('OpenSans'), url(fonts/OpenSans.woff2) format('woff2'), url(fonts/OpenSans.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 600;
+  src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(fonts/OpenSans-Semibold.woff2) format('woff2'), url(fonts/OpenSans-Semibold.woff) format('woff');
+}
+@font-face {
+  font-family: 'Open Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('Open Sans Bold'), local('OpenSans-Bold'), url(fonts/OpenSans-Bold.woff2) format('woff2'), url(fonts/OpenSans-Bold.woff) format('woff');
+}
+
 
 html {
   -ms-text-size-adjust: 100%;

main/inc/lib/course.lib.php

@@ -3380,7 +3380,7 @@ class CourseManager
 
         $html .= '</div>';
         $params['right_actions'] = isset($params['right_actions']) ? $params['right_actions'] : null;
-        $html .= '<div class="span1 pull-right course-box-actions">' . $params['right_actions'] . '</div>';
+        $html .= '<div class="pull-right course-box-actions">' . $params['right_actions'] . '</div>';
         $html .= '</div>';
         $html .= '</div>';
         return $html;
@@ -3389,10 +3389,21 @@ class CourseManager
     public static function session_items_html($params, $is_sub_content = false)
     {
         $html = '';
-        $html.= '<li>';
+        $html.= '<div class="row">';
-        $notifications = isset($params['notifications']) ? $params['notifications'] : null;
+        $html.= '<div class="col-md-2">';
-        $html.= $params['title']. $notifications;
+        if (!empty($params['link'])){
-        $html.='</li>';
+            $html.= '<a class="thumbnail" href="'.$params['link'].'">';
+            $html.= $params['icon'];
+            $html.= '</a>';
+        }else{
+            $html.= $params['icon'];
+        }
+        $html.= '</div>';
+        $html.= '<div class="col-md-10">';
+        $html.= $params['title'];
+        $html .= $params['coaches'];
+        $html.='</div>';
+        $html.='</div>';
 
         return $html;
     }
@@ -3400,29 +3411,28 @@ class CourseManager
     public static function session_list_html($params,$items_session, $is_sub_content = false)
     {
         $html = '';
+        $params['right_actions'] = isset($params['right_actions']) ? $params['right_actions'] : null;
         $class = "panel-body";
-        $html .= '<div class="sessions ' . $class . '">';
+        $html .= '<div class="panel-heading">';
-        $html .= '<div class="row">';
-        $html .= '<div class="col-sx-6 col-md-2">';
         if (!empty($params['link'])){
-            $html.= '<a class="thumbnail" href="'.$params['link'].'">';
+            $html.= '<a href="'.$params['link'].'">';
             $html.= $params['icon'];
             $html.= '</a>';
         }else{
             $html.= $params['icon'];
         }
-        $html .= '</div>';
+        $html .= $params['title'];
-        $notifications = isset($params['notifications']) ? $params['notifications'] : null;
-        $params['right_actions'] = isset($params['right_actions']) ? $params['right_actions'] : null;
-        $html .= '<div class="col-sx-6 col-md-10">';
         $html .= '<div class="pull-right">' . $params['right_actions'] . '</div>';
-        $html .= '<h4>'.$params['title'].$notifications.'</h4>';
+        $html .= '</div>';
+        $html .= '<div class="sessions ' . $class . '">';
+        $html .= '<div class="row">';
+        $html .= '<div class="col-md-12">';
+        if (!empty($params['subtitle'])) {
+            $html .= '<p class="subtitle-session"><i class="fa fa-clock-o"></i> ' . $params['subtitle'] . '</p>';
+        }
         if (isset($params['show_description'], $params['description']) && $params['show_description'] == 1) {
             $html .= '<p class="description-session">' . $params['description'] . '</p>';
         }
-        if (!empty($params['subtitle'])) {
-            $html .= '<p class="alert alert-info subtitle-session"><i class="fa fa-clock-o"></i> ' . $params['subtitle'] . '</p>';
-        }
         $html .= $items_session;
         $html .= '</div>';
         $html .= '</div>';
@@ -3499,6 +3509,12 @@ class CourseManager
         return '<div class="panel panel-default">' . $main_content . $sub_content . $sub_sub_content . '</div>';
     }
 
+
+    public static function session_item_parent($main_content, $sub_content, $sub_sub_content = null)
+    {
+        return '<div class="panel panel-default"><div class="panel-body">' . $main_content . $sub_content . $sub_sub_content . '</div></div>';
+    }
+
     /**
      * Display special courses (and only these) as several HTML divs of class userportal-course-item
      *
@@ -3988,9 +4004,13 @@ class CourseManager
             'blackboard_blue.png',
             api_htmlentities($course_info['name']),
             array(),
-            ICON_SIZE_MEDIUM
+            ICON_SIZE_LARGE
         );
-
+        // Display the "what's new" icons
+        $notifications = '';
+        if ($course_visibility != COURSE_VISIBILITY_CLOSED && $course_visibility != COURSE_VISIBILITY_HIDDEN) {
+            $notifications .= Display:: show_notification($course_info);
+        }
         if ($session_accessible) {
             if ($course_visibility != COURSE_VISIBILITY_CLOSED ||
                 $user_in_course_status == COURSEMANAGER
@@ -4009,13 +4029,13 @@ class CourseManager
 
                     if ($user_in_course_status == COURSEMANAGER || $sessionCourseAvailable) {
                         $session_url = api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/?id_session=' . $course_info['id_session'];
-                        $session_title = '<a href="' . api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/?id_session=' . $course_info['id_session'] . '">'. $params['icon'] .''. $course_info['name'] . '</a>';
+                        $session_title = '<h4><a href="' . api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/?id_session=' . $course_info['id_session'] . '">'. $course_info['name'] . '</a>'.$notifications.'</h4>';
                     } else {
                         $session_title = $course_info['name'];
                     }
                 } else {
                     $session_url = api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/';
-                    $session_title = '<a href="' . api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/">' . $course_info['name'] . '</a>';
+                    $session_title = '<h4><a href="' . api_get_path(WEB_COURSE_PATH) . $course_info['path'] . '/">' . $course_info['name'] . '</a>'.$notifications.'</h4>';
                 }
             } else {
                 $session_title = $course_info['name'] . ' ' . Display::tag('span', get_lang('CourseClosed'),
@@ -4059,6 +4079,7 @@ class CourseManager
         if (api_get_setting('display_teacher_in_courselist') == 'true') {
             $teacher_list = null;
             if (!$nosession) {
+
                 $teacher_list = CourseManager::get_teacher_list_from_course_code_to_string(
                     $course_info['code'],
                     self::USER_SEPARATOR,
@@ -4070,12 +4091,12 @@ class CourseManager
                     self::USER_SEPARATOR,
                     true
                 );
-
+                $icon_coachs = Display::return_icon('teacher.png','',null,ICON_SIZE_TINY);
                 if ($course_info['status'] == COURSEMANAGER || ($course_info['status'] == STUDENT && empty($course_info['id_session'])) || empty($course_info['status'])) {
                     $params['teachers'] = $teacher_list;
                 }
                 if (($course_info['status'] == STUDENT && !empty($course_info['id_session'])) || ($is_coach && $course_info['status'] != COURSEMANAGER)) {
-                    $params['coaches'] = $course_coachs;
+                    $params['coaches'] = $icon_coachs.$course_coachs;
                 }
             } else {
                 $params['teachers'] = $teacher_list;
@@ -4085,11 +4106,6 @@ class CourseManager
         $session_title .= isset($course['special_course']) ? ' ' . Display::return_icon('klipper.png',
                 get_lang('CourseAutoRegister')) : '';
 
-        // Display the "what's new" icons
-        if ($course_visibility != COURSE_VISIBILITY_CLOSED && $course_visibility != COURSE_VISIBILITY_HIDDEN) {
-            $session_title .= Display:: show_notification($course_info);
-        }
-
         $params['title'] = $session_title;
         $params['extra'] = '';
 

main/inc/lib/userportal.lib.php

@@ -1142,7 +1142,7 @@ class IndexManager
                                 'window_list.png',
                                 $session_box['title'],
                                 array('id' => 'session_img_' . $session_id),
-                                ICON_SIZE_BIG
+                                ICON_SIZE_MEDIUM
                             );
                             $extra_info = !empty($session_box['coach']) ? $session_box['coach'] : null;
                             $extra_info .= !empty($session_box['coach']) ? ' - '.$session_box['dates'] : $session_box['dates'];
@@ -1180,7 +1180,7 @@ class IndexManager
                             $params['description'] = $session_box['description'];
                             $params['show_description'] = $session_box['show_description'];
 
-                            $items_courses_session = '<ul class="sessions-items">'.$html_courses_session.'</ul>';
+                            $items_courses_session = '<div class="sessions-items">'.$html_courses_session.'</div>';
                             /* Icon session no category */
                             $parentInfo = CourseManager::session_list_html($params,$items_courses_session,true);
 
@@ -1269,7 +1269,7 @@ class IndexManager
                             }
 
                             $params = array();
-
+                            //Category
                             if ($count > 0) {
                                 $session_box = Display:: get_session_title_box(
                                     $session_id
@@ -1278,7 +1278,7 @@ class IndexManager
                                         'window_list.png',
                                         $session_box['title'],
                                         array('id' => 'session_img_' . $session_id),
-                                        ICON_SIZE_BIG
+                                        ICON_SIZE_MEDIUM
                                     );
 
                                 if (api_is_drh()) {
@@ -1299,19 +1299,21 @@ class IndexManager
                                 $params['subtitle'] = (!empty($session_box['coach']) ? $session_box['coach'] . ' | ' : '') . $session_box['dates'];
 
                                 if (api_is_platform_admin()) {
-                                    $params['right_actions'] = '<a href="' . api_get_path(WEB_CODE_PATH) . 'admin/resume_session.php?id_session=' . $session_id . '">' .
+                                    $params['right_actions'] = '<div class="pull-right"><a href="' . api_get_path(WEB_CODE_PATH) . 'admin/resume_session.php?id_session=' . $session_id . '">' .
                                         Display::return_icon(
                                             'edit.png',
                                             get_lang('Edit'),
                                             array('align' => 'absmiddle'),
                                             ICON_SIZE_SMALL
-                                        ) . '</a>';
+                                        ) . '</a></div>';
                                 }
                                 /* Icon Session in category */
-                                $parentInfo = CourseManager::course_item_html(
+                                $parentInfo = '<div class="panel panel-default">';
-                                    $params,
+                                $parentInfo .= '<div class="panel-heading">'.$params['title'].$params['right_actions'].'</div>';
-                                    true
+                                $parentInfo .= '<div class="panel-body">';
-                                );
+                                $parentInfo .= $html_courses_session;
+                                $parentInfo .= '</div>';
+                                $parentInfo .= '</div>';
 
                                 if (isset($_configuration['show_simple_session_info']) && $_configuration['show_simple_session_info']) {
                                     $params['title'] = $session_box['title'];
@@ -1320,7 +1322,7 @@ class IndexManager
                                     );
                                 }
 
-                                $html_sessions .= $parentInfo . $html_courses_session;
+                                $html_sessions .= $parentInfo;
 
                                 $sessionCount++;
                             }
@@ -1329,7 +1331,7 @@ class IndexManager
 
                     if ($count_courses_session > 0) {
                         $params = array();
-                        $params['icon'] = Display::return_icon('folder_blue.png', $session_category['session_category']['name'], array(), ICON_SIZE_LARGE);
+                        $params['icon'] = Display::return_icon('sessions_category.png', $session_category['session_category']['name'], array(), ICON_SIZE_LARGE);
 
                         if (api_is_platform_admin()) {
                             $params['right_actions'] = '<a href="'.api_get_path(WEB_CODE_PATH).'admin/session_category_edit.php?&id='.$session_category['session_category']['id'].'">'.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'</a>';
@@ -1354,7 +1356,7 @@ class IndexManager
                                 $params['subtitle'] = get_lang('Until').' '.$session_category_end_date;
                             }
                         }
-                         $sessions_with_category .= CourseManager::course_item_parent(
+                         $sessions_with_category .= CourseManager::session_item_parent(
                             CourseManager::course_item_html($params, true),
                             $html_sessions
                         );