toolbar actions fix

main/admin/course_list.php

@@ -372,6 +372,7 @@ if (isset ($_GET['search']) && $_GET['search'] === 'advanced') {
     }
 
     $courseListUrl = api_get_self();
+    $actions .= '<div class="actions">';
     $actions .= '<div class="row">';
     $actions .= '<div class="col-md-2">';
     $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'), '', ICON_SIZE_MEDIUM).'</a> ';
@@ -392,6 +393,7 @@ if (isset ($_GET['search']) && $_GET['search'] === 'advanced') {
     $actions .= '</div>';
     $actions .= '</div>';
     $actions .= '</div>';
+    $actions .= '</div>';
     $actions .= '
     <script>
     $(function() {

main/admin/skill_badge.php

@@ -35,13 +35,13 @@ $toolbar = Display::toolbarButton(
     'primary',
     ['title' => get_lang('ManageSkills')]
 );
-
+$actions = '<div class="actions">' . $toolbar . '</div>';
 $tpl = new Template(get_lang('Badges'));
 $tpl->assign('backpack', $backpack);
 
 $templateName = $tpl->get_template('skill/badge.tpl');
 $contentTemplate = $tpl->fetch($templateName);
 
-$tpl->assign('actions', $toolbar);
+$tpl->assign('actions', $actions);
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();

main/admin/skill_badge_create.php

@@ -115,13 +115,13 @@ $toolbar = Display::toolbarButton(
     'primary',
     ['title' => get_lang('ManageSkills')]
 );
-
+$actions = '<div class="actions">' . $toolbar . '</div>';
 $tpl = new Template(get_lang('CreateBadge'));
 $tpl->assign('platformAdminEmail', api_get_setting('emailAdministrator'));
 $tpl->assign('skill', $skill);
 $tpl->assign('badge_studio', $badgeStudio);
 $templateName = $tpl->get_template('skill/badge_create.tpl');
 $contentTemplate = $tpl->fetch($templateName);
-$tpl->assign('actions', $toolbar);
+$tpl->assign('actions', $actions);
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();

main/admin/skill_badge_list.php

@@ -46,14 +46,14 @@ $toolbar = Display::toolbarButton(
     'primary',
     ['title' => get_lang('ManageSkills')]
 );
-
+$actions = '<div class="actions">' . $toolbar . '</div>';
 $tpl = new Template(get_lang('Skills'));
 $tpl->assign('errorMessage', $errorMessage);
 $tpl->assign('skills', $skills);
 $templateName = $tpl->get_template('skill/badge_list.tpl');
 $contentTemplate = $tpl->fetch($templateName);
 
-$tpl->assign('actions', $toolbar);
+$tpl->assign('actions', $actions);
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();
 

main/admin/skill_list.php

@@ -144,7 +144,7 @@ switch ($action) {
             'info',
             ['title' => get_lang('BadgesManagement')]
         );
-
+        $actions = '<div class="actions">' . $toolbar . '</div>';
         $extraField = new ExtraField('skill');
         $arrayVals = $extraField->get_handler_field_info_by_tags('tags');
         $tags = [];
@@ -179,7 +179,7 @@ switch ($action) {
         $templateName = $tpl->get_template('skill/list.tpl');
         $content = $tpl->fetch($templateName);
 
-        $tpl->assign('actions', $toolbar);
+        $tpl->assign('actions', $actions);
         $tpl->assign('content', $content);
         $tpl->display_one_col_template();
 

main/admin/skills_import.php

@@ -272,9 +272,9 @@ $toolbar .= Display::toolbarButton(
     'warning',
     ['title' => get_lang('BadgesManagement')]
 );
-$toolbar .= '<br /><br />';
+$actions = '<div class="actions">' . $toolbar . '</div>';
 
-echo $toolbar;
+echo $actions;
 
 $form = new FormValidator('user_import', 'post', 'skills_import.php');
 $form->addElement('header', '', $tool_name);