Browse Source

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

Angel Fernando Quiroz Campos 5 năm trước cách đây
mục cha
commit
4dfb9661b0

+ 5 - 4
app/Resources/public/css/base.css

@@ -9866,7 +9866,7 @@ ul.dropdown-menu.inner > li > a {
     width: 14%;
 }
 .summary-item .summary-course{
-    width: 80%;
+    width: 82%;
 }
 .summary-item .summary-course .alert{
     margin-bottom: 0;
@@ -9901,13 +9901,15 @@ ul.dropdown-menu.inner > li > a {
     font-size: 12px;
     border-radius: 5px;
 }
+.summary-item .summary-course .course-item .box.box-date{
+    width: 20%;
+}
 .summary-item .summary-course .course-item .box .kt-badge{
     height: 0;
     width: auto;
     padding: 0.5rem 0.5rem;
     border-radius: 2px;
     font-weight: bold;
-    border: 1px solid;
 }
 .summary-legend{
     padding: 10px 0;
@@ -9955,9 +9957,8 @@ ul.dropdown-menu.inner > li > a {
     color: #FF5722;
 }
 .last-connection{
-    color: #2196f3;
-    background: rgba(57, 217, 253, 0.35);
 }
+
 @media (min-width: 768px) {
     .clear-rows-6-4-3 .col-sm-6:nth-child(2n+1) {
         clear: left;

+ 32 - 0
main/mySpace/myStudents.php

@@ -862,11 +862,29 @@ $table_title = Display::return_icon('user.png', get_lang('User')).$user_info['co
 
 echo Display::page_subheader($table_title);
 $userPicture = UserManager::getUserPicture($user_info['user_id'], USER_IMAGE_SIZE_BIG);
+
 $userGroupManager = new UserGroup();
 $userGroups = $userGroupManager->getNameListByUser(
     $user_info['user_id'],
     UserGroup::NORMAL_CLASS
 );
+
+$userInfo = [
+        'id' => $user_info['user_id'],
+        'complete_name' => $user_info['complete_name'],
+    'complete_name_link' => $user_info['complete_name_with_message_link'],
+    'phone' => $user_info['phone'],
+    'code' => $user_info['official_code'],
+    'username' => $user_info['username'],
+    'registration_date' => $user_info['registration_date'],
+    'email' => $user_info['email'],
+    'has_certificates' => $user_info['has_certificates'],
+    'last_login' => $user_info['last_login'],
+    'profile_url' => $user_info['profile_url'],
+    'groups' => $userGroupManager,
+    'avatar' => $userPicture,
+    'online' => $online
+];
 ?>
     <div class="row">
         <div class="col-sm-2">
@@ -1071,6 +1089,18 @@ $userGroups = $userGroupManager->getNameListByUser(
     </div>
 <?php
 
+
+$tpl = new Template('',
+    false,
+    false,
+    false,
+    false,
+    false,
+    false);
+$tpl->assign('user', $userInfo);
+$templateName = $tpl->get_template('my_space/user_details.tpl');
+$content = $tpl->fetch($templateName);
+
 $exportCourseList = [];
 $lpIdList = [];
 if (empty($details)) {
@@ -2111,4 +2141,6 @@ if ($export) {
     exit;
 }
 
+echo $content;
+
 Display::display_footer();

+ 1 - 1
main/template/default/my_space/partials/tracking_user_overview.tpl

@@ -53,7 +53,7 @@
                                     {{ course.questions_answered }}
                                 </span>
                             </div>
-                            <div class="box" data-toggle="tooltip" data-placement="top" title="{{ 'LatestLogin'|get_lang }}">
+                            <div class="box box-date" data-toggle="tooltip" data-placement="top" title="{{ 'LatestLogin'|get_lang }}">
                                 {% if course.last_connection  %}
                                 <span class="kt-badge last-connection">
                                      {{ course.last_connection }}

+ 31 - 0
main/template/default/my_space/user_details.tpl

@@ -0,0 +1,31 @@
+<div class="row">
+    <div class="col-md-4">
+        <div class="panel panel-default">
+            <div class="panel-body">
+                <div class="user">
+                    <div class="avatar">
+                        <img width="128px" src="{{ user.avatar }}" class="img-responsive" >
+                    </div>
+                    <div class="name">
+                        <h3>{{ user.complete_name_link }}</h3>
+                        <p class="email">{{ user.email }}</p>
+                    </div>
+                    <div class="parameters">
+                        <dl class="dl-horizontal">
+                            <dt>{{ 'Tel'|get_lang }}</dt>
+                            <dd>{{ user.phone == '' ? 'NoTel'|get_lang : user.phone }}</dd>
+                            <dt>{{ 'OfficialCode'|get_lang }}</dt>
+                            <dd>{{ user.code == '' ? 'NoOfficialCode'|get_lang : user.code }}</dd>
+                            <dt>{{ 'OnLine'|get_lang }}</dt>
+                            <dd>{{ user.online }}</dd>
+
+                        </dl>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="col-md-8">
+
+    </div>
+</div>

+ 1 - 1
main/template/default/my_space/user_summary.tpl

@@ -1,5 +1,5 @@
 <script type="text/javascript">
-    $(document).ready(function(){
+    $(function(){
         $('[data-toggle="tooltip"]').tooltip();
     });