fix introduction tools

pull/2487/head
Alex Aragon 9 years ago
parent 29df7b0ff2
commit a24673a33d
  1. 10
      app/Resources/public/css/base.css
  2. 8
      main/inc/introductionSection.inc.php
  3. 8
      main/template/default/course_progress/progress.tpl

@ -4130,7 +4130,6 @@ ul.holder li.bit-box{
color: #FFF; color: #FFF;
padding: 12px; padding: 12px;
text-transform: uppercase; text-transform: uppercase;
margin-bottom: 10px;
border-radius: 5px; border-radius: 5px;
} }
.thematic .score-progress h3{ .thematic .score-progress h3{
@ -4764,6 +4763,15 @@ div#chat-remote-video video {
padding: 5px; padding: 5px;
border-radius: 5px; border-radius: 5px;
} }
.toolbar-edit{
padding: 5px;
display: inline-block;
width: 100%;
}
.bar-progress{
display: inline-block;
width: 100%;
}
.grid-courses .items{ .grid-courses .items{
/* position: relative; */ /* position: relative; */
vertical-align: top; vertical-align: top;

@ -320,7 +320,8 @@ $textIntro = '';
if ($intro_dispCommand) { if ($intro_dispCommand) {
if (empty($intro_content)) { if (empty($intro_content)) {
// Displays "Add intro" commands // Displays "Add intro" commands
$toolbar = '<div class="btn-group pull-right" role="group">'; $toolbar .= '<div class="toolbar-edit">';
$toolbar .= '<div class="btn-group pull-right" role="group">';
if (!empty($courseId)) { if (!empty($courseId)) {
$textIntro = '<a class="btn btn-default" title="' . addslashes(get_lang('AddIntro')) . '" href="'.api_get_self().'?' . api_get_cidreq().'&intro_cmdAdd=1">'; $textIntro = '<a class="btn btn-default" title="' . addslashes(get_lang('AddIntro')) . '" href="'.api_get_self().'?' . api_get_cidreq().'&intro_cmdAdd=1">';
$textIntro .= '<em class="fa fa-file-text"></em> '; $textIntro .= '<em class="fa fa-file-text"></em> ';
@ -330,10 +331,11 @@ if ($intro_dispCommand) {
$toolbar .= '<a class="btn btn-default" href="' . api_get_self() . '?intro_cmdAdd=1">' . get_lang('AddIntro') . '</a>'; $toolbar .= '<a class="btn btn-default" href="' . api_get_self() . '?intro_cmdAdd=1">' . get_lang('AddIntro') . '</a>';
$toolbar .= $editIconButton; $toolbar .= $editIconButton;
} }
$toolbar .= '</div>'; $toolbar .= '</div></div>';
} else { } else {
// Displays "edit intro && delete intro" commands // Displays "edit intro && delete intro" commands
$toolbar .= '<div class="toolbar-edit">';
$toolbar .= '<div class="btn-group pull-right" rol="group">'; $toolbar .= '<div class="btn-group pull-right" rol="group">';
if (!empty($courseId)) { if (!empty($courseId)) {
$toolbar .= $toolbar .=
@ -354,7 +356,7 @@ if ($intro_dispCommand) {
if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)). if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).
"')) return false;\"><em class=\"fa fa-trash-o\"></em></a>"; "')) return false;\"><em class=\"fa fa-trash-o\"></em></a>";
} }
$toolbar .= "</div>"; $toolbar .= "</div></div>";
// Fix for chrome XSS filter for videos in iframes - BT#7930 // Fix for chrome XSS filter for videos in iframes - BT#7930
$browser = api_get_navigator(); $browser = api_get_navigator();
if (strpos($introduction_section, '<iframe') !== false && $browser['name'] == 'Chrome') { if (strpos($introduction_section, '<iframe') !== false && $browser['name'] == 'Chrome') {

@ -6,9 +6,11 @@
<div id="course-progress" class="thematic"> <div id="course-progress" class="thematic">
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-right"> <div class="bar-progress">
<div class="score-progress"> <div class="pull-right">
<h3>{{ 'Progress' | get_lang }}: <span id="div_result">{{ score_progress }}</span> %</h3> <div class="score-progress">
<h3>{{ 'Progress' | get_lang }}: <span id="div_result">{{ score_progress }}</span> %</h3>
</div>
</div> </div>
</div> </div>
<div class="table-responsive"> <div class="table-responsive">

Loading…
Cancel
Save