Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

app/Resources/public/css/themes/chamilo/default.css

@@ -56,7 +56,7 @@ a:focus {
   overflow: hidden !important;
 }
 .navbar-default {
-  background: #3C8DBC;
+  background: #1D5591;
   -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
   box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
 }
@@ -68,7 +68,7 @@ a:focus {
 .navbar-default .navbar-nav > .active > a:hover,
 .navbar-default .navbar-nav > .active > a:focus{
   color: #fff;
-  background-color:#367FA9;
+  background-color:#18477A;
 }
 .navbar-default .navbar-nav > li > a{
   color: #ffffff;
@@ -76,7 +76,7 @@ a:focus {
 .navbar-default .navbar-nav > .open > a,
 .navbar-default .navbar-nav > .open > a:hover,
 .navbar-default .navbar-nav > .open > a:focus{
-  background: #367FA9;
+  background: #18477A;
   color: #ffffff;
 }
 .navbar-nav > li > .dropdown-menu{
@@ -140,13 +140,8 @@ a:focus {
 }
 /* End Jquery UI */
 footer{
-  background-color:#2C3E50;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff54b4eb', endColorstr='#ff1d9ce5', GradientType=0);
-  border-bottom: 1px solid #2C3E50;
-  -webkit-filter: none;
-  filter: none;
-  -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
-  box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
+  background-color:#1A2226;
+  border-top: 2px solid #D2D6DE;
 }
 footer{
   color: #ffffff;

main/inc/lib/document.lib.php

@@ -6242,7 +6242,7 @@ class DocumentManager
      *
      * @return bool
      */
-    public function deleteDocumentsFromSession($courseInfo, $sessionId)
+    public static function deleteDocumentsFromSession($courseInfo, $sessionId)
     {
         if (empty($courseInfo)) {
             return false;

main/inc/lib/template.lib.php

@@ -273,7 +273,7 @@ class Template
         if (api_get_setting('enable_help_link') == 'true') {
             if (!empty($help)) {
                 $help = Security::remove_XSS($help);
-                $content = '<li class="help">';
+                $content = '<div class="help">';
                 $content .= Display::url(
                     Display::return_icon('help.large.png', get_lang('Help')),
                     api_get_path(WEB_CODE_PATH) . 'help/help.php?open=' . $help,
@@ -282,7 +282,7 @@ class Template
                         'data-title' => get_lang('Help')
                     ]
                 );
-                $content .= '</li>';
+                $content .= '</div>';
             }
         }
         $this->assign('help_content', $content);
@@ -923,12 +923,12 @@ class Template
         //Profile link
         if (api_get_setting('allow_social_tool') == 'true') {
             $profile_url  = api_get_path(WEB_CODE_PATH).'social/home.php';
-            $profile_link = Display::url(get_lang('Profile'), $profile_url);
+            
         } else {
             $profile_url  = api_get_path(WEB_CODE_PATH).'auth/profile.php';
-            $profile_link = Display::url(get_lang('Profile'), $profile_url);
+            
         }
-        $this->assign('profile_link', $profile_link);
+        
         $this->assign('profile_url', $profile_url);
 
         //Message link

main/template/default/layout/page_body.tpl

@@ -1,10 +1,13 @@
 {#  Actions  #}
 {% if actions != '' %}
+    <div class="actions">
+        {{ actions }}
+    </div>
+{% else %}
     <div class="actions-line">
         {{ actions }}
     </div>
 {% endif %}
-
 {{ flash_messages }}
 <span id="js_alerts"></span>