Browse Source

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

Yannick Warnier 8 years ago
parent
commit
a90a92c6e1

+ 28 - 0
app/Resources/public/css/base.css

@@ -272,6 +272,16 @@ a.thumbnail:hover{
     color: #fff;
     padding-left: 9px;
 }
+.navbar-nav .open .dropdown-menu .user-header{
+    width: 260px;
+}
+.navbar-nav .open .dropdown-menu .user-header .text-center .name{
+    padding-bottom: 0;
+    margin-bottom: 0;
+}
+.navbar-nav .open .dropdown-menu .user-body a{
+    color: #666;
+}
 /* notifications help and bug */
 #touch-button.btn-touch{
   background-color: #C2C2C2;
@@ -5887,6 +5897,15 @@ a.sessionView {
   .question-result .page-header h2{
     font-size: 20px;
   }
+  .navbar-nav .open .dropdown-menu .user-header{
+    width: 100%;
+  }
+  .navbar-nav .open .dropdown-menu{
+    background-color: #FFF;
+  }
+  .navbar-nav{
+    margin: -2.5px -15px;
+  }
 }
 @media (min-width:320px) and (max-width: 479px){
     footer {
@@ -5907,6 +5926,15 @@ a.sessionView {
         margin-left: 5%;
         margin-right: 5%;
     }
+    .navbar-nav .open .dropdown-menu .user-header{
+        width: 100%;
+    }
+    .navbar-nav .open .dropdown-menu{
+        background-color: #FFF;
+    }
+    .navbar-nav{
+        margin: -2.5px -15px;
+    }
 }
 
 .elfinder-cwd-filename {

+ 0 - 27
app/Resources/public/css/themes/academica/default.css

@@ -74,17 +74,6 @@ header{
 .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
   color: #9DD0F1;
 }
-.navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #ff5b41;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
-  color: #ffffff;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
-  color: #ededed;
-  background-color: #374955;
-}
 .navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
   background-color: #0099c0;
 }
@@ -129,26 +118,10 @@ header{
 .navbar-default .navbar-link:hover {
   color: #ededed;
 }
-
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #ffffff;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #ededed;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #ededed;
-    background-color: #0099c0;
-  }
-}
 .breadcrumb{
   background: #ddecef;
   color: #006A84;
 }
-.nav li a:hover{
-    background: transparent;
-}
 .panel-default .panel-heading{
     background-color: #ddecef;
 }

+ 0 - 27
app/Resources/public/css/themes/baby_orange/default.css

@@ -72,17 +72,6 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', end
   color: #FFFFFF;
   background: #3A4751;
 }
-.navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #EA5520;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
-  color: #ffffff;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
-  color: #ededed;
-  background-color: #374955;
-}
 .navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
   background-color: #0099c0;
 }
@@ -127,26 +116,10 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e83b10', end
 .navbar-default .navbar-link:hover {
   color: #ededed;
 }
-
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #ffffff;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #ededed;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #ededed;
-    background-color: #0099c0;
-  }
-}
 .breadcrumb{
   background: #F9F9F9;
   color: #006A84;
 }
-.nav li a:hover{
-    background: transparent;
-}
 .panel-default .panel-heading{
     background-color: #F9F9F9;
 }

+ 0 - 23
app/Resources/public/css/themes/beach/default.css

@@ -111,29 +111,6 @@ a:focus {
   background: #00677C;
   color: #ffffff;
 }
-.navbar-nav > li > .dropdown-menu{
-  min-width: 100%;
-  margin-top: 2px;
-  border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-}
-.navbar-default .navbar-nav > .open > .dropdown-menu{
-  padding: 3px 4px;
-  background-color: #00677C;
-}
-.navbar-default .navbar-nav > .open > .dropdown-menu > li > a{
-  padding: 6px 9px;
-  border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  color: #ffffff !important;
-}
-.navbar-default .navbar-nav > .open > .dropdown-menu > li > a:hover,
-.navbar-default .navbar-nav > .open > .dropdown-menu > li > a:focus{
-
-  background-color:#00829C;
-}
 .nav > li > a:hover, .nav > li > a:focus{
    background-color: transparent;
 }

+ 0 - 24
app/Resources/public/css/themes/blue_lagoon/default.css

@@ -67,17 +67,6 @@ header{
 .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
   color: #9DD0F1;
 }
-.navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #0099c0;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
-  color: #ffffff;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
-  color: #ededed;
-  background-color: #2E75A3;
-}
 .navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
   background-color: #0099c0;
 }
@@ -108,19 +97,6 @@ header{
 .navbar-default .navbar-link:hover {
   color: #ededed;
 }
-
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #ffffff;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #ededed;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #ededed;
-    background-color: #0099c0;
-  }
-}
 .breadcrumb{
   background: #afdde9;
   color: #006A84;

+ 3 - 12
app/Resources/public/css/themes/chamilo/default.css

@@ -56,7 +56,7 @@ a:focus {
   overflow: hidden !important;
 }
 .navbar-default {
-  background: #2E75A3;
+  background: #3C8DBC;
   -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:#07578a;
+  background-color:#367FA9;
 }
 .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: #07578a;
+  background: #367FA9;
   color: #ffffff;
 }
 .navbar-nav > li > .dropdown-menu{
@@ -88,18 +88,9 @@ a:focus {
 }
 .navbar-default .navbar-nav > .open > .dropdown-menu{
   padding: 3px 4px;
-  background-color: #07578a;
 }
 .navbar-default .navbar-nav > .open > .dropdown-menu > li > a{
   padding: 6px 9px;
-  border-radius: 4px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  color: #ffffff !important;
-}
-.navbar-default .navbar-nav > .open > .dropdown-menu > li > a:hover,
-.navbar-default .navbar-nav > .open > .dropdown-menu > li > a:focus{
-  background-color:#2E75A3;
 }
 .nav > li > a:hover, .nav > li > a:focus{
    background-color: transparent;

+ 0 - 24
app/Resources/public/css/themes/chamilo_electric_blue/default.css

@@ -75,17 +75,6 @@ border-radius: 0px;
 .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
   color: #ededed;
 }
-.navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #0099c0;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
-  color: #ffffff;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
-  color: #ededed;
-  background-color: #006a84;
-}
 .navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
   background-color: #0099c0;
 }
@@ -116,19 +105,6 @@ border-radius: 0px;
 .navbar-default .navbar-link:hover {
   color: #ededed;
 }
-
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #ffffff;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #ededed;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #ededed;
-    background-color: #006a84;
-  }
-}
 .breadcrumb{
   background: #afdde9;
   color: #006A84;

+ 1 - 24
app/Resources/public/css/themes/chamilo_green/default.css

@@ -73,17 +73,7 @@ border-color: #8cbf00;
 .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
   color: #c9ed16;
 }
-.navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #68a814;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
-  color: #ffffff;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
-  color: #c9ed16;
-  background-color: #008000;
-}
+
 .navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
   background-color: #68a814;
 }
@@ -121,19 +111,6 @@ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#008000', end
 .navbar-default .navbar-link:hover {
   color: #c9ed16;
 }
-
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #ffffff;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #c9ed16;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #c9ed16;
-    background-color: #008000;
-  }
-}
 .panel-default .panel-heading{
     background-color: #E5E5E5;
 }

+ 0 - 29
app/Resources/public/css/themes/chamilo_orange/default.css

@@ -45,12 +45,6 @@ a{
 a:hover{
   color: #FF813A;
 }
-.navbar-default .navbar-nav li a{
-  color: #ffffff;
-}
-.navbar-default .navbar-nav li a:hover{
-  color: #ffd555;
-}
 .navbar-default .navbar-nav .active a,
 .navbar-default .navbar-nav .active a:focus,
 .navbar-default .navbar-nav .active > a:hover{
@@ -86,17 +80,6 @@ header{
 .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
   color: #f8e386;
 }
-.navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #f77d00;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
-  color: #ffffff;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
-  color: #f8e386;
-  background-color: #f15000;
-}
 .navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
   background-color: #f77d00;
 }
@@ -149,16 +132,4 @@ footer a{
 }
 footer a:hover{
   color: #FF813A;
-}
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #ffffff;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #f8e386;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #f8e386;
-    background-color: #f15000;
-  }
 }

+ 0 - 24
app/Resources/public/css/themes/chamilo_red/default.css

@@ -75,17 +75,6 @@ border-radius: 0;
 .navbar-default .navbar-nav > li > a:hover, .navbar-default .navbar-nav > li > a:focus {
   color: #ffdb00;
 }
-.navbar-default .navbar-nav > li > .dropdown-menu {
-  background-color: #db0000;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a {
-  color: #ecf0f1;
-}
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:hover,
-.navbar-default .navbar-nav > li > .dropdown-menu > li > a:focus {
-  color: #ffdb00;
-  background-color: #870000;
-}
 .navbar-default .navbar-nav > li > .dropdown-menu > li > .divider {
   background-color: #db0000;
 }
@@ -123,19 +112,6 @@ border-radius: 0;
 .navbar-default .navbar-link:hover {
   color: #ffdb00;
 }
-
-@media (max-width: 767px) {
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a {
-    color: #ecf0f1;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > li > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > li > a:focus {
-    color: #ffdb00;
-  }
-  .navbar-default .navbar-nav .open .dropdown-menu > .active > a, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:hover, .navbar-default .navbar-nav .open .dropdown-menu > .active > a:focus {
-    color: #ffdb00;
-    background-color: #870000;
-  }
-}
 .panel-default .panel-heading{
     background-color: #EDEDED;
 }

+ 2 - 1
main/course_info/tools.php

@@ -44,7 +44,7 @@ switch ($action) {
         }
 
         $interbreadcrumb[] = array('url' => api_get_self().'?'.api_get_cidreq(), 'name' => get_lang('CustomizeIcons'));
-        $toolName = $tool['name'];
+        $toolName = Security::remove_XSS(stripslashes($tool['name']));
 
         $currentUrl = api_get_self().'?action=edit_icon&id=' . $id.'&'.api_get_cidreq();
 
@@ -115,6 +115,7 @@ switch ($action) {
         $iconsTools .= Display::page_header(get_lang('CustomizeIcons'), null, 'h4');
         $iconsTools .= '<div class="row">';
         foreach ($toolList as $tool) {
+            $tool['name'] = Security::remove_XSS(stripslashes($tool['name']));
             $toolIconName = 'Tool' . api_underscore_to_camel_case($tool['name']);
             $toolIconName = isset($$toolIconName) ? get_lang($toolIconName) : $tool['name'];
 

+ 2 - 0
main/inc/lib/api.lib.php

@@ -1351,11 +1351,13 @@ function _api_format_user($user, $add_password = false)
     // Getting user avatar.
     $originalFile = UserManager::getUserPicture($user_id, USER_IMAGE_SIZE_ORIGINAL, $result);
     $smallFile = UserManager::getUserPicture($user_id, USER_IMAGE_SIZE_SMALL, $result);
+    $mediumFile = UserManager::getUserPicture($user_id, USER_IMAGE_SIZE_MEDIUM, $result);
 
     $result['avatar'] = $originalFile;
     $avatarString = explode('?', $originalFile);
     $result['avatar_no_query'] = reset($avatarString);
     $result['avatar_small'] = $smallFile;
+    $result['avatar_medium'] = $mediumFile;
 
     if (isset($user['user_is_online'])) {
         $result['user_is_online'] = $user['user_is_online'] == true ? 1 : 0;

+ 9 - 3
main/inc/lib/course_home.lib.php

@@ -1053,10 +1053,16 @@ class CourseHome
             'external_na.gif'
         );
 
+        $toolName = Security::remove_XSS(stripslashes($tool['name']));
+
         if (in_array($tool['image'], $already_translated_icons)) {
-            $toolName = Security::remove_XSS(stripslashes($tool['name']));
-        } else {
-            $toolName = get_lang('Tool'.api_underscore_to_camel_case($tool['name']));
+            return $toolName;
+        }
+
+        $toolName = api_underscore_to_camel_case($toolName);
+
+        if (isset($GLOBALS['Tool' . $toolName])) {
+            return get_lang('Tool' . $toolName);
         }
 
         return $toolName;

+ 5 - 25
main/inc/lib/extra_field.lib.php

@@ -969,7 +969,7 @@ class ExtraField extends Model
                             foreach ($field_details['options'] as $option_details) {
                                 $optionList[$option_details['id']] = $option_details;
                                 if ($get_lang_variables) {
-                                    $options[$option_details['option_value']] = get_lang($option_details['display_text']);
+                                    $options[$option_details['option_value']] = $option_details['display_text'];
                                 } else {
                                     if ($optionsExists) {
                                         // Adding always the default value
@@ -1226,16 +1226,6 @@ class ExtraField extends Model
                         $variable = $field_details['variable'];
                         $field_id = $field_details['id'];
 
-                        //Added for correctly translate the extra_field
-                        $get_lang_variables = false;
-                        if (in_array($variable, ['tags'])) {
-                            $get_lang_variables = true;
-                        }
-
-                        if ($get_lang_variables) {
-                            $field_details['display_text'] = get_lang($field_details['display_text']);
-                        }
-
                         $tagsSelect = $form->addSelect(
                             "extra_{$field_details['variable']}",
                             $field_details['display_text']
@@ -1531,16 +1521,6 @@ EOF;
                         }
                         break;
                     case ExtraField::FIELD_TYPE_VIDEO_URL:
-                        //Added for correctly translate the extra_field
-                        $get_lang_variables = false;
-                        if (in_array($field_details['variable'], ['video_url'])) {
-                            $get_lang_variables = true;
-                        }
-
-                        if ($get_lang_variables) {
-                            $field_details['display_text'] = get_lang($field_details['display_text']);
-                        }
-
                         $form->addUrl(
                             "extra_{$field_details['variable']}",
                             $field_details['display_text'],
@@ -1783,11 +1763,11 @@ EOF;
 
         $form->addElement('header', $header);
 
-        if ($action === 'edit') {
-            $platformLanguage = api_get_setting('platformLanguage');
-            $languageId = api_get_language_id($platformLanguage);
-            $languageInfo = api_get_language_info($languageId);
+        $platformLanguage = api_get_setting('platformLanguage');
+        $languageId = api_get_language_id($platformLanguage);
+        $languageInfo = api_get_language_info($languageId);
 
+        if ($action === 'edit' && $languageInfo['parent_id']) {
             $translateUrl = api_get_path(WEB_CODE_PATH) . 'admin/sub_language.php?' . http_build_query([
                 'id' => $languageInfo['parent_id'],
                 'action' => 'registersublanguage',

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

@@ -942,9 +942,11 @@ class Template
         $this->assign('message_url', $message_url);
 
         //Certificate Link
-        $certificatesUrl = api_get_path(WEB_CODE_PATH).'gradebook/my_certificates.php';
-        $certificateLink = Display::url(get_lang('MyCertificates'), $certificatesUrl);
+        $certificateUrl = null;
+        $certificateUrl = api_get_path(WEB_CODE_PATH).'gradebook/my_certificates.php';
+        $certificateLink = Display::url(get_lang('MyCertificates'), $certificateUrl);
         $this->assign('certificate_link', $certificateLink);
+        $this->assign('certificate_url', $certificateUrl);
 
         $institution = api_get_setting('Institution');
         $portal_name = empty($institution) ? api_get_setting('siteName') : $institution;

+ 2 - 2
main/template/default/javascript/editor/ckeditor/elfinder.tpl

@@ -1,5 +1,5 @@
-{% extends "default/layout/no_layout.tpl" %}
+{% extends template ~ "/layout/no_layout.tpl" %}
 
 {% block body %}
-    {% include 'default/javascript/editor/elfinder_standalone.tpl' %}
+    {% include template ~ '/javascript/editor/elfinder_standalone.tpl' %}
 {% endblock %}

+ 16 - 12
main/template/default/layout/menu.tpl

@@ -27,23 +27,27 @@
                         <img class="img-circle" src="{{ _u.avatar_small }}" alt="{{ _u.complete_name }}" />  <span class="caret"></span>
                     </a>
                     <ul class="dropdown-menu" role="menu">
-                        <li>
-                            <a href="{{ profile_url }}">{{ _u.complete_name }}</a>
+                        <li class="user-header">
+                            <div class="text-center">
+                            <img class="img-circle" src="{{ _u.avatar_medium }}" alt="{{ _u.complete_name }}" />
+                            <p class="name"><a href="{{ profile_url }}">{{ _u.complete_name }}</a></p>
+                            <p><i class="fa fa-envelope-o" aria-hidden="true"></i> {{ _u.email }}</p>
+                            </div>
                         </li>
                         <li role="separator" class="divider"></li>
-                        <li>
-                            {{ message_link }}
-                            {{ certificate_link }}
+                        <li class="user-body">
+                            <a title="{{ "Inbox"|get_lang }}" href="{{ message_url }}">
+                                <em class="fa fa-envelope" aria-hidden="true"></em> {{ "Inbox"|get_lang }}
+                            </a>
+                            <a title="{{ "MyCertificates"|get_lang }}" href="{{ certificate_url }}">
+                                <em class="fa fa-graduation-cap" aria-hidden="true"></em> {{ "MyCertificates"|get_lang }}
+                            </a>
+                            <a id="logout_button" title="{{ "Logout"|get_lang }}" href="{{ logout_link }}" >
+                                <em class="fa fa-sign-out"></em> {{ "Logout"|get_lang }}
+                            </a>
                         </li>
                     </ul>
                 </li>
-               {% if logout_link is not null %}
-               <li>
-                   <a id="logout_button" title="{{ "Logout"|get_lang }}" href="{{ logout_link }}" >
-                       <em class="fa fa-sign-out"></em> {{ "Logout"|get_lang }}
-                   </a>
-               </li>
-               {% endif %}
                {% endif %}
             </ul>
             {% endif %}