Fix toolbars action

main/admin/course_list.php

@@ -372,43 +372,38 @@ 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> ';
+    $actions1 = Display::url(
+        Display::return_icon('new_course.png', get_lang('AddCourse'), [], ICON_SIZE_MEDIUM),
+        api_get_path(WEB_CODE_PATH).'admin/course_add.php'
+    );
+
     if (api_get_setting('course_validation') === 'true') {
-        $actions .= '<a href="course_request_review.php">'.
-            Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'), '', ICON_SIZE_MEDIUM).'</a>';
+        $actions1 .= Display::url(
+            Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'), [], ICON_SIZE_MEDIUM),
+            api_get_path(WEB_CODE_PATH).'admin/course_request_review.php'
+        );
     }
-    $actions .= '</div>';
-    $actions .= '<div class="col-md-4">';
-    $actions .= $form->returnForm();
-    $actions .= '</div>';
-    $actions .= '<div class="col-md-4">';
-    $actions .= $sessionFilter->returnForm();
-    $actions .= '</div>';
-    $actions .= '<div class="col-md-2">';
-    $actions .= '<div class="pull-right">';
-    $actions .= $advanced;
-    $actions .= '</div>';
-    $actions .= '</div>';
-    $actions .= '</div>';
-    $actions .= '</div>';
-    $actions .= '
+
+    $actions2 = $form->returnForm();
+    $actions3 = $sessionFilter->returnForm();
+    $actions4 = $advanced;
+    $actions4 .= '
     <script>
-    $(function() {
-        $("#session_name").on("change", function() {
-            var sessionId = $(this).val();
+        $(function() {
+            $("#session_name").on("change", function() {
+                var sessionId = $(this).val();
     
-            if (!sessionId) {
-                return;
-            }
+                if (!sessionId) {
+                    return;
+                }
     
-            window.location = "'.$courseListUrl.'?session_id="+sessionId;
+                window.location = "'.$courseListUrl.'?session_id="+sessionId;
+            });
         });
-    });
     </script>';
 
+    $actions = Display::toolbarAction('toolbar', [$actions1, $actions2, $actions3, $actions4], [2, 4, 4, 2]);
+
     if (isset($_GET['session_id']) && !empty($_GET['session_id'])) {
         // Create a sortable table with the course data filtered by session
         $table = new SortableTable('courses', 'get_number_of_courses', 'get_course_data_by_session', 2);

main/admin/event_controller.php

@@ -70,7 +70,6 @@ $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdm
 $interbreadcrumb[] = array('url' => '#', 'name' => get_lang('Events'));
 
 $tpl = new Template($tool_name);
-$tpl->assign('actions', $actions);
 $tpl->assign('message', $message);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

main/admin/skill.php

@@ -17,6 +17,7 @@ $profiles = $em->getRepository('ChamiloSkillBundle:Profile')->findAll();
 $list = $em->getRepository('ChamiloCoreBundle:Skill')->findAll();
 
 $listAction = api_get_self();
+$toolbarAction = '';
 
 $action = '';
 if (isset($_GET['action']) && in_array($_GET['action'], ['add', 'edit', 'delete'])) {
@@ -60,7 +61,7 @@ $tpl = new Template($action);
 switch ($action) {
     case 'edit':
         $tpl->assign('form', $formToDisplay);
-        $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+        $toolbarAction = Display::toolbarAction('toolbar', [Display::url(get_lang('List'), $listAction)]);
 
         if ($form->validate()) {
             $values = $form->exportValues();
@@ -76,7 +77,8 @@ switch ($action) {
 
         break;
     case 'delete':
-        $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+        $toolbarAction = Display::toolbarAction('toolbar', [Display::url(get_lang('List'), $listAction)]);
+
         $em->remove($item);
         $em->flush();
         header('Location: '.$listAction);
@@ -90,5 +92,6 @@ switch ($action) {
 $tpl->assign('list', $list);
 $view = $tpl->get_template('admin/skill.tpl');
 $contentTemplate = $tpl->fetch($view);
+$tpl->assign('actions', $toolbarAction);
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();

main/admin/skill_badge.php

@@ -35,13 +35,15 @@ $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', $actions);
+$tpl->assign(
+    'actions',
+    Display::toolbarAction('toolbar', [$toolbar])
+);
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();

main/admin/skill_badge_create.php

@@ -115,13 +115,15 @@ $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', $actions);
+$tpl->assign(
+    'actions',
+    Display::toolbarAction('toolbar', [$toolbar])
+);
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();

main/admin/skill_badge_list.php

@@ -46,14 +46,16 @@ $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', $actions);
+$tpl->assign(
+    'actions',
+    Display::toolbarAction('toolbar', [$toolbar])
+);
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();
 

main/admin/skill_level.php

@@ -73,11 +73,11 @@ switch ($action) {
             header('Location: '.$listAction);
             exit;
         }
-        $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+        $toolbarAction = Display::url(get_lang('List'), $listAction);
         break;
     case 'edit':
         $tpl->assign('form', $formToDisplay);
-        $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+        $toolbarAction = Display::url(get_lang('List'), $listAction);
 
         if ($form->validate()) {
             $values = $form->exportValues();
@@ -94,7 +94,7 @@ switch ($action) {
         }
         break;
     case 'delete':
-        $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+        $toolbarAction = Display::url(get_lang('List'), $listAction);
         $em->remove($item);
         $em->flush();
         header('Location: '.$listAction);
@@ -102,11 +102,15 @@ switch ($action) {
 
         break;
     default:
-        $tpl->assign('actions', Display::url(get_lang('Add'), api_get_self().'?action=add'));
+        $toolbarAction = Display::url(get_lang('Add'), api_get_self().'?action=add');
 }
 
 $tpl->assign('list', $list);
 $templateName = $tpl->get_template('admin/skill_level.tpl');
 $contentTemplate = $tpl->fetch($templateName);
+$tpl->assign(
+    'actions',
+    Display::toolbarAction('toolbar', [$toolbarAction])
+);
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();

main/admin/skill_list.php

@@ -144,7 +144,6 @@ 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 +178,10 @@ switch ($action) {
         $templateName = $tpl->get_template('skill/list.tpl');
         $content = $tpl->fetch($templateName);
 
-        $tpl->assign('actions', $actions);
+        $tpl->assign(
+            'actions',
+            Display::toolbarAction('toolbar', [$toolbar], [12])
+        );
         $tpl->assign('content', $content);
         $tpl->display_one_col_template();
 

main/admin/skill_profile.php

@@ -47,6 +47,8 @@ $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdm
 $interbreadcrumb[] = array('url' => 'skill.php', 'name' => get_lang('ManageSkillsLevels'));
 $interbreadcrumb[] = array('url' =>  api_get_self(), 'name' => get_lang('SkillProfile'));
 
+$toolbar = null;
+
 $tpl = new Template($action);
 switch ($action) {
     case 'move_up':
@@ -87,11 +89,11 @@ switch ($action) {
             header('Location: '.$listAction);
             exit;
         }
-        $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+        $toolbar = Display::url(get_lang('List'), $listAction);
         break;
     case 'edit':
         $tpl->assign('form', $formToDisplay);
-        $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+        $toolbar = Display::url(get_lang('List'), $listAction);
 
         if ($form->validate()) {
             $values = $form->exportValues();
@@ -104,7 +106,7 @@ switch ($action) {
 
         break;
     case 'delete':
-        $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+        $toolbar = Display::url(get_lang('List'), $listAction);
         $em->remove($item);
         $em->flush();
         header('Location: '.$listAction);
@@ -112,11 +114,19 @@ switch ($action) {
 
         break;
     default:
-        $tpl->assign('actions', Display::url(get_lang('Add'), api_get_self().'?action=add'));
+        $toolbar = Display::url(get_lang('Add'), api_get_self().'?action=add');
 }
 
 $tpl->assign('list', $list);
 $templateName = $tpl->get_template('admin/skill_profile.tpl');
 $contentTemplate = $tpl->fetch($templateName);
+
+if ($toolbar) {
+    $tpl->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$toolbar])
+    );
+}
+
 $tpl->assign('content', $contentTemplate);
 $tpl->display_one_col_template();

main/admin/teachers_time_by_session_report.php

@@ -176,21 +176,6 @@ $interbreadcrumb[] = [
     'name' => get_lang('FollowedSessions')
 ];
 
-$actions = [];
-
-if ($session) {
-    $actions = [
-        Display::url(
-            Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
-            api_get_self() . '?' . http_build_query(['export' => 'csv', 'session' => $session->getId()])
-        ),
-        Display::url(
-            Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), [], ICON_SIZE_MEDIUM),
-            api_get_self() . '?' . http_build_query(['export' => 'xls', 'session' => $session->getId()])
-        )
-    ];
-}
-
 $view = new Template($toolName);
 $view->assign('form', $form->returnForm());
 
@@ -198,12 +183,25 @@ if ($session) {
     $view->assign('session', ['id' => $session->getId(), 'name' => $session->getName()]);
     $view->assign('courses', $coursesInfo);
     $view->assign('users', $usersInfo);
+
+    $actions = Display::url(
+        Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
+        api_get_self() . '?' . http_build_query(['export' => 'csv', 'session' => $session->getId()])
+    );
+    $actions .= Display::url(
+        Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), [], ICON_SIZE_MEDIUM),
+        api_get_self() . '?' . http_build_query(['export' => 'xls', 'session' => $session->getId()])
+    );
+
+    $view->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$actions])
+    );
 }
 
 $template = $view->get_template('admin/teachers_time_by_session_report.tpl');
 $content = $view->fetch($template);
 
 $view->assign('header', $toolName);
-$view->assign('actions', implode(' ', $actions));
 $view->assign('content', $content);
 $view->display_one_col_template();

main/admin/user_add.php

@@ -469,7 +469,6 @@ if (!empty($message)){
 $content = $form->returnForm();
 
 $tpl = new Template($tool_name);
-//$tpl->assign('actions', $actions);
 $tpl->assign('message', $message);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

main/admin/user_list.php

@@ -973,14 +973,10 @@ if ($table->get_total_number_of_items() == 0) {
         }
     }
 }
-$toolbarActions = Display::toolbarAction(
-    'toolbarUser',
-    array($actionsLeft, $actionsCenter, $actionsRight),
-    3
-);
+$toolbarActions = Display::toolbarAction('toolbarUser', [$actionsLeft, $actionsCenter, $actionsRight], [4, 4, 4]);
 
 $tpl = new Template($tool_name);
-//$tpl->assign('actions', $toolbarActions);
+$tpl->assign('actions', $toolbarActions);
 $tpl->assign('message', $message);
-$tpl->assign('content', $toolbarActions.$form.$table_result.$extra_search_options);
+$tpl->assign('content', $form.$table_result.$extra_search_options);
 $tpl->display_one_col_template();

main/announcements/announcements.php

@@ -667,7 +667,7 @@ if ($allowToEdit) {
 }
 
 if ($show_actions) {
-    echo Display::toolbarAction('toolbar', array($actionsLeft, $searchFormToString), 2, false);
+    echo Display::toolbarAction('toolbar', array($actionsLeft, $searchFormToString));
 }
 
 echo $content;

main/attendance/attendance_sheet.php

@@ -110,7 +110,7 @@ if (api_is_allowed_to_edit(null, true) ||
             Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
         $actionsRight = $form->returnForm();
-        $toolbar = Display::toolbarAction('toolbar-attendance', array($actionsLeft, $actionsRight), 2, false);
+        $toolbar = Display::toolbarAction('toolbar-attendance', array($actionsLeft, $actionsRight));
         echo $toolbar;
     }
 

main/auth/profile.php

@@ -703,18 +703,14 @@ if ($form->validate()) {
 
 // the header
 
-$actions = null;
+$actions = '';
 if (api_get_setting('allow_social_tool') !== 'true') {
     if (api_get_setting('extended_profile') === 'true') {
-        $actions .= '<div class="actions">';
-
-        if (api_get_setting('allow_social_tool') === 'true' &&
+        if (
             api_get_setting('allow_message_tool') === 'true'
         ) {
             $actions .= '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php">'.
                 Display::return_icon('shared_profile.png', get_lang('ViewSharedProfile')).'</a>';
-        }
-        if (api_get_setting('allow_message_tool') === 'true') {
             $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
                 Display::return_icon('inbox.png', get_lang('Messages')).'</a>';
         }
@@ -727,14 +723,19 @@ if (api_get_setting('allow_social_tool') !== 'true') {
             $actions .= '<a href="profile.php?type=extended'.$show.'">'.
                 Display::return_icon('edit.png', get_lang('EditExtendProfile'), '', 16).'</a>';
         }
-        $actions .= '</div>';
     }
 }
 
 $show_delete_account_button = api_get_setting('platform_unsubscribe_allowed') === 'true' ? true : false;
 
 $tpl = new Template(get_lang('ModifyProfile'));
-$tpl->assign('actions', $actions);
+
+if ($actions) {
+    $tpl->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$actions])
+    );
+}
 
 SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'messages');
 

main/auth/unsubscribe_account.php

@@ -27,7 +27,6 @@ if ($form->validate()) {
 }
 
 $tpl = new Template($tool_name);
-$tpl->assign('actions', $actions);
 $tpl->assign('message', $message);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

main/blog/blog.php

@@ -234,25 +234,24 @@ $interbreadcrumb[] = array(
     'name' => Blog::getBlogTitle($blog_id),
 );
 
-$actionsLeft = [];
-$actionsLeft[] = Display::url(
+$actionsLeft = Display::url(
     Display::return_icon('blog.png', get_lang('Home'), '', ICON_SIZE_MEDIUM),
     api_get_self().'?blog_id='.$blog_id.'&'.api_get_cidreq()
 );
 if (api_is_allowed('BLOG_'.$blog_id, 'article_add')) {
-    $actionsLeft[] = Display::url(
+    $actionsLeft .= Display::url(
         Display::return_icon('new_article.png', get_lang('NewPost'), '', ICON_SIZE_MEDIUM),
         api_get_self().'?action=new_post&blog_id='.$blog_id
     );
 }
 if (api_is_allowed('BLOG_'.$blog_id, 'task_management')) {
-    $actionsLeft[] = Display::url(
+    $actionsLeft .= Display::url(
         Display::return_icon('blog_tasks.png', get_lang('TaskManager'), '', ICON_SIZE_MEDIUM),
         api_get_self().'?action=manage_tasks&blog_id='.$blog_id
     );
 }
 if (api_is_allowed('BLOG_'.$blog_id, 'member_management')) {
-    $actionsLeft[] = Display::url(
+    $actionsLeft .= Display::url(
         Display::return_icon('blog_admin_users.png', get_lang('MemberManager'), '', ICON_SIZE_MEDIUM),
         api_get_self().'?action=manage_members&blog_id='.$blog_id
     );
@@ -439,6 +438,13 @@ switch ($action) {
 
 $content = Display::return_introduction_section(TOOL_BLOGS);
 $content .= $tpl->fetch($blogLayout);
-$tpl->assign('actions', implode(PHP_EOL, $actionsLeft));
+
+if ($actionsLeft) {
+    $tpl->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$actionsLeft])
+    );
+}
+
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

main/course_progress/thematic.php

@@ -46,7 +46,7 @@ if (api_is_allowed_to_edit(null, true)) {
                 Display::return_icon('new_course_progress.png', get_lang('NewThematicSection'), '', ICON_SIZE_MEDIUM).'</a>';
     }
     
-    $toolbar= Display::toolbarAction('thematic-bar', array(0 => $actionLeft));
+    $toolbar= Display::toolbarAction('thematic-bar', array($actionLeft));
 }
 
 

main/document/record_audio.php

@@ -159,6 +159,9 @@ $template->assign('user_id', api_get_user_id());
 $layout = $template->get_template('document/record_audio.tpl');
 $content = $template->fetch($layout);
 
-$template->assign('actions', $actions);
+$template->assign(
+    'actions',
+    Display::toolbarAction('toolbar', [$actions])
+);
 $template->assign('content', $content);
 $template->display_one_col_template();

main/document/recycle.php

@@ -56,7 +56,10 @@ $interbreadcrumb[] = array(
 );
 $template = new Template(get_lang('DeletedDocuments'));
 $template->assign('files', $files);
-$template->assign('actions', $actions);
+$template->assign(
+    'actions',
+    Display::toolbarAction('toolbar', [$actions])
+);
 $template->assign('web_cid_query', api_get_cidreq());
 $templateName = $template->get_template('document/recycle.tpl');
 $content = $template->fetch($templateName);

main/document/slideshowoptions.php

@@ -41,7 +41,7 @@ $url = 'slideshowoptions.php?curdirpath='.$pathurl;
 $originaltoolname = '<b>'.get_lang('SlideshowOptions').'</b>';
 $interbreadcrumb[] = array('url' => $url, 'name' => $originaltoolname );
 
-Display::display_header($originalToolName, 'Doc');
+Display::display_header($originaltoolname, 'Doc');
 $image_resizing = isset($_SESSION['image_resizing']) ? $_SESSION['image_resizing'] : null;
 
 ?>
@@ -65,7 +65,7 @@ window.onload = <?php echo $image_resizing == 'resizing' ? 'enableresizing' : 'd
 <?php
 $actions = '<a href="document.php?action=exit_slideshow&curdirpath='.$pathurl.'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('DocumentsOverview'),'',ICON_SIZE_MEDIUM).'</a>';
 $actions .= '<a href="slideshow.php?curdirpath='.$pathurl.'">'.Display::return_icon('slideshow.png',get_lang('BackTo').' '.get_lang('SlideShow'),'',ICON_SIZE_MEDIUM).'</a>';
-Display::toolbarAction('toolbar-slideshow', $content)
+echo Display::toolbarAction('toolbar-slideshow', [$actions])
 ?>
 <div class="panel panel-default">
     <div class="panel-body">

main/document/upload.php

@@ -225,7 +225,7 @@ if ($is_certificate_mode) {
 }
 
 // Link to create a folder
-echo $toolbar = Display::toolbarAction('toolbar-upload', array($actions), 1);
+echo $toolbar = Display::toolbarAction('toolbar-upload', array($actions));
 // Form to select directory
 $folders = DocumentManager::get_all_document_folders(
     $_course,

main/forum/editthread.php

@@ -142,14 +142,13 @@ $htmlHeadXtra[] = <<<JS
 JS;
 
 // Action links
-$actions = '
-    <div class="actions">
-        <span class="pull-right">'.search_link().'</span>
-        <a href="viewforum.php?forum='.$forumId.'&'.$cidreq.'">'
-            .Display::return_icon('back.png',get_lang('BackToForum'),'',ICON_SIZE_MEDIUM)
-        .'</a>
-    </div>
-';
+$actions = [
+    Display::url(
+        Display::return_icon('back.png', get_lang('BackToForum'), '', ICON_SIZE_MEDIUM),
+        'viewforum.php?forum='.$forumId.'&'.$cidreq
+    ),
+    search_link()
+];
 
 $threadData = getThreadInfo($threadId, $cId);
 
@@ -267,6 +266,9 @@ if ($form->validate()) {
 $orginIsLearpath = $origin == 'learnpath';
 
 $view = new Template('', !$orginIsLearpath, !$orginIsLearpath, $orginIsLearpath, $orginIsLearpath);
-$view->assign('actions', $actions);
+$view->assign(
+    'actions',
+    Display::toolbarAction('toolbar', $actions)
+);
 $view->assign('content', $form->returnForm());
 $view->display_one_col_template();

main/group/group.php

@@ -211,7 +211,7 @@ if (api_is_allowed_to_edit(false, true)) {
 }
 
 $actionsRight = GroupManager::getSearchForm();
-$toolbar = Display::toolbarAction('toolbar-groups', $content = array($actionsLeft, $actionsRight));
+$toolbar = Display::toolbarAction('toolbar-groups', array($actionsLeft, $actionsRight));
 $group_cats = GroupManager::get_categories(api_get_course_id());
 
 echo $toolbar;

main/inc/lib/agenda.lib.php

@@ -3063,9 +3063,7 @@ class Agenda
 
         $toolbar = Display::toolbarAction(
             'toolbar-agenda',
-            array(0 => $actionsLeft, 1 => $actionsRight),
-            2,
-            false
+            array($actionsLeft, $actionsRight)
         );
 
         return $toolbar;

main/inc/lib/glossary.lib.php

@@ -413,7 +413,7 @@ class GlossaryManager
 
         $toolbar = Display::toolbarAction(
             'toolbar-document',
-            array(0 => $actionsLeft, 1 => $actionsRight)
+            array($actionsLeft, $actionsRight)
         );
 
         $content = $toolbar;

main/lp/lp_list.php

@@ -104,7 +104,7 @@ if ($is_allowed_to_edit) {
             '../upload/upload_ppt.php?'.api_get_cidreq().'&curdirpath=/&tool='.TOOL_LEARNPATH
         );
     }
-    $actions = Display::toolbarAction('actions-lp', array(0 => $actionLeft) );
+    $actions = Display::toolbarAction('actions-lp', array($actionLeft));
 }
 
 $token = Security::get_token();

main/lp/lp_report.php

@@ -130,6 +130,9 @@ $template->assign('lp_id', $lpId);
 $layout = $template->get_template('learnpath/report.tpl');
 
 $template->assign('header', $lpInfo['name']);
-$template->assign('actions', $actions);
+$template->assign(
+    'actions',
+    Display::toolbarAction('lp_actions', [$actions])
+);
 $template->assign('content', $template->fetch($layout));
 $template->display_one_col_template();

main/messages/inbox.php

@@ -175,17 +175,19 @@ if (!isset($_GET['del_msg'])) {
 }
 
 $tpl = new Template(null);
+
+if ($actions) {
+    $tpl->assign('actions', Display::toolbarAction('toolbar', [$actions]));
+}
 // Block Social Avatar
 SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'messages');
 if (api_get_setting('allow_social_tool') == 'true') {
-    $tpl->assign('actions', $actions);
     $tpl->assign('social_menu_block', $social_menu_block);
     $tpl->assign('social_right_content', $social_right_content);
     $social_layout = $tpl->get_template('social/inbox.tpl');
     $tpl->display($social_layout);
 } else {
     $content = $social_right_content;
-    $tpl->assign('actions', $actions);
     $tpl->assign('message', $show_message);
     $tpl->assign('content', $content);
     $tpl->display_one_col_template();

main/messages/outbox.php

@@ -150,7 +150,14 @@ if (api_get_setting('allow_social_tool') == 'true') {
     $tpl->display($social_layout);
 } else {
     $content = $social_right_content;
-    $tpl->assign('actions', $actions);
+
+    if ($actions) {
+        $tpl->assign(
+            'actions',
+            Display::toolbarAction('toolbar', [$actions])
+        );
+    }
+
     $tpl->assign('content', $content);
     $tpl->display_one_col_template();
 }

main/mySpace/works_in_session_report.php

@@ -152,19 +152,17 @@ $interbreadcrumb[] = [
     'name' => get_lang('MySpace')
 ];
 
-$actions = [];
+$actions = null;
 
 if ($session) {
-    $actions = [
-        Display::url(
-            Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
-            api_get_self() . '?' . http_build_query(['export' => 'csv', 'session' => $session->getId()])
-        ),
-        Display::url(
-            Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), [], ICON_SIZE_MEDIUM),
-            api_get_self() . '?' . http_build_query(['export' => 'xls', 'session' => $session->getId()])
-        )
-    ];
+    $actions = Display::url(
+        Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
+        api_get_self() . '?' . http_build_query(['export' => 'csv', 'session' => $session->getId()])
+    );
+    $actions .=Display::url(
+        Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), [], ICON_SIZE_MEDIUM),
+        api_get_self() . '?' . http_build_query(['export' => 'xls', 'session' => $session->getId()])
+    );
 }
 
 $view = new Template($toolName);
@@ -180,6 +178,13 @@ $template = $view->get_template('my_space/works_in_session_report.tpl');
 $content = $view->fetch($template);
 
 $view->assign('header', $toolName);
+
+if ($actions) {
+    $view->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$actions])
+    );
+}
+
 $view->assign('content', $content);
-$view->assign('actions', implode(' ', $actions));
 $view->display_one_col_template();

main/social/myfiles.php

@@ -73,22 +73,10 @@ $social_menu_block = SocialManager::show_social_menu('myfiles');
 $actions = null;
 
 if (isset($_GET['cidReq'])) {
-    $actions = '<a href="' . api_get_path(
-            WEB_CODE_PATH
-        ) . 'document/document.php?cidReq=' . Security::remove_XSS(
-            $_GET['cidReq']
-        ) . '&amp;id_session=' . Security::remove_XSS(
-            $_GET['id_session']
-        ) . '&amp;gidReq=' . Security::remove_XSS(
-            $_GET['gidReq']
-        ) . '&amp;id=' . Security::remove_XSS(
-            $_GET['parent_id']
-        ) . '">' . Display::return_icon(
-            'back.png',
-            get_lang('BackTo') . ' ' . get_lang('Documents') . ' (' . get_lang(
-                'Course'
-            ) . ')'
-        ) . '</a>';
+    $actions = Display::url(
+        Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('Documents').' ('.get_lang('Course').')'),
+        api_get_self().'?'.api_get_cidreq().'&id='.$_GET['parent_id']
+    );
 }
 
 if (api_get_setting('allow_social_tool') == 'true') {
@@ -122,7 +110,10 @@ if (api_get_setting('allow_social_tool') == 'true') {
     $tpl->display($social_layout);
 } else {
     $controller = new IndexManager(get_lang('MyCourses'));
-    $tpl->assign('actions', $actions);
+    $tpl->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$actions])
+    );
     $tpl->assign('content', $editor);
     $tpl->assign('profile_block', $controller->return_profile_block());
     $tpl->assign('user_image_block', $controller->return_user_image_block());

main/timeline/index.php

@@ -62,7 +62,7 @@ $(function() {
     '.Display::grid_js('timelines',  $url,$columns,$column_model,$extra_params, array(), null,true).'
 });
 </script>';
-
+$toolbarAction = '';
 $timeline = new Timeline();
 
 // Action handling: Add

main/timeline/view.php

@@ -29,7 +29,6 @@ $htmlHeadXtra[] = '
 $content = '<div class="timeline-example"><div id="timeline"></div></div>';
 
 $tpl = new Template($tool_name);
-$tpl->assign('actions', $actions);
 $tpl->assign('message', $message);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

main/tracking/courseLog.php

@@ -259,7 +259,7 @@ $form_search->addElement('hidden', 'session_id', $sessionId);
 $form_search->addElement('hidden', 'id_session', $sessionId);
 $form_search->addElement('text', 'user_keyword');
 $form_search->addButtonSearch(get_lang('SearchUsers'));
-echo Display::toolbarAction('toolbar-courselog', [$actionsLeft, $form_search->returnForm(), $actionsRight], 3);
+echo Display::toolbarAction('toolbar-courselog', [$actionsLeft, $form_search->returnForm(), $actionsRight]);
 
 $course_name = get_lang('Course').' '.$courseInfo['name'];
 if ($session_id) {

main/user/subscribe_user.php

@@ -204,7 +204,7 @@ $form->addText('keyword', '', false);
 $form->addElement('hidden', 'type', $type);
 $form->addElement('hidden', 'cidReq', api_get_course_id());
 $form->addButtonSearch(get_lang('Search'));
-echo Display::toolbarAction('toolbar-subscriber', [$actionsLeft.$extraForm, $form->returnForm()]);
+echo Display::toolbarAction('toolbar-subscriber', [$actionsLeft, $extraForm, $form->returnForm()], [4, 4, 4]);
 
 $option = $type == COURSEMANAGER ? 2 : 1;
 echo UserManager::getUserSubscriptionTab($option);

main/work/view.php

@@ -160,10 +160,9 @@ if ((user_is_author($id) || $isDrhOfCourse || (api_is_allowed_to_edit() || api_i
         $tpl->assign('work', $work);
         $tpl->assign('comments', $comments);
 
-        $actions = '';
         if (isset($work['contains_file'])) {
             if (isset($work['download_url'])) {
-                $actions .= Display::url(
+                $actions = Display::url(
                     Display::return_icon(
                         'save.png',
                         get_lang('Download'),
@@ -195,10 +194,14 @@ if ((user_is_author($id) || $isDrhOfCourse || (api_is_allowed_to_edit() || api_i
                         );
                     }
                 }
+
+                $tpl->assign(
+                    'actions',
+                    Display::toolbarAction('toolbar', [$actions])
+                );
             }
         }
 
-        $tpl->assign('actions', $actions);
         if (api_is_allowed_to_session_edit()) {
             $tpl->assign('form', $commentForm);
         }

main/work/work_list.php

@@ -82,7 +82,7 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !api_is_in
 
 $tpl = new Template('');
 
-$content = Display::toolbarAction('toolbar-work', array($actionsLeft . $actionsRight));
+$content = Display::toolbarAction('toolbar-work', array($actionsLeft, $actionsRight));
 if (!empty($my_folder_data['title'])) {
     $content .= Display::page_subheader($my_folder_data['title']);
 }

main/work/work_list_all.php

@@ -197,7 +197,7 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !$isDrhOfC
     $actionsLeft .= Display::toolbarButton(get_lang('DeleteCorrections'), $url, 'remove', 'danger');
 }
 
-echo Display::toolbarAction('toolbar-worklist', array($actionsLeft), 1);
+echo Display::toolbarAction('toolbar-worklist', array($actionsLeft), [12]);
 
 if (!empty($my_folder_data['title'])) {
     echo Display::page_subheader($my_folder_data['title']);

news_list.php

@@ -5,12 +5,6 @@
 require_once 'main/inc/global.inc.php';
 $tool_name = get_lang('SystemAnnouncements');
 
-$actions = '';
-if (api_is_platform_admin()) {
-    $actions = '<a href="'.api_get_path(WEB_PATH).'main/admin/system_announcements.php">'.
-        Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), array(), 32).'</a>';
-}
-
 if (api_is_anonymous()) {
     $visibility = SystemAnnouncementManager::VISIBLE_GUEST;
 } else {
@@ -24,7 +18,18 @@ if (!isset($_GET['id']) || empty($_GET['id'])) {
 }
 
 $tpl = new Template($tool_name);
-$tpl->assign('actions', $actions);
-//$tpl->assign('message', $message);
+
+if (api_is_platform_admin()) {
+    $actionEdit = Display::url(
+        Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), [], ICON_SIZE_MEDIUM),
+        api_get_path(WEB_PATH).'main/admin/system_announcements.php'
+    );
+
+    $tpl->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$actionEdit])
+    );
+}
+
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

plugin/bbb/admin.php

@@ -36,8 +36,6 @@ $form->addDatePicker('search_meeting_end', get_lang('DateEnd'));
 $form->addButtonSearch(get_lang('Search'));
 $form->setDefaults($dateRange);
 
-$actions = [];
-
 if ($form->validate()) {
     $dateRange = $form->getSubmitValues();
 }
@@ -107,10 +105,9 @@ $tpl->assign('meetings', $meetings);
 $tpl->assign('search_form', $form->returnForm());
 
 $content = $tpl->fetch('bbb/admin.tpl');
-$actions = [];
 
 if ($meetings) {
-    $actions[] = Display::toolbarButton(
+    $actions = Display::toolbarButton(
         get_lang('ExportInExcel'),
         api_get_self().'?'.http_build_query([
             'action' => 'export',
@@ -120,9 +117,13 @@ if ($meetings) {
         'file-excel-o',
         'success'
     );
+
+    $tpl->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$actions])
+    );
 }
 
 $tpl->assign('header', $plugin->get_lang('RecordList'));
-$tpl->assign('actions', implode('', $actions));
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

plugin/bbb/listing.php

@@ -189,16 +189,17 @@ $listing_tpl = 'bbb/listing.tpl';
 $content = $tpl->fetch($listing_tpl);
 
 if (api_is_platform_admin()) {
-    $actionLinks = [
-        Display::toolbarButton(
-            $plugin->get_lang('AdminView'),
-            api_get_path(WEB_PLUGIN_PATH) . 'bbb/admin.php',
-            'list',
-            'primary'
-        )
-    ];
-
-    $tpl->assign('actions', implode(PHP_EOL, $actionLinks));
+    $actionLinks = Display::toolbarButton(
+        $plugin->get_lang('AdminView'),
+        api_get_path(WEB_PLUGIN_PATH) . 'bbb/admin.php',
+        'list',
+        'primary'
+    );
+
+    $tpl->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$actionLinks])
+    );
 }
 
 $tpl->assign('content', $content);

plugin/buycourses/src/course_panel.php

@@ -55,7 +55,10 @@ $tpl->assign('sale_list', $saleList);
 
 $content = $tpl->fetch('buycourses/view/course_panel.tpl');
 
-$tpl->assign('actions', $toolbar);
+$tpl->assign(
+    'actions',
+    Display::toolbarAction('toolbar', [$toolbar])
+);
 $tpl->assign('header', $templateName);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

plugin/buycourses/src/payout_panel.php

@@ -51,7 +51,10 @@ $tpl->assign('payout_list', $payoutList);
 
 $content = $tpl->fetch('buycourses/view/payout_panel.tpl');
 
-$tpl->assign('actions', $toolbar);
+$tpl->assign(
+    'actions',
+    Display::toolbarAction('toolbar', [$toolbar])
+);
 $tpl->assign('header', $templateName);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

plugin/buycourses/src/sales_report.php

@@ -139,11 +139,8 @@ $templateName = $plugin->get_lang('SalesReport');
 
 $template = new Template($templateName);
 
-$toolbar = '';
-
 if ($paypalEnable == "true" && $commissionsEnable == "true") {
-
-    $toolbar .= Display::toolbarButton(
+    $toolbar = Display::toolbarButton(
         $plugin->get_lang('PaypalPayoutCommissions'),
         api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/paypal_payout.php',
         'paypal',
@@ -151,13 +148,14 @@ if ($paypalEnable == "true" && $commissionsEnable == "true") {
         ['title' => $plugin->get_lang('PaypalPayoutCommissions')]
     );
 
-    $template->assign('actions', $toolbar);
-
+    $template->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$toolbar])
+    );
 }
 
 if ($commissionsEnable == "true") {
-
-    $toolbar .= Display::toolbarButton(
+    $toolbar = Display::toolbarButton(
         $plugin->get_lang('PayoutReport'),
         api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/payout_report.php',
         'money',
@@ -165,8 +163,10 @@ if ($commissionsEnable == "true") {
         ['title' => $plugin->get_lang('PayoutReport')]
     );
 
-    $template->assign('actions', $toolbar);
-
+    $template->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$toolbar])
+    );
 }
 $template->assign('form', $form->returnForm());
 $template->assign('selected_sale', $selectedSale);

plugin/buycourses/src/service_panel.php

@@ -69,7 +69,10 @@ if ($servicesOnly) {
 
 $content = $tpl->fetch('buycourses/view/service_panel.tpl');
 
-$tpl->assign('actions', $toolbar);
+$tpl->assign(
+    'actions',
+    Display::toolbarAction('toolbar', [$toolbar])
+);
 $tpl->assign('header', $templateName);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

plugin/buycourses/src/service_sales_report.php

@@ -51,11 +51,8 @@ $templateName = $plugin->get_lang('SalesReport');
 
 $template = new Template($templateName);
 
-$toolbar = '';
-
 if ($paypalEnable == 'true' && $commissionsEnable == 'true') {
-
-    $toolbar .= Display::toolbarButton(
+    $toolbar = Display::toolbarButton(
         $plugin->get_lang('PaypalPayoutCommissions'),
         api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/paypal_payout.php',
         'paypal',
@@ -63,13 +60,14 @@ if ($paypalEnable == 'true' && $commissionsEnable == 'true') {
         ['title' => $plugin->get_lang('PaypalPayoutCommissions')]
     );
 
-    $template->assign('actions', $toolbar);
-
+    $template->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$toolbar])
+    );
 }
 
 if ($commissionsEnable == 'true') {
-
-    $toolbar .= Display::toolbarButton(
+    $toolbar = Display::toolbarButton(
         $plugin->get_lang('PayoutReport'),
         api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/payout_report.php',
         'money',
@@ -77,8 +75,10 @@ if ($commissionsEnable == 'true') {
         ['title' => $plugin->get_lang('PayoutReport')]
     );
 
-    $template->assign('actions', $toolbar);
-
+    $template->assign(
+        'actions',
+        Display::toolbarAction('toolbar', [$toolbar])
+    );
 }
 $template->assign('form', $form->returnForm());
 $template->assign('showing_services', true);

plugin/buycourses/src/session_panel.php

@@ -56,7 +56,10 @@ $tpl->assign('sale_list', $saleList);
 
 $content = $tpl->fetch('buycourses/view/session_panel.tpl');
 
-$tpl->assign('actions', $toolbar);
+$tpl->assign(
+    'actions',
+    Display::toolbarAction('toolbar', [$toolbar])
+);
 $tpl->assign('header', $templateName);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();

plugin/vchamilo/views/manage.controller.php

@@ -162,7 +162,6 @@ switch ($action) {
                 $content .= '</div>';
 
                 $tpl = new Template(get_lang('Snapshot'), true, true, false, true, false);
-                $tpl->assign('actions', '');
                 $tpl->assign('message', '<h4>'.$plugin->get_lang('vchamilosnapshot1').'</h4>');
                 $tpl->assign('content', $content);
                 $tpl->display_one_col_template();
@@ -227,7 +226,6 @@ switch ($action) {
                     }
 
                     $tpl = new Template(get_lang('Snapshot'), true, true, false, true, false);
-                    $tpl->assign('actions', '');
                     $tpl->assign('message', '<h4>'.$message.'</h4>');
                     $tpl->assign('content', $content);
                     $tpl->display_one_col_template();
@@ -290,7 +288,6 @@ switch ($action) {
                 $content .= '</form>';
 
                 $tpl = new Template(get_lang('Snapshot'), true, true, false, true, false);
-                $tpl->assign('actions', '');
                 $tpl->assign('message', $plugin->get_lang('vchamilosnapshot3'));
                 $tpl->assign('content', $content);
                 $tpl->display_one_col_template();

plugin/vchamilo/views/syncparams.php

@@ -58,7 +58,6 @@ $content  = '<form name="settingsform" action="'.$thisurl.'">';
 $content .= '<input type="hidden" name="what" value="" />';
 $content .=  $table->toHtml();
 $content .=  '</form>';
-$actions = '';
 
 Display::addFlash(Display::return_message($plugin->get_lang('Sync your master settings to all instances.')));
 
@@ -80,6 +79,5 @@ function ajax_sync_setting(settingid) {
 </script>";
 
 $tpl = new Template($plugin->get_lang('SyncSettings'), true, true, false, true, false);
-$tpl->assign('actions', $actions);
 $tpl->assign('content', $content);
 $tpl->display_one_col_template();