Browse Source

Merge pull request #555 from aragonc/bootstrap

Bootstrap 3 Update - Part 2 CT#7539
Julio 10 years ago
parent
commit
ff4cabedf3

+ 4 - 3
main/course_description/listing.php

@@ -53,7 +53,8 @@ $user_info = api_get_user_info();
 if (isset($descriptions) && count($descriptions) > 0) {
 	foreach ($descriptions as $id => $description) {
         if (!empty($description)) {
-            echo '<div class="sectiontitle">';
+            echo '<div class="panel panel-info">';
+            echo '<div class="panel-heading">';
 
             if (api_is_allowed_to_edit(null,true) && !$history) {
                 if (api_get_session_id() == $description['session_id']) {
@@ -75,9 +76,9 @@ if (isset($descriptions) && count($descriptions) > 0) {
 
             echo $description['title'];
             echo '</div>';
-            echo '<div class="sectioncomment">';
+            echo '<div class="panel-body">';
             echo $description['content'];
-            echo '</div>';
+            echo '</div></div>';
         }
     }
 } else {

+ 5 - 5
main/course_home/activity.php

@@ -66,12 +66,12 @@ if ($enabled == 'true') {
 
 // Start of tools for CourseAdmins (teachers/tutors)
 if ($session_id == 0 && api_is_course_admin() && api_is_allowed_to_edit(null, true)) {
-    $content .=  '<div class="courseadminview" style="border:0px; margin-top: 0px;padding:0px;">
+    $content .=  '<div class="alert alert-success" style="border:0px; margin-top: 0px;padding:0px;">
 		<div class="normal-message" id="id_normal_message" style="display:none">';
     $content .=  '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
     $content .=  get_lang('PleaseStandBy');
     $content .=  '</div>
-		<div class="confirmation-message" id="id_confirmation_message" style="display:none"></div>
+		<div class="alert alert-success" id="id_confirmation_message" style="display:none"></div>
 	</div>';
 
     $content .= $pluginExtra;
@@ -190,9 +190,9 @@ if ($session_id == 0 && api_is_course_admin() && api_is_allowed_to_edit(null, tr
 function return_block($title, $content, $class = null)
 {
     $html = '<div class="row course-title-tools">
-                <div class="span12">
-                    <div class="page-header">
-                        <h3>'.$title.'</h3>
+                <div class="col-md-12">
+                    <div class="title-header-tools">
+                        <h4>'.$title.'</h4>
                     </div>
                 </div>
             </div>

+ 56 - 222
main/css/base.css

@@ -20,56 +20,64 @@ select {
     visibility: visible;
 }
 
-legend {
-    margin-bottom: 10px;
+/* NEW CSS BASE */
+.logo{
+  margin-bottom: 10px;
+  padding: 5px;
+  margin-top: 10px;
 }
-
-#header_right {
-    text-align: right;
-    float: right;
+.title-header-tools{
+  text-align: center;
 }
 
-#header_right #notifications {
-    padding:0;
+ul#navigation {
+  position: fixed;
+  margin: 0px;
+  padding: 0px;
+  top: 200px;
+  right: -10px;
+  list-style: none;
+  z-index:9999;
 }
 
-#header_right #notifications li {
-    text-align: right;
+ul#navigation li {
+  width: 73px;
 }
 
-header #logo {
-    padding: 0px 0px 15px 0px;
+ul#navigation li a {
+  display: block;
+  margin-left: 1px;
+  width: 65px;
+  opacity: 0.6;
+  filter:progid:DXImageTransform.Microsoft.Alpha(opacity=60);
+  -webkit-box-shadow: 0px 4px 3px #000;
 }
-header #logo img{
-    margin-left: 30px;
+
+ul#navigation .help a {
+  background-color:#879DAA;
+  border:1px solid #FFFFFF;
+  display:block;
+  margin-left:50px;
+  opacity:0.6;
+  width:65px;
+  padding: 6px 0 8px 6px;
+}
+ul#navigation .report a {
+  background-color:#8fd400;
+  border:1px solid #FFFFFF;
+  display:block;
+  margin-left:50px;
+  opacity:0.6;
+  width:65px;
+  padding: 6px 0 8px 6px;
 }
 
-/* button load ajax form */
+/* END CSS BASE */
 
 .button-load{
   background: url("../img/icons/64/file_upload.png") no-repeat center 20px;
   padding-top: 70px;
-  /*-webkit-animation:glide 2250ms infinite;
-  animation:glide 2250ms infinite;*/
-}
-/*@-webkit-keyframes glide {
-  from {
-    background-position: center 0;
-  } to {
-      background-position: center 20px;
-
-    }
-
-}
-
-@keyframes glide {
-  from {
-    background-position:center 0;
-  } to {
-      background-position:center 20px;
-
-    }
-}*/
+  }
 /* START COURSE PROGRESS */
 .thematic-postit{
   padding-top: 5px;
@@ -225,147 +233,8 @@ header #logo img{
 .session-group .items-session li{
     padding-bottom: 5px;
 }
-.well .nav.nav-list > li{
-    padding-top: 8px;
-    padding-bottom: 8px;
-}
-.well .nav-list > li > a {
-  font-size: 13px;
-  padding-bottom: 0;
-  padding-top: 0;
-}
-.well .form-search .input-append .search-session{
-    width: 130px;
-}
 /* SESSION CATALOG END*/
 
-.subnav .brand {
-    display:none;
-}
-
-.subnav .navbar-inner {
-    box-shadow : none;
-}
-
-.subnav .dropdown-menu li a {
-    color:#333;
-}
-
-.subnav li a {
-    margin:0px;
-}
-
-.subnav {
-    font-size: 11px;
-    font-weight: bold;
-}
-
-.subnav .btn-navbar {
-    background: #efefef;
-}
-
-.subnav .btn-navbar .icon-bar {
-    background-color: #888;
-}
-
-.subnav-fixed {
-    position: fixed;
-    top: 0px;
-    left: 0;
-    right: 0;
-    z-index: 1030;
-    border-color: #d5d5d5;
-    border-width: 0 0 1px; /* drop the border on the fixed edges */
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-    /*-webkit-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-        -moz-box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-            box-shadow: inset 0 1px 0 #fff, 0 1px 5px rgba(0,0,0,.1);
-    */
-}
-
-.subnav {
-    margin-bottom: 0px;
-}
-
-/* Subnav */
-.subnav .navbar-inner {
-    -webkit-border-radius: 4px;
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-
-    /* default subnav color */
-    background-color: #eeeeee; /* Old browsers */
-    background-repeat: repeat-x; /* Repeat the gradient */
-    background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
-    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
-    background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */
-    background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */
-    background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
-    background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */
-    border: 1px solid #e5e5e5;
-    margin-bottom: 0px;
-    padding-left:4px;
-    padding-right:4px;
-
-    /* end default subnav background colors */
-}
-
-/* fixing gray border next the logout button */
-.subnav .nav-tabs .open .dropdown-toggle, .subnav .nav-pills .open .dropdown-toggle, .nav > .open.active > a:hover {
-    border-color: transparent;
-}
-
-.subnav .nav > li > a {
-    margin: 0;
-    border-left: 1px solid #f5f5f5;
-    border-right: 1px solid #e5e5e5;
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-}
-.subnav .nav > #current > a,
-.subnav .nav > #current > a:hover {
-    padding-left: 13px;
-    color: #777;
-    background-color: #e9e9e9;
-    border-right-color: #ddd;
-    border-left: 0;
-    -webkit-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
-    -moz-box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
-    box-shadow: inset 0 3px 5px rgba(0,0,0,.05);
-}
-.subnav .nav > #current > a .caret,
-.subnav .nav > #current > a:hover .caret {
-    border-top-color: #777;
-}
-
-.subnav .nav > li:last-child > a {
-    border-right: 0;
-}
-.subnav .dropdown-menu {
-    -webkit-border-radius: 0 0 4px 4px;
-    -moz-border-radius: 0 0 4px 4px;
-    border-radius: 0 0 4px 4px;
-}
-.subnav .nav > li:first-child > a,
-.subnav .nav > li:first-child > a:hover {
-    -webkit-border-radius: 0;
-    -moz-border-radius: 0;
-    border-radius: 0;
-}
-
-.subnav .nav > li > a:hover {
-    text-decoration: none;
-    color: #aaa;
-}
-
-.subnav .nav > li a {
-    text-shadow : none;
-}
-
 #main .nav .dropdown {
   width:150px;
   text-align: right;
@@ -374,31 +243,8 @@ header #logo img{
 #main .nav .dropdown:nth-child(n) {
   width:auto;
 }
-
-header {
-    margin-bottom: 11px;
-    margin-top: 20px;
-}
-
-.breadcrumb {
-    margin-bottom: 0px;
-}
-
-.breadcrumb a, .breadcrumb li {
-    text-shadow:none;
-}
-.breadcrumb a.btn-mini{
-  line-height: 22px;
-  text-transform: none;
-  margin-top: -5px;
-}
-.breadcrumb li img {
-  width: 0%;
- }
-
-.breadcrumb li img:nth-child(n) {
-  width: auto;
-  margin-top: -4px;
+.course-items .title{
+  margin-top: 0px;
 }
 
 /* To fix the increase/decrease buttons */
@@ -607,18 +453,18 @@ footer {
 }
 
 .actions {
-    background:#efefef;
-    border:1px solid #ccc;
-    margin-bottom: 11px;
-    height:32px;
-    padding: 2px 2px 2px 14px;
-    vertical-align:middle;
+    background:#ffffff;
+    border:1px solid #dddddd;
+    padding: 15px;
+    border-radius: 4px;
+    -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
+    box-shadow: 0 1px 1px rgba(0,0,0,0.05);
 }
 [dir=rtl] .actions {
     background:#efefef;
     border:1px solid #ccc;
     margin-bottom: 11px;
-    height:32px;
     padding: 2px 2px 2px 14px;
     vertical-align:middle;
     float: right;
@@ -642,12 +488,6 @@ footer {
     margin-bottom: 0px;
 }
 
-.actions a img {
-    padding:0px;
-    margin:0px;
-    float:left;
-}
-
 .actions fieldset {
     margin-top:0px;
 }
@@ -657,17 +497,10 @@ footer {
     color: #999999 !important;
 }
 
-.actions img {
-    padding-right:10px;
-    border: none;
-    text-decoration: none;
-    vertical-align:middle;
-}
+
 .actions a {
-    display: block;
-    float: left;
+    display: inline-block;
     margin-right: 10px;
-    vertical-align:middle;
 }
 
 .actions .btn-toolbar {
@@ -675,6 +508,7 @@ footer {
 }
 
 .actions span {
+    display: inline-block;
     margin-right: 10px;
     vertical-align:middle;
 }

File diff suppressed because it is too large
+ 171 - 172
main/css/chamilo/default.css


BIN
main/img/icons/22/catalog-course.png


BIN
main/img/icons/22/edit-profile.png


BIN
main/img/icons/22/history-course.png


BIN
main/img/icons/22/inbox.png


BIN
main/img/icons/22/invitations.png


BIN
main/img/icons/22/new-course.png


BIN
main/img/icons/22/new-message.png


BIN
main/img/icons/22/order-course.png


BIN
main/img/icons/32/inbox.png


+ 15 - 16
main/inc/introductionSection.inc.php

@@ -222,28 +222,26 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
 
         $thematic_description_html =
             '<div class="thematic-postit">
-                <div class="row-fluid"><div class="span12">
+                <div class="row"><div class="col-md-12">
                     <div class="accordion" id="progress-bar-course">
                         <div class="accordion-group">
                             <div class="accordion-heading">
                                 <div class="title-accordion">
-                                    <div class="row-fluid score-thematic">
-                                        <div class="span8">';
-        $thematic_description_html .=
-            '<div class="span6 name-student">
+                                    <div class="row score-thematic">
+                                        <div class="col-md-12">';
+        $thematic_description_html .=      '<div class="col-md-3 name-student">
                                                 <h2>' . $userInfo['firstName'] . '</h2>
                                                 <h3>' . $userInfo['lastName'] . '</h3>
                                             </div>
-                                            <div class="span2 score">
+                                            <div class="col-md-3 score">
                                                 <h1>' . $thematicScore . '</h1>
                                             </div>
-                                            <div class="span4">
+                                            <div class="col-md-3">
                                                 <h3>' . $thematic_advance . '</h3>
                                                 <p>' . $courseInfo['name'] . '</p>
                                             </div>
-                                        </div>';
-        $thematic_description_html .=
-            '<div class="span4">
+                                        ';
+        $thematic_description_html .=   '<div class="col-md-3">
                                             <a id="thematic-show" class="btn btn-small btn-primary accordion-toggle btn-hide-thematic" href="#pross" data-toggle="collapse" data-parent="#progress-bar-course">
                                             ' . get_lang('SeeDetail') . '
                                             </a>
@@ -251,21 +249,22 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
                                             ' . get_lang('Hide') . '
                                             </a>
                                         </div>
+                                        </div>
                                     </div>
                                 </div>
                             </div>';
         $thematic_description_html .=
             '<div class="accordion-body collapse in" id="pross" style="height: auto !important;">
                                 <div class="accordion-inner">
-                                    <div class="row-fluid">
-                                        <div class="span4">
-                                            <div class="row-fluid">
-                                                <div class="span4">
+                                    <div class="row">
+                                        <div class="col-md-12">
+                                            <div class="row">
+                                                <div class="col-md-4">
                                                     <div class="thumbnail">
                                                         <img src="' . $userInfo['avatar'] . '" class="img-polaroid">
                                                     </div>
                                                 </div>
-                                                <div class="span8">
+                                                <div class="col-md-8">
                                                     <div class="info-progress">
                                                         <div class="tittle-score">' . $thematic_advance . '&nbsp;' . $thematicScore .'
                                                         </div>
@@ -317,7 +316,7 @@ if ($tool == TOOL_COURSE_HOMEPAGE && !isset($_GET['intro_cmdEdit'])) {
     }
 }
 
-$introduction_section .= '<div class="row course-tools-intro"><div class="span12">';
+$introduction_section .= '<div class="row"><div class="col-md-12">';
 $introduction_section .=  $thematic_description_html;
 $introduction_section .=  '</div>';
 

+ 3 - 3
main/inc/lib/api.lib.php

@@ -2916,15 +2916,15 @@ function api_display_tool_view_option() {
             // We have to remove the isStudentView=true from the $sourceurl
             $sourceurl = str_replace('&isStudentView=true', '', $sourceurl);
             $sourceurl = str_replace('&isStudentView=false', '', $sourceurl);
-            $output_string .= '<a class="btn btn-mini btn-success" href="'.$sourceurl.'&isStudentView=false" target="_self">'.get_lang('CourseManagerview').'</a>';
+            $output_string .= '<a class="btn btn-success btn-xs" href="'.$sourceurl.'&isStudentView=false" target="_self">'.get_lang('CourseManagerview').'</a>';
         } elseif ($_SESSION['studentview'] == 'teacherview') {
             // Switching to teacherview
             $sourceurl = str_replace('&isStudentView=true', '', $sourceurl);
             $sourceurl = str_replace('&isStudentView=false', '', $sourceurl);
-            $output_string .= '<a class="btn btn-mini" href="'.$sourceurl.'&isStudentView=true" target="_self">'.get_lang('StudentView').'</a>';
+            $output_string .= '<a class="btn btn-primary btn-xs" href="'.$sourceurl.'&isStudentView=true" target="_self">'.get_lang('StudentView').'</a>';
         }
     } else {
-        $output_string .= '<a class="btn btn-mini" href="'.$sourceurl.'&isStudentView=true" target="_self">'.get_lang('StudentView').'</a>';
+        $output_string .= '<a class="btn btn-primary btn-xs" href="'.$sourceurl.'&isStudentView=true" target="_self">'.get_lang('StudentView').'</a>';
     }
     return $output_string;
 }

+ 3 - 1
main/inc/lib/banner.lib.php

@@ -666,8 +666,9 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
         }
 
         // View as student/teacher link
+        $view = null;
         if (!empty($view_as_student_link)) {
-            $lis.= Display::tag('span', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right'));
+            $view .= Display::tag('div', $view_as_student_link, array('id' => 'view_as_link','class' => 'pull-right'));
         }
 
         if (!empty($navigation_right)) {
@@ -678,6 +679,7 @@ function return_breadcrumb($interbreadcrumb, $language_file, $nameTools)
         }
 
         if (!empty($lis)) {
+            $html .= $view;
             $html .= Display::tag('ul', $lis, array('class'=>'breadcrumb'));
         }
     }

+ 10 - 10
main/inc/lib/course.lib.php

@@ -3485,15 +3485,15 @@ class CourseManager
     public static function course_item_html($params, $is_sub_content = false)
     {
         $html = '';
-        $class = "well course-box";
+        $class = "panel panel-default";
         if ($is_sub_content) {
             $class = "course_item";
         }
         $html .= '<div class="' . $class . '">';
-        $html .= '<div class="row">';
-        $html .= '<div class="col-md-7">';
+        $html .= '<div class="panel-body">';
+        $html .= '<div class="course-items">';
         $html .= ' <div class="row">';
-        $html .= '<div class="col-md-2 course-box-thumbnail-box">';
+        $html .= '<div class="col-md-2">';
         if (!empty($params['link'])) {
             $html .= '<a class="thumbnail" href="' . $params['link'] . '">';
             $html .= $params['icon'];
@@ -3508,14 +3508,14 @@ class CourseManager
         $notifications = isset($params['notifications']) ? $params['notifications'] : null;
         $param_class = isset($params['class']) ? $params['class'] : null;
 
-        $html .= '<div class="col-md-6 ' . $param_class . '">';
-        $html .= '<h3>' . $params['title'] . $notifications . '</h3> ';
+        $html .= '<div class="col-md-10 ' . $param_class . '">';
+        $html .= '<h3 class="title">' . $params['title'] . $notifications . '</h3> ';
 
         if (isset($params['show_description'], $params['description']) && $params['show_description'] == 1) {
-            $html .= '<p>' . $params['description'] . '</p>';
+            $html .= '<p class="description-session">' . $params['description'] . '</p>';
         }
         if (!empty($params['subtitle'])) {
-            $html .= '<small>' . $params['subtitle'] . '</small>';
+            $html .= '<div class="subtitle-session">' . $params['subtitle'] . '</div>';
         }
         if (!empty($params['teachers'])) {
             $html .= '<h5>' . Display::return_icon('teacher.png', get_lang('Teacher'), array(),
@@ -3531,7 +3531,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">' . $params['right_actions'] . '</div>';
         $html .= '</div>';
         $html .= '</div>';
         return $html;
@@ -3545,7 +3545,7 @@ class CourseManager
      */
     public static function course_item_parent($main_content, $sub_content, $sub_sub_content = null)
     {
-        return '<div class="well">' . $main_content . $sub_content . $sub_sub_content . '</div>';
+        return '<div class="panel panel-default">' . $main_content . $sub_content . $sub_sub_content . '</div>';
     }
 
     /**

+ 1 - 1
main/inc/lib/course_home.lib.php

@@ -869,7 +869,7 @@ class CourseHome
                 switch ($theme) {
                     case 'activity_big':
                         $data = '';
-                        $html .= '<div class="col-md-4 course-tool">';
+                        $html .= '<div class="col-xs-6 col-md-3 course-tool">';
                         $image = (substr($item['tool']['image'], 0, strpos($item['tool']['image'], '.'))).'.png';
                         $toolId = isset($item['tool']['id']) ? $item['tool']['id'] : null;
                         if (isset($item['tool']['custom_image'])) {

+ 4 - 4
main/inc/lib/display.lib.php

@@ -502,19 +502,19 @@ class Display
         $class = "";
         switch($type) {
             case 'warning':
-               $class .= 'warning-message';
+               $class .= 'alert alert-warning';
                break;
             case 'error':
-               $class .= 'error-message';
+               $class .= 'alert alert-danger';
                break;
             case 'confirmation':
             case 'confirm':
             case 'success':
-                $class .= 'confirmation-message';
+                $class .= 'alert alert-success';
                break;
             case 'normal':
             default:
-                $class .= 'normal-message';
+                $class .= 'alert alert-info';
         }
         return self::div($message, array('class'=> $class));
     }

+ 2 - 3
main/inc/lib/template.lib.php

@@ -472,11 +472,10 @@ class Template
             $this->theme = $this->preview_theme;
         }
 
-        // Base CSS
-        $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'base.css');
-
         // Default CSS Bootstrap
         $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'bootstrap.css');
+        // Base CSS
+        $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'base.css');
 
         //Extra CSS files
         $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/thickbox.css';

+ 11 - 8
main/inc/lib/userportal.lib.php

@@ -878,12 +878,12 @@ class IndexManager
             if (api_get_setting('allow_social_tool') == 'true') {
                 $link = '?f=social';
             }
-            $profile_content .= '<li class="inbox-social"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php'.$link.'">'.get_lang('Inbox').$cant_msg.' </a></li>';
-            $profile_content .= '<li class="new-message-social"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php'.$link.'">'.get_lang('Compose').' </a></li>';
+            $profile_content .= '<li class="inbox-message-social"><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php'.$link.'">'.Display::return_icon('inbox.png',get_lang('Inbox'),null,ICON_SIZE_SMALL).get_lang('Inbox').$cant_msg.' </a></li>';
+            $profile_content .= '<li class="new-message-social"><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php'.$link.'">'.Display::return_icon('new-message.png',get_lang('Compose'),null,ICON_SIZE_SMALL).get_lang('Compose').' </a></li>';
 
             if (api_get_setting('allow_social_tool') == 'true') {
                 $total_invitations = Display::badge($total_invitations);
-                $profile_content .= '<li class="invitations-social"><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.get_lang('PendingInvitations').$total_invitations.'</a></li>';
+                $profile_content .= '<li class="invitations-social"><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('invitations.png',get_lang('PendingInvitations'),null,ICON_SIZE_SMALL).get_lang('PendingInvitations').$total_invitations.'</a></li>';
             }
 
             if (isset($_configuration['allow_my_files_link_in_homepage']) && $_configuration['allow_my_files_link_in_homepage']) {
@@ -909,7 +909,7 @@ class IndexManager
             $editProfileUrl = $objSSO->generateProfileEditingURL();
         }
 
-        $profile_content .= '<li class="profile-social"><a href="' . $editProfileUrl . '">'.get_lang('EditProfile').'</a></li>';
+        $profile_content .= '<li class="profile-social"><a href="' . $editProfileUrl . '">'.Display::return_icon('edit-profile.png',get_lang('EditProfile'),null,ICON_SIZE_SMALL).get_lang('EditProfile').'</a></li>';
         $profile_content .= '</ul>';
         $html = self::show_right_block(get_lang('Profile'), $profile_content, 'profile_block');
         return $html;
@@ -970,8 +970,10 @@ class IndexManager
         if ($show_create_link) {
             $my_account_content .= '<li class="add-course"><a href="main/create_course/add_course.php">';
             if (api_get_setting('course_validation') == 'true' && !api_is_platform_admin()) {
+                $my_account_content .= Display::return_icon('new-course.png',get_lang('CourseCreateRequest'),null,ICON_SIZE_SMALL);
                 $my_account_content .= get_lang('CreateCourseRequest');
             } else {
+                $my_account_content .= Display::return_icon('new-course.png',get_lang('CourseCreate'),null,ICON_SIZE_SMALL);
                 $my_account_content .= get_lang('CourseCreate');
             }
             $my_account_content .= '</a></li>';
@@ -979,20 +981,21 @@ class IndexManager
 
         //Sort courses
         $url = api_get_path(WEB_CODE_PATH).'auth/courses.php?action=sortmycourses';
-        $my_account_content .= '<li class="order-course">'.Display::url(get_lang('SortMyCourses'), $url, array('class' => 'sort course')).'</li>';
+        $img_order= Display::return_icon('order-course.png',get_lang('SortMyCourses'),null,ICON_SIZE_SMALL);
+        $my_account_content .= '<li class="order-course">'.Display::url($img_order.get_lang('SortMyCourses'), $url, array('class' => 'sort course')).'</li>';
 
         // Session history
         if (isset($_GET['history']) && intval($_GET['history']) == 1) {
-            $my_account_content .= '<li class="history-course"><a href="user_portal.php">'.get_lang('DisplayTrainingList').'</a></li>';
+            $my_account_content .= '<li class="history-course"><a href="user_portal.php">'.Display::return_icon('history-course.png',get_lang('DisplayTrainingList'),null,ICON_SIZE_SMALL).get_lang('DisplayTrainingList').'</a></li>';
         } else {
-            $my_account_content .= '<li class="history-course"><a href="user_portal.php?history=1" >'.get_lang('HistoryTrainingSessions').'</a></li>';
+            $my_account_content .= '<li class="history-course"><a href="user_portal.php?history=1" >'.Display::return_icon('history-course.png',get_lang('HistoryTrainingSessions'),null,ICON_SIZE_SMALL).get_lang('HistoryTrainingSessions').'</a></li>';
         }
 
         // Course catalog
 
         if ($show_course_link) {
             if (!api_is_drh()) {
-                $my_account_content .= '<li class="list-course"><a href="main/auth/courses.php" >'.get_lang('CourseCatalog').'</a></li>';
+                $my_account_content .= '<li class="list-course"><a href="main/auth/courses.php" >'.Display::return_icon('catalog-course.png',get_lang('CourseCatalog'),null,ICON_SIZE_SMALL).get_lang('CourseCatalog').'</a></li>';
             } else {
                 $my_account_content .= '<li><a href="main/dashboard/index.php">'.get_lang('Dashboard').'</a></li>';
             }

+ 1 - 1
main/template/default/agenda/month.tpl

@@ -79,7 +79,7 @@ $(document).ready(function() {
     });
 
     $.datepicker.setDefaults( $.datepicker.regional[region_value] );
-    
+
 	var calendar = $('#calendar').fullCalendar({
 		header: {
 			left: 'today prev,next',

+ 3 - 1
main/template/default/layout/main_header.tpl

@@ -58,7 +58,9 @@
                     {% endif %}
                     <div class="row">
                         <div class="col-lg-3">
-                            {{ logo }}
+                            <div class="logo">
+                                {{ logo }}
+                            </div>
                         </div>
                         <div class="col-lg-9">
                             <div class="col-4">

Some files were not shown because too many files changed in this diff