new perfil logout plataform refs - BT#7683

pull/2487/head
Alex Aragon 10 years ago
parent 125896ee8b
commit 17e287a318
  1. 10
      app/Resources/public/css/base.css
  2. 15
      app/Resources/public/css/themes/chamilo/default.css
  3. 2
      main/inc/lib/api.lib.php
  4. 6
      main/inc/lib/template.lib.php
  5. 4
      main/template/default/javascript/editor/ckeditor/elfinder.tpl
  6. 28
      main/template/default/layout/menu.tpl

@ -272,6 +272,16 @@ a.thumbnail:hover{
color: #fff; color: #fff;
padding-left: 9px; 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 */ /* notifications help and bug */
#touch-button.btn-touch{ #touch-button.btn-touch{
background-color: #C2C2C2; background-color: #C2C2C2;

@ -56,7 +56,7 @@ a:focus {
overflow: hidden !important; overflow: hidden !important;
} }
.navbar-default { .navbar-default {
background: #2E75A3; background: #3C8DBC;
-webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1); -webkit-box-shadow: 0 1px 10px rgba(0, 0, 0, 0.1);
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:hover,
.navbar-default .navbar-nav > .active > a:focus{ .navbar-default .navbar-nav > .active > a:focus{
color: #fff; color: #fff;
background-color:#07578a; background-color:#367FA9;
} }
.navbar-default .navbar-nav > li > a{ .navbar-default .navbar-nav > li > a{
color: #ffffff; color: #ffffff;
@ -76,7 +76,7 @@ a:focus {
.navbar-default .navbar-nav > .open > a, .navbar-default .navbar-nav > .open > a,
.navbar-default .navbar-nav > .open > a:hover, .navbar-default .navbar-nav > .open > a:hover,
.navbar-default .navbar-nav > .open > a:focus{ .navbar-default .navbar-nav > .open > a:focus{
background: #07578a; background: #367FA9;
color: #ffffff; color: #ffffff;
} }
.navbar-nav > li > .dropdown-menu{ .navbar-nav > li > .dropdown-menu{
@ -88,18 +88,9 @@ a:focus {
} }
.navbar-default .navbar-nav > .open > .dropdown-menu{ .navbar-default .navbar-nav > .open > .dropdown-menu{
padding: 3px 4px; padding: 3px 4px;
background-color: #07578a;
} }
.navbar-default .navbar-nav > .open > .dropdown-menu > li > a{ .navbar-default .navbar-nav > .open > .dropdown-menu > li > a{
padding: 6px 9px; 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{ .nav > li > a:hover, .nav > li > a:focus{
background-color: transparent; background-color: transparent;

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

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

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

@ -27,23 +27,27 @@
<img class="img-circle" src="{{ _u.avatar_small }}" alt="{{ _u.complete_name }}" /> <span class="caret"></span> <img class="img-circle" src="{{ _u.avatar_small }}" alt="{{ _u.complete_name }}" /> <span class="caret"></span>
</a> </a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li> <li class="user-header">
<a href="{{ profile_url }}">{{ _u.complete_name }}</a> <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>
<li role="separator" class="divider"></li> <li role="separator" class="divider"></li>
<li> <li class="user-body">
{{ message_link }} <a title="{{ "Inbox"|get_lang }}" href="{{ message_url }}">
{{ certificate_link }} <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> </li>
</ul> </ul>
</li> </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 %} {% endif %}
</ul> </ul>
{% endif %} {% endif %}

Loading…
Cancel
Save