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/2487/head
Angel Fernando Quiroz Campos 9 years ago
parent 9c8f6a5b0b 0af610217e
commit d438cb7857
4 changed files with 51 additions and 51 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. 10
      app/Resources/public/css/base.css
  2. 2
      main/inc/lib/userportal.lib.php
  3. 82
      main/template/default/user_portal/classic_session.tpl
  4. 8
      plugin/bbb/admin.php

10
app/Resources/public/css/base.css
Unescape View File

@ -4722,6 +4722,16 @@ div#chat-remote-video video {
.session .info-session span{
margin-right: 10px;
}
.info-session .date{
font-size: 12px;
}
.info-session .description{
font-size: 12px;
line-height: 22px;
}
.info-session .teacher-name{
font-size: 12px;
}
.session .list-teachers{
font-size: 12px;
}

2
main/inc/lib/userportal.lib.php
Unescape View File

@ -1261,7 +1261,7 @@ class IndexManager
'id' => $session_id
);
$session_box = Display::get_session_title_box($session_id);
$actions = null;
if (api_is_platform_admin()) {
$actions = api_get_path(WEB_CODE_PATH) .'session/resume_session.php?id_session='.$session_id;

82
main/template/default/user_portal/classic_session.tpl
Unescape View File

@ -25,7 +25,6 @@
</a>
{% set collapsable = 'collapse' %}
{% endif %}
{% if row.show_actions %}
<div class="pull-right">
<a href="{{ _p.web_main ~ "session/resume_session.php?id_session=" ~ row.id }}">
@ -35,50 +34,7 @@
</div>
{% endif %}
</div>
{% endif %}
<div class="session panel-body {{ collapsable }}" id="collapse_{{ row.id }}">
{% if row.show_simple_session_info %}
<div class="row">
<div class="col-md-7">
{% if row.description != '' %}
{{ row.description }}
{% endif %}
<div class="info-session">
{# Classic #}
<span>
<a href="{{ _p.web_main ~ 'session/index.php?session_id=' ~ row.id }}">
<img id="session_img_{{ row.id }}" src="{{ "window_list.png"|icon(32) }}" width="32" height="32"
alt="{{ row.title }}" title="{{ row.title }}"/>
{{ row.title }}
</a>
</span>
{% if row.coach_name != '' %}
<span>
<i class="fa fa-user" aria-hidden="true"></i>
{{ row.coach_name }}
</span>
{% endif %}
<span>
<i class="fa fa-calendar" aria-hidden="true"></i>
{{ row.date }}
</span>
</div>
{% if row.coaches %}
<h5 class="teacher-name">{{ "teacher.png"|icon(16) ~ row.coaches }}</h5>
{% endif %}
</div>
{% if row.show_actions %}
<div class="col-md-5 text-right">
<a href="{{ _p.web_main ~ "session/resume_session.php?id_session=" ~ row.id }}">
<img src="{{ "edit.png"|icon(22) }}" width="22" height="22" alt="{{ "Edit"|get_lang }}"
title="{{ "Edit"|get_lang }}">
</a>
</div>
{% endif %}
</div>
{% else %}
<div class="session panel-body {{ collapsable }}" id="collapse_{{ row.id }}">
<div class="row">
<div class="col-md-12">
{% if row.description != '' %}
@ -130,7 +86,41 @@
</div>
</div>
</div>
{% endif %}
</div>
{% else %}
<div class="panel-heading">
<a href="{{ _p.web_main ~ 'session/index.php?session_id=' ~ row.id }}">
<img id="session_img_{{ row.id }}" src="{{ "window_list.png"|icon(32) }}" alt="{{ row.title }}" title="{{ row.title }}"/>
{{ row.title }}
</a>
</div>
<!-- view simple info -->
<div class="panel-body">
<div class="row">
<div class="col-md-2">
<a class="thumbnail" href="{{ _p.web_main ~ 'session/index.php?session_id=' ~ row.id }}">
<img class="img-responsive" src="{{ row.image ? _p.web_upload ~ row.image : 'session_default.png'|icon() }}" alt="{{ row.title }}" title="{{ row.title }}"/>
</a>
</div>
<div class="col-md-10">
<div class="info-session">
<div class="date">
<i class="fa fa-calendar" aria-hidden="true"></i>
{{ row.date }}
{% if row.coach_name %}
<h5 class="teacher-name">{{ "teacher.png"|img(16) }} <a class="ajax" href="{{ row.coach_url }}" alt="{{ row.coach_name }}">{{ row.coach_name }}</a></h5>
{% endif %}
</div>
{% if row.description != '' %}
<div class="description">
{{ row.description }}
</div>
{% endif %}
</div>
</div>
</div>
</div>
<!-- end view simple info -->
{% endif %}
</div>
{% endfor %}

8
plugin/bbb/admin.php
Unescape View File

@ -36,12 +36,12 @@ if ($action) {
switch ($action) {
case 'export':
$dataToExport = [
[$tool_name, get_lang('RecordList')],
[$tool_name, $plugin->get_lang('RecordList')],
[],
[
get_lang('CreatedAt'),
get_lang('Status'),
get_lang('Records'),
$plugin->get_lang('Records'),
get_lang('Course'),
get_lang('Session'),
get_lang('Participants'),
@ -51,7 +51,7 @@ if ($action) {
foreach ($meetings as $meeting) {
$dataToExport[] = [
$meeting['created_at'],
$meeting['status'] == 1 ? get_lang('MeetingOpened') : get_lang('MeetingClosed'),
$meeting['status'] == 1 ? $plugin->get_lang('MeetingOpened') : $plugin->get_lang('MeetingClosed'),
$meeting['record'] == 1 ? get_lang('Yes') : get_lang('No'),
$meeting['course'] ? $meeting['course']->getTitle() : '-',
$meeting['session'] ? $meeting['session']->getName() : '-',
@ -95,7 +95,7 @@ if ($meetings) {
);
}
$tpl->assign('header', get_lang('RecordList'));
$tpl->assign('header', $plugin->get_lang('RecordList'));
$tpl->assign('actions', implode('', $actions));
$tpl->assign('content', $content);
$tpl->display_one_col_template();

Write Preview
Loading…
Cancel
Save