diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index 77efac8142..f65bd82024 100644
--- a/app/Resources/public/css/base.css
+++ b/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;
diff --git a/app/Resources/public/css/themes/chamilo/default.css b/app/Resources/public/css/themes/chamilo/default.css
index 25983aa3a3..7866ee62c1 100644
--- a/app/Resources/public/css/themes/chamilo/default.css
+++ b/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;
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 347349e03f..972860938b 100644
--- a/main/inc/lib/api.lib.php
+++ b/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;
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index c5d2894dbe..bfcd26130e 100755
--- a/main/inc/lib/template.lib.php
+++ b/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;
diff --git a/main/template/default/javascript/editor/ckeditor/elfinder.tpl b/main/template/default/javascript/editor/ckeditor/elfinder.tpl
index 055cd7cee0..61b8f4a447 100644
--- a/main/template/default/javascript/editor/ckeditor/elfinder.tpl
+++ b/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 %}
diff --git a/main/template/default/layout/menu.tpl b/main/template/default/layout/menu.tpl
index b7393c2ff7..4ccabfd8b7 100755
--- a/main/template/default/layout/menu.tpl
+++ b/main/template/default/layout/menu.tpl
@@ -27,23 +27,27 @@