fix introduction tools

chamilo · Apr 11, 2017 · a24673a · a24673a
1 parent 29df7b0
commit a24673a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
@@ -4130,7 +4130,6 @@ ul.holder li.bit-box{
     color: #FFF;
     padding: 12px;
     text-transform: uppercase;
-    margin-bottom: 10px;
     border-radius: 5px;
 }
 .thematic .score-progress h3{
@@ -4764,6 +4763,15 @@ div#chat-remote-video video {
     padding: 5px;
     border-radius: 5px;
 }
+.toolbar-edit{
+    padding: 5px;
+    display: inline-block;
+    width: 100%;
+}
+.bar-progress{
+    display: inline-block;
+    width: 100%;
+}
 .grid-courses .items{
     /* position: relative; */
     vertical-align: top;

diff --git a/main/inc/introductionSection.inc.php b/main/inc/introductionSection.inc.php
@@ -320,7 +320,8 @@
 if ($intro_dispCommand) {
     if (empty($intro_content)) {
         // 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)) {
             $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> ';
@@ -330,10 +331,11 @@
             $toolbar .= '<a class="btn btn-default" href="' . api_get_self() . '?intro_cmdAdd=1">' . get_lang('AddIntro') . '</a>';
             $toolbar .= $editIconButton;
         }
-        $toolbar .= '</div>';
+        $toolbar .= '</div></div>';
 
     } else {
         // Displays "edit intro && delete intro" commands
+        $toolbar .= '<div class="toolbar-edit">';
         $toolbar .= '<div class="btn-group pull-right" rol="group">';
         if (!empty($courseId)) {
             $toolbar .=
@@ -354,7 +356,7 @@
                 if(!confirm('".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES, $charset)).
                 "')) 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
         $browser = api_get_navigator();
         if (strpos($introduction_section, '<iframe') !== false && $browser['name'] == 'Chrome') {

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