chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source
pull/3173/head
Angel Fernando Quiroz Campos 6 years ago
parent 914c5ed72f b715d1a5a5
commit dbcf99e147
4 changed files with 78 additions and 151 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      main/inc/lib/tracking.lib.php
  2. 181
      main/template/default/admin/user_information.tpl
  3. 39
      main/template/default/macro/macro.tpl
  4. 3
      main/template/default/my_space/course_summary.tpl

4
main/inc/lib/tracking.lib.php
Unescape View File

@ -3974,7 +3974,7 @@ class Tracking
$sql = "SELECT count(ip.tool) AS count $sql = "SELECT count(ip.tool) AS count
FROM $tbl_item_property ip FROM $tbl_item_property ip
INNER JOIN $tbl_document pub INNER JOIN $tbl_document pub
ON (ip.ref = pub.id AND ip.c_id = pub.c_id) ON (ip.ref = pub.iid AND ip.c_id = pub.c_id)
WHERE WHERE
ip.c_id = $course_id AND ip.c_id = $course_id AND
pub.c_id = $course_id AND pub.c_id = $course_id AND
@ -4038,7 +4038,7 @@ class Tracking
$sql = "SELECT count(ip.tool) as count $sql = "SELECT count(ip.tool) as count
FROM $tbl_item_property ip FROM $tbl_item_property ip
INNER JOIN $tbl_student_publication pub INNER JOIN $tbl_student_publication pub
ON (ip.ref = pub.id AND ip.c_id = pub.c_id) ON (ip.ref = pub.iid AND ip.c_id = pub.c_id)
WHERE WHERE
ip.tool='work' AND ip.tool='work' AND
$conditionToString"; $conditionToString";

181
main/template/default/admin/user_information.tpl
Unescape View File

@ -1,172 +1,57 @@
{% import 'default/macro/macro.tpl' as display %}
<div class="details"> <div class="details">
<div class="row"> <div class="row">
<div class="col-md-4"> <div class="col-md-4">
<div class="panel panel-default"> {% set content %}
<div class="panel-body"> <div class="user">
<div class="user"> <div class="avatar">
<div class="avatar"> <img width="128px" src="{{ user.avatar }}" class="img-responsive" >
<img width="128px" src="{{ user.avatar }}" class="img-responsive" > </div>
</div> <div class="name">
<div class="name"> <h3>{{ user.complete_name }}</h3>
<h3>{{ user.complete_name }}</h3> <p class="email">{{ user.email }}</p>
<p class="email">{{ user.email }}</p> </div>
</div> <div class="parameters">
<div class="parameters"> <dl class="dl-horizontal">
<dl class="dl-horizontal"> <dt>{{ 'Tel'|get_lang }}</dt>
<dt>{{ 'Tel'|get_lang }}</dt> <dd>{{ user.phone == '' ? 'NoTel'|get_lang : user.phone }}</dd>
<dd>{{ user.phone == '' ? 'NoTel'|get_lang : user.phone }}</dd> <dt>{{ 'OfficialCode'|get_lang }}</dt>
<dt>{{ 'OfficialCode'|get_lang }}</dt> <dd>{{ user.official_code == '' ? 'NoOfficialCode'|get_lang : user.official_code }}</dd>
<dd>{{ user.official_code == '' ? 'NoOfficialCode'|get_lang : user.official_code }}</dd> <dt>{{ 'OnLine'|get_lang }}</dt>
<dt>{{ 'OnLine'|get_lang }}</dt> <dd>{{ user.user_is_online }}</dd>
<dd>{{ user.user_is_online }}</dd> <dt>{{ 'Status'|get_lang }}</dt>
<dt>{{ 'Status'|get_lang }}</dt> <dd>{{ user.status }}</dd>
<dd>{{ user.status }}</dd> </dl>
</dl> <div class="create">{{ user.created }}</div>
<div class="create">{{ user.created }}</div>
</div>
</div>
</div> </div>
</div> </div>
{% endset %}
{{ display.panel('',content,'') }}
</div> </div>
<div class="col-md-8"> <div class="col-md-8">
<div class="list-card"> <div class="list-card">
<div class="card card-first-date"> {{ display.card_widget('FirstLoginInPlatform'|get_lang ,user.first_connection ,'calendar') }}
<div class="card-body">
<div class="stat-widget-five">
<div class="stat-icon">
<i class="fa fa-calendar" aria-hidden="true"></i>
</div>
<div class="stat-content">
<div class="text-left">
<div class="stat-text">
{{ user.first_connection }}
</div>
<div class="stat-heading">
{{ 'FirstLoginInPlatform'|get_lang }}
</div>
</div>
</div>
</div>
</div>
</div>
<div class="card card-last-date"> {{ display.card_widget('LatestLoginInPlatform'|get_lang ,user.last_connection ,'calendar') }}
<div class="card-body">
<div class="stat-widget-five">
<div class="stat-icon">
<i class="fa fa-calendar" aria-hidden="true"></i>
</div>
<div class="stat-content">
<div class="text-left">
<div class="stat-text">
{{ user.last_connection }}
</div>
<div class="stat-heading">
{{ 'LatestLoginInPlatform'|get_lang }}
</div>
</div>
</div>
</div>
</div>
</div>
<div class="card card-legal"> {{ display.card_widget('LegalAccepted'|get_lang ,user.legal.datetime ,'gavel' , user.legal.icon) }}
<div class="card-body">
<div class="stat-widget-five">
<div class="stat-icon">
<i class="fa fa-gavel" aria-hidden="true"></i>
<span class="active-icon">{{ user.legal.icon }}</span>
</div>
<div class="stat-content">
<div class="text-left">
<div class="stat-text">
{{ user.legal.datetime }}
</div>
<div class="stat-heading">
{{ 'LegalAccepted'|get_lang }}
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
{% if social_tool %} {% if social_tool %}
<div class="list-box-widget"> <div class="list-box-widget">
<div class="card box-widget"> {{ display.box_widget('Friends'|get_lang ,user.social.friends ,'users') }}
<div class="card-body">
<div class="stat-widget-five">
<i class="fa fa-users" aria-hidden="true"></i>
{{ user.social.friends }}
<div class="box-name">
{{ 'Friends'|get_lang }}
</div>
</div>
</div>
</div>
<div class="card box-widget"> {{ display.box_widget('InvitationSent'|get_lang ,user.social.invitation_sent ,'paper-plane') }}
<div class="card-body">
<div class="stat-widget-five">
<i class="fa fa-paper-plane" aria-hidden="true"></i>
{{ user.social.invitation_sent }}
<div class="box-name">
{{ 'InvitationSent'|get_lang }}
</div>
</div>
</div>
</div>
<div class="card box-widget"> {{ display.box_widget('InvitationReceived'|get_lang ,user.social.invitation_received ,'smile-o') }}
<div class="card-body">
<div class="stat-widget-five">
<i class="fa fa-smile-o" aria-hidden="true"></i>
{{ user.social.invitation_received }}
<div class="box-name">
{{ 'InvitationReceived'|get_lang }}
</div>
</div>
</div>
</div>
<div class="card box-widget"> {{ display.box_widget('WallMessagesPosted'|get_lang ,user.social.messages_posted ,'comments') }}
<div class="card-body">
<div class="stat-widget-five">
<i class="fa fa-comments" aria-hidden="true"></i>
{{ user.social.messages_posted }}
<div class="box-name">
{{ 'WallMessagesPosted'|get_lang }}
</div>
</div>
</div>
</div>
<div class="card box-widget"> {{ display.box_widget('MessagesSent'|get_lang ,user.social.messages_sent ,'envelope') }}
<div class="card-body">
<div class="stat-widget-five">
<i class="fa fa-envelope" aria-hidden="true"></i>
{{ user.social.messages_posted }}
<div class="box-name">
{{ 'MessagesSent'|get_lang }}
</div>
</div>
</div>
</div>
<div class="card box-widget"> {{ display.box_widget('MessagesReceived'|get_lang ,user.social.message_received ,'envelope-open-o') }}
<div class="card-body">
<div class="stat-widget-five">
<i class="fa fa-envelope-open-o" aria-hidden="true"></i>
{{ user.social.message_received }}
<div class="box-name">
{{ 'MessagesReceived'|get_lang }}
</div>
</div>
</div>
</div>
</div> </div>
{% endif %} {% endif %}

39
main/template/default/macro/macro.tpl
Unescape View File

@ -116,3 +116,42 @@
{% endif %} {% endif %}
</div> </div>
{% endmacro %} {% endmacro %}
{% macro box_widget(name, content, icon) %}
<div class="card box-widget">
<div class="card-body">
<div class="stat-widget-five">
<i class="fa fa-{{ icon }}" aria-hidden="true"></i>
{{ content }}
<div class="box-name">
{{ name }}
</div>
</div>
</div>
</div>
{% endmacro %}
{% macro card_widget(name, content, icon, extra) %}
<div class="card card-first-date">
<div class="card-body">
<div class="stat-widget-five">
<div class="stat-icon">
<i class="fa fa-{{ icon }}" aria-hidden="true"></i>
{% if extra %}
<span class="active-icon">{{ extra }}</span>
{% endif %}
</div>
<div class="stat-content">
<div class="text-left">
<div class="stat-text">
{{ content }}
</div>
<div class="stat-heading">
{{ name }}
</div>
</div>
</div>
</div>
</div>
</div>
{% endmacro %}

3
main/template/default/my_space/course_summary.tpl
Unescape View File

@ -0,0 +1,3 @@
<div class="summary-legend">
{{ table }}
</div>
Write Preview
Loading…
Cancel
Save