Minor - Replace div actions with Display::toolbarAction

4 years ago · c312e4c9df
parent 7fabbe4754
commit c312e4c9df
27 changed files with 100 additions and 136 deletions
--- a/public/main/exercise/category.php
+++ b/public/main/exercise/category.php
@ -97,10 +97,9 @@ switch ($action) {
            header('Location: '.$url);
            exit;
        } else {
-            $content = '<div class="actions">';
-            $content .= '<a href="'.$url.'">'.
+            $actions = '<a href="'.$url.'">'.
                Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
-            $content .= '</div>';
+            $content .= Display::toolbarAction('toolbar', [$actions]);
            $form->addElement('hidden', 'sec_token');
            $form->setConstants(['sec_token' => $token]);
            $content .= $form->returnForm();
@ -122,10 +121,9 @@ switch ($action) {
            header('Location: '.$url);
            exit;
        } else {
-            $content = '<div class="actions">';
-            $content .= '<a href="'.$url.'">'.
+            $actions = '<a href="'.$url.'">'.
                Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>';
-            $content .= '</div>';
+            $content .= Display::toolbarAction('toolbar', [$actions]);
            $form->addElement('hidden', 'sec_token');
            $form->setConstants(['sec_token' => $token]);
            $content .= $form->returnForm();
--- a/public/main/exercise/exercise_history.php
+++ b/public/main/exercise/exercise_history.php
@ -49,11 +49,9 @@ if (isset($_GET['message'])) {
    }
 }

-echo '<div class="actions">';
-echo '<a href="exercise_report.php?'.api_get_cidreq().'&filter=2">'.
+$actions = '<a href="exercise_report.php?'.api_get_cidreq().'&filter=2">'.
    Display::return_icon('back.png', get_lang('Back to result list'), '', ICON_SIZE_MEDIUM).'</a>';
-echo '</div>';
-
+echo Display::toolbarAction('toolbar', [$actions]);
 ?>

 <table class="table table-hover table-striped data_table">
--- a/public/main/exercise/exercise_question_reminder.php
+++ b/public/main/exercise/exercise_question_reminder.php
@ -105,12 +105,11 @@ if (!$hideHeaderAndFooter) {

 // I'm in a preview mode as course admin. Display the action menu.
 if (!$hideHeaderAndFooter && api_is_course_admin()) {
-    echo '<div class="actions">';
-    echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->iId.'">'.
+    $actions = '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->iId.'">'.
        Display::return_icon('back.png', get_lang('GoBackToQuestionList'), [], 32).'</a>';
-    echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->iId.'">'.
+    $actions .= '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->iId.'">'.
        Display::return_icon('edit.png', get_lang('ModifyExercise'), [], 32).'</a>';
-    echo '</div>';
+    echo Display::toolbarAction('toolbar', [$actions]);
 }
 echo Display::page_header($categoryObj->name);
 echo '<p>'.Security::remove_XSS($categoryObj->description).'</p>';
--- a/public/main/exercise/exercise_reminder.php
+++ b/public/main/exercise/exercise_reminder.php
@ -94,12 +94,11 @@ if (!$hideHeaderAndFooter) {

 // I'm in a preview mode as course admin. Display the action menu.
 if (!$hideHeaderAndFooter && api_is_course_admin()) {
-    echo '<div class="actions">';
-    echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->getId().'">'.
+    $actions = '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->getId().'">'.
        Display::return_icon('back.png', get_lang('Go back to the questions list'), [], 32).'</a>';
-    echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyTest=yes&exerciseId='.$objExercise->getId().'">'.
+    $actions .= '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyTest=yes&exerciseId='.$objExercise->getId().'">'.
        Display::return_icon('edit.png', get_lang('ModifyTest'), [], 32).'</a>';
-    echo '</div>';
+    echo Display::toolbarAction('toolbar', [$actions]);
 }
 echo Display::page_header(get_lang('Questions to be reviewed'));

--- a/public/main/exercise/exercise_submit.php
+++ b/public/main/exercise/exercise_submit.php
@ -1056,15 +1056,15 @@ $show_quiz_edition = $objExercise->added_in_lp();

 // I'm in a preview mode
 if (api_is_course_admin() && !in_array($origin, ['learnpath', 'embeddable'])) {
-    echo '<div class="actions">';
+    $actions = '';
    if (false == $show_quiz_edition) {
-        echo '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
+        $actions .= '<a href="exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->id.'">'.
            Display::return_icon('settings.png', get_lang('Edit test name and settings'), '', ICON_SIZE_MEDIUM).'</a>';
    } else {
-        echo '<a href="#">'.
+        $actions .= '<a href="#">'.
            Display::return_icon('settings_na.png', get_lang('Edit test name and settings'), '', ICON_SIZE_MEDIUM).'</a>';
    }
-    echo '</div>';
+    echo Display::toolbarAction('toolbar', [$actions]);
 }

 $is_visible_return = $objExercise->is_visible(
--- a/public/main/exercise/overview.php
+++ b/public/main/exercise/overview.php
@ -85,11 +85,10 @@ if (!in_array($origin, ['learnpath', 'embeddable', 'mobileapp'])) {
    Display::display_reduced_header();
 }

-if ('mobileapp' == $origin) {
-    echo '<div class="actions">';
-    echo '<a href="javascript:window.history.go(-1);">'.
+if ('mobileapp' === $origin) {
+    $actions = '<a href="javascript:window.history.go(-1);">'.
        Display::return_icon('back.png', get_lang('GoBackToQuestionList'), [], 32).'</a>';
-    echo '</div>';
+    echo Display::toolbarAction('toolbar', [$actions]);
 }

 $html = '';
--- a/public/main/exercise/question_create.php
+++ b/public/main/exercise/question_create.php
@ -97,17 +97,12 @@ if ($form->validate()) {
    header('Location: admin.php?exerciseId='.$values['exercise'].'&newQuestion=yes&isContent='.$values['is_content'].'&answerType='.$answer_type);
    exit;
 } else {
-    // header
    Display::display_header($nameTools);
+    $actions = '<a href="exercise.php?show=test">'.
+        Display::return_icon('back.png', get_lang('BackToTestsList'), '', ICON_SIZE_MEDIUM).'</a>';
+    echo Display::toolbarAction('toolbar', [$actions]);

-    echo '<div class="actions">';
-    echo '<a href="exercise.php?show=test">'.Display::return_icon('back.png', get_lang('BackToTestsList'), '', ICON_SIZE_MEDIUM).'</a>';
-    echo '</div>';
-
-    // displaying the form
    $form->display();
-
-    // footer
    Display::display_footer();
 }

--- a/public/main/exercise/question_pool.php
+++ b/public/main/exercise/question_pool.php
@ -1024,19 +1024,17 @@ $headers = [
 ];

 Display::display_header($nameTools, 'Exercise');
-
-// Menu
-echo '<div class="actions">';
+$actions = '';
 if (isset($fromExercise) && $fromExercise > 0) {
-    echo '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$fromExercise.'">'.
+    $actions .= '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$fromExercise.'">'.
        Display::return_icon('back.png', get_lang('Go back to the questions list'), '', ICON_SIZE_MEDIUM).'</a>';
 } else {
-    echo '<a href="exercise.php?'.api_get_cidreq().'">'.
+    $actions .= '<a href="exercise.php?'.api_get_cidreq().'">'.
        Display::return_icon('back.png', get_lang('BackToTestsList'), '', ICON_SIZE_MEDIUM).'</a>';
-    echo "<a href='admin.php?exerciseId=0'>".
+    $actions .= "<a href='admin.php?exerciseId=0'>".
        Display::return_icon('add_question.gif', get_lang('New question'), '', ICON_SIZE_MEDIUM).'</a>';
 }
-echo '</div>';
+echo Display::toolbarAction('toolbar', [$actions]);

 if ('' != $displayMessage) {
    echo Display::return_message($displayMessage, 'confirm');
--- a/public/main/exercise/result.php
+++ b/public/main/exercise/result.php
@ -92,11 +92,10 @@ if ($show_headers) {
        body { background: none;}
    </style>';

-    if ('mobileapp' == $origin) {
-        echo '<div class="actions">';
-        echo '<a href="javascript:window.history.go(-1);">'.
+    if ('mobileapp' === $origin) {
+        $actions = '<a href="javascript:window.history.go(-1);">'.
            Display::return_icon('back.png', get_lang('GoBackToQuestionList'), [], 32).'</a>';
-        echo '</div>';
+        echo Display::toolbarAction('toolbar', [$actions]);
    }
 }

--- a/public/main/exercise/tests_category.php
+++ b/public/main/exercise/tests_category.php
@ -253,24 +253,23 @@ function add_category_form($action)
 // Display add category button
 function displayActionBar()
 {
-    echo '<div class="actions">';
-    echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq().'">'.
+    $actions = '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq().'">'.
            Display::return_icon('back.png', get_lang('Go back to the questions list'), '', ICON_SIZE_MEDIUM).'</a>';

-    echo '<a href="'.api_get_self().'?action=addcategory&'.api_get_cidreq().'">'.
+    $actions .= '<a href="'.api_get_self().'?action=addcategory&'.api_get_cidreq().'">'.
        Display::return_icon('new_folder.png', get_lang('Add category'), null, ICON_SIZE_MEDIUM).'</a>';

-    echo Display::url(
+    $actions .= Display::url(
        Display::return_icon('export_csv.png', get_lang('CSV export'), [], ICON_SIZE_MEDIUM),
        api_get_self().'?action=export_category&'.api_get_cidreq()
    );

-    echo Display::url(
+    $actions .= Display::url(
        Display::return_icon('import_csv.png', get_lang('Import from a CSV'), [], ICON_SIZE_MEDIUM),
        api_get_self().'?action=import_category&'.api_get_cidreq()
    );

-    echo '</div>';
-    echo '<br/>';
+    echo Display::toolbarAction('toolbar', [$actions]);
+
    echo '<fieldset><legend>'.get_lang('Questions category').'</legend></fieldset>';
 }
--- a/public/main/exercise/upload_exercise.php
+++ b/public/main/exercise/upload_exercise.php
@ -38,11 +38,8 @@ $interbreadcrumb[] = [

 Display::display_header(get_lang('Import quiz from Excel'), 'Exercises');

-echo '<div class="actions">';
-echo lp_upload_quiz_actions();
-echo '</div>';
+echo Display::toolbarAction('toolbar', [lp_upload_quiz_actions()]);

-// the main content
 lp_upload_quiz_main();

 function lp_upload_quiz_actions()
--- a/public/main/forum/editpost.php
+++ b/public/main/forum/editpost.php
@ -248,10 +248,10 @@ if ('learnpath' === $origin) {

 // Action links
 if ('learnpath' !== $origin) {
-    echo '<div class="actions">';
-    echo '<span style="float:right;">'.search_link().'</span>';
+    $actions = '';
+    //$actions .= '<span style="float:right;">'.search_link().'</span>';
    if ('group' === $origin) {
-        echo '<a href="../group/group_space.php?'.api_get_cidreq().'">'.
+        $actions .= '<a href="../group/group_space.php?'.api_get_cidreq().'">'.
            Display::return_icon(
                'back.png',
                get_lang('Back to').' '.get_lang('Groups'),
@ -260,7 +260,7 @@ if ('learnpath' !== $origin) {
            ).
            '</a>';
    } else {
-        echo '<a href="index.php?'.api_get_cidreq().'">'.
+        $actions .= '<a href="index.php?'.api_get_cidreq().'">'.
            Display::return_icon(
                'back.png',
                get_lang('Back toForumOverview'),
@ -269,7 +269,7 @@ if ('learnpath' !== $origin) {
            ).
            '</a>';
    }
-    echo '<a href="viewforum.php?forum='.$forumId.'&'.api_get_cidreq().'">'.
+    $actions .= '<a href="viewforum.php?forum='.$forumId.'&'.api_get_cidreq().'">'.
        Display::return_icon(
            'forum.png',
            get_lang('Back toForum'),
@ -277,7 +277,7 @@ if ('learnpath' !== $origin) {
            ICON_SIZE_MEDIUM
        ).
        '</a>';
-    echo '</div>';
+    echo Display::toolbarAction('toolbar', [$actions]);
 }

 /* Display Forum Category and the Forum information */
--- a/public/main/forum/newthread.php
+++ b/public/main/forum/newthread.php
@ -225,12 +225,10 @@ if ('learnpath' === $origin) {
    Display::display_header();
 }

-// Action links
-echo '<div class="actions">';
-echo '<span style="float:right;">'.search_link().'</span>';
-echo '<a href="viewforum.php?forum='.(int) ($_GET['forum']).'&'.$cidreq.'">'.
+//$actions  '<span style="float:right;">'.search_link().'</span>';
+$actions = '<a href="viewforum.php?forum='.(int) ($_GET['forum']).'&'.$cidreq.'">'.
    Display::return_icon('back.png', get_lang('Back to forum'), '', ICON_SIZE_MEDIUM).'</a>';
-echo '</div>';
+echo Display::toolbarAction('toolbar', [$actions]);

 // Set forum attachment data into $_SESSION
 getAttachedFiles($forumEntity->getIid(), 0, 0);
--- a/public/main/forum/viewforumcategory.php
+++ b/public/main/forum/viewforumcategory.php
@ -168,7 +168,6 @@ if ('learnpath' === $origin) {
    Display::display_header(null);
 }

-/* ACTIONS */
 $whatsnew_post_info = isset($_SESSION['whatsnew_post_info']) ? $_SESSION['whatsnew_post_info'] : null;

 /* Is the user allowed here? */
@ -179,23 +178,20 @@ if (!api_is_allowed_to_edit(false, true) && false === $categoryIsVisible) {
    api_not_allowed();
 }

-/* Action Links */
-$html = '<div class="actions">';
-$html .= '<a href="'.$url.'">'.
+$actions = '<a href="'.$url.'">'.
    Display::return_icon('back.png', get_lang('Back to forum overview'), '', ICON_SIZE_MEDIUM).'</a>';
 if (api_is_allowed_to_edit(false, true)) {
-    $html .= '<a href="'.$mainUrl.'&forumcategory='.$categoryId.'&action=add_forum"> '
+    $actions .= '<a href="'.$mainUrl.'&forumcategory='.$categoryId.'&action=add_forum"> '
        .Display::return_icon('new_forum.png', get_lang('Add a forum'), '', ICON_SIZE_MEDIUM).'</a>';
 }
-$html .= search_link();
-$html .= '</div>';
+$actions .= search_link();

-echo $html;
+echo Display::toolbarAction('toolbar', [$actions]);

 $logInfo = [
    'tool' => TOOL_FORUM,
    'action' => $action,
-    'info' => isset($_GET['content']) ? $_GET['content'] : '',
+    'info' => $_GET['content'] ?? '',
 ];
 Event::registerLog($logInfo);

--- a/public/main/gradebook/gradebook_edit_all.php
+++ b/public/main/gradebook/gradebook_edit_all.php
@ -269,18 +269,17 @@ if (!isset($_GET['exportpdf']) and !isset($_GET['export_certificate'])) {
        Display:: display_header('');
    }
 }
-?>
-    <div class="actions">
-        <a href="<?php echo Category::getUrl(); ?>selectcat=<?php echo $my_selectcat; ?>">
-            <?php echo Display::return_icon(
-                'back.png',
-                get_lang('Assessment home'),
-                '',
-                ICON_SIZE_MEDIUM
-            ); ?>
-        </a>
-    </div>
-<?php
+
+$actions = '<a href="'.Category::getUrl().'&selectcat='.$my_selectcat.'">
+            '.Display::return_icon(
+        'back.png',
+        get_lang('Assessment home'),
+        '',
+        ICON_SIZE_MEDIUM
+    ).'
+    </a>';
+
+echo Display::toolbarAction('toolbar', [$actions]);

 $form->display();

--- a/public/main/gradebook/gradebook_showlog_link.php
+++ b/public/main/gradebook/gradebook_showlog_link.php
@ -23,9 +23,7 @@ $interbreadcrumb[] = [
 ];
 $this_section = SECTION_COURSES;
 Display::display_header('');
-echo '<div class="actions">';
-api_display_tool_title(get_lang('AssessmentsQualifyLog'));
-echo '</div>';
+echo Display::toolbarAction('toolbar', [api_display_tool_title(get_lang('AssessmentsQualifyLog'))]);

 $t_user = Database::get_main_table(TABLE_MAIN_USER);
 $t_link_log = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);
--- a/public/main/group/group_category.php
+++ b/public/main/group/group_category.php
@ -432,11 +432,9 @@ if ($form->validate()) {
 // Else display the form
 Display::display_header($nameTools, 'Group');

-// actions bar
-echo '<div class="actions">';
-echo '<a href="group.php">'.
+$actions = '<a href="group.php">'.
    Display::return_icon('back.png', get_lang('Back to Groups list'), '', ICON_SIZE_MEDIUM).'</a>';
-echo '</div>';
+echo Display::toolbarAction('toolbar', [$actions]);

 $defaults = $category;
 $defaults['action'] = $action;
--- a/public/main/group/group_space.php
+++ b/public/main/group/group_space.php
@ -70,8 +70,7 @@ Display::display_header(

 Display::display_introduction_section(TOOL_GROUP);

-echo '<div class="actions">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'group/group.php?'.api_get_cidreq().'">'.
+$actions = '<a href="'.api_get_path(WEB_CODE_PATH).'group/group.php?'.api_get_cidreq().'">'.
    Display::return_icon(
        'back.png',
        get_lang('Back to Groups list'),
@ -101,7 +100,8 @@ if (GroupManager::is_self_unregistration_allowed($user_id, $groupEntity)) {
        onclick="javascript: if(!confirm('."'".$confirmationMessage."'".')) return false;">'.
        get_lang('Unsubscribe me from this group.').'</a>';
 }
-echo '&nbsp;</div>';
+
+echo Display::toolbarAction('toolbar', [$actions]);

 $edit_url = '';
 if (api_is_allowed_to_edit(false, true) ||
--- a/public/main/lp/lp_add_category.php
+++ b/public/main/lp/lp_add_category.php
@ -80,8 +80,7 @@ if ($form->validate()) {

 Display::display_header(get_lang('Create new learning path'), 'Path');

-echo '<div class="actions">';
-echo '<a href="lp_controller.php?'.api_get_cidreq().'">'.
+$actions = '<a href="lp_controller.php?'.api_get_cidreq().'">'.
    Display::return_icon(
        'back.png',
        get_lang('ReturnToLearning paths'),
@ -89,7 +88,8 @@ echo '<a href="lp_controller.php?'.api_get_cidreq().'">'.
        ICON_SIZE_MEDIUM
    ).
    '</a>';
-echo '</div>';
+
+echo Display::toolbarAction('toolbar', [$actions]);

 $form->display();

--- a/public/main/lp/lp_view_item.php
+++ b/public/main/lp/lp_view_item.php
@ -120,7 +120,7 @@ if (is_object($lp)) {
            echo $lp->build_action_menu();
            echo '<div class="row">';
            echo '<div class="col-md-3">';
-            echo $lp->return_new_tree();
+            echo $lp->return_new_tree();exit;
            echo '</div>';
            echo '<div class="col-md-9">';
            echo $lp->display_item($lpItem);
--- a/public/main/messages/new_message.php
+++ b/public/main/messages/new_message.php
@ -240,8 +240,8 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl

    $form->addLabel(
        '',
-        '<iframe 
-            frameborder="0" height="200" width="100%" scrolling="no" 
+        '<iframe
+            frameborder="0" height="200" width="100%" scrolling="no"
            src="'.api_get_path(WEB_CODE_PATH).'messages/record_audio.php"></iframe>'
    );

@ -368,10 +368,12 @@ if ($allowSocial) {
    $social_menu_block = SocialManager::show_social_menu('messages');
    $social_right_content .= '<div class="row">';
    $social_right_content .= '<div class="col-md-12">';
-    $social_right_content .= '<div class="actions">';
-    $social_right_content .= '<a href="'.api_get_path(WEB_CODE_PATH).'messages/inbox.php">'.
+
+    $actions = '<a href="'.api_get_path(WEB_CODE_PATH).'messages/inbox.php">'.
        Display::return_icon('back.png', get_lang('Back'), [], 32).'</a>';
-    $social_right_content .= '</div>';
+
+    $social_right_content .= Display::toolbarAction('toolbar', [$actions]);
+
    $social_right_content .= '</div>';
    $social_right_content .= '<div class="col-md-12">';
 }
--- a/public/main/messages/view_message.php
+++ b/public/main/messages/view_message.php
@ -28,16 +28,18 @@ if ($allowSocial) {
 }
 $interbreadcrumb[] = ['url' => 'inbox.php', 'name' => get_lang('Messages')];

-$social_right_content = '<div class="actions">';
+
+$actions = '';
 if ($allowMessage) {
-    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
+    $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.
        Display::return_icon('new-message.png', get_lang('Compose message')).'</a>';
-    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
+    $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.
        Display::return_icon('inbox.png', get_lang('Inbox')).'</a>';
-    $social_right_content .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
+    $actions .= '<a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.
        Display::return_icon('outbox.png', get_lang('Outbox')).'</a>';
 }
-$social_right_content .= '</div>';
+$social_right_content = Display::toolbarAction('toolbar', [$actions]);
+
 $type = isset($_GET['type']) ? (int) $_GET['type'] : MessageManager::MESSAGE_TYPE_INBOX;

 $show_menu = 'messages_inbox';
--- a/public/main/session/add_courses_to_session.php
+++ b/public/main/session/add_courses_to_session.php
@ -119,9 +119,7 @@ if ('multiple' === $add_type) {

 // the form header
 $session_info = SessionManager::fetch($sessionId);
-echo '<div class="actions">';
-echo $link_add_type_unique.$link_add_type_multiple;
-echo '</div>';
+echo Display::toolbarAction('toolbar', [$link_add_type_unique.$link_add_type_multiple]);

 $ajax_search = 'unique' === $add_type ? true : false;
 $nosessionCourses = $sessionCourses = [];
--- a/public/main/session/session_list.php
+++ b/public/main/session/session_list.php
@ -384,7 +384,6 @@ if (api_is_platform_admin()) {
    $form->addHidden('list_type', $listType);
    $form->addButtonSearch(get_lang('Search'));
    $actionsRight .= $form->returnForm().'</div>';
-
 }

 echo Display::toolbarAction(
--- a/public/main/work/student_work.php
+++ b/public/main/work/student_work.php
@ -90,29 +90,28 @@ $interbreadcrumb[] = [

 Display::display_header(null);

-echo '<div class="actions">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'">'.
+$actions = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'">'.
        Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).
    '</a>';

 if (api_is_allowed_to_edit()) {
-    echo '<a
+    $actions .= '<a
        href="'.api_get_path(WEB_CODE_PATH).'work/student_work.php?action=export_to_pdf&studentId='.$studentId.'&'.api_get_cidreq().'">'.
        Display::return_icon('pdf.png', get_lang('Export to PDF'), '', ICON_SIZE_MEDIUM).
        '</a>';

-    echo '<a
+    $actions .= '<a
        href="'.api_get_path(WEB_CODE_PATH).'work/student_work.php?action=download&studentId='.$studentId.'&'.api_get_cidreq().'">'.
        Display::return_icon('save.png', get_lang('Download'), '', ICON_SIZE_MEDIUM).
        '</a>';

-    echo '<a
+    $actions .= '<a
            onclick="javascript:if(!confirm(\''.get_lang('Are you sure you want to delete').'\')) return false;"
            href="'.api_get_path(WEB_CODE_PATH).'work/student_work.php?action=delete_all&studentId='.$studentId.'&'.api_get_cidreq().'">'.
        Display::return_icon('delete.png', get_lang('Delete all papers'), '', ICON_SIZE_MEDIUM).
        '</a>';
 }
-echo '</div>';
+echo Display::toolbarAction('toolbar', [$actions]);

 $table = new HTML_Table(['class' => 'data_table']);
 $column = 0;
--- a/public/main/work/work_list_others.php
+++ b/public/main/work/work_list_others.php
@ -72,13 +72,10 @@ $interbreadcrumb[] = [
    'name' => $my_folder_data['title'],
 ];

-Display :: display_header(null);
-
-echo '<div class="actions">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'>'.
+Display::display_header(null);
+$actions = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'>'.
    Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).'</a>';
-echo '</div>';
-
+echo Display::toolbarAction('toolbar', [$actions]);
 if (!empty($my_folder_data['description'])) {
    echo '<p><div><strong>'.get_lang('Description').':</strong><p>'.
        Security::remove_XSS($my_folder_data['description']).'</p></div></p>';
--- a/public/main/work/work_missing.php
+++ b/public/main/work/work_missing.php
@ -97,27 +97,24 @@ if (isset($_GET['list']) && 'with' === $_GET['list']) {

 Display::display_header(null);

-echo '<div class="actions">';
-echo '<a href="'.api_get_path(WEB_CODE_PATH).'work/work_list_all.php?id='.$workId.'&'.api_get_cidreq().'">'.
+$actions = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work_list_all.php?id='.$workId.'&'.api_get_cidreq().'">'.
    Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).'</a>';
-$output = '';
 if (!empty($workId)) {
    if (empty($_GET['list']) or 'with' == Security::remove_XSS($_GET['list'])) {
-        $output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$workId.'&list=without">'.
+        $actions .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$workId.'&list=without">'.
            Display::return_icon('exercice_uncheck.png', get_lang('ViewLearners who didn\'t send their work'), '', ICON_SIZE_MEDIUM).
            '</a>';
    } else {
        if (!isset($_GET['action']) || (isset($_GET['action']) && 'send_mail' != $_GET['action'])) {
-            $output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$workId.'&list=without&action=send_mail&sec_token='.$token.'">'.
+            $actions .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$workId.'&list=without&action=send_mail&sec_token='.$token.'">'.
                Display::return_icon('mail_send.png', get_lang('Send a reminder'), '', ICON_SIZE_MEDIUM).
                '</a>';
        } else {
-            $output .= Display::return_icon('mail_send_na.png', get_lang('Send a reminder'), '', ICON_SIZE_MEDIUM);
+            $actions .= Display::return_icon('mail_send_na.png', get_lang('Send a reminder'), '', ICON_SIZE_MEDIUM);
        }
    }
 }

-echo $output;
-echo '</div>';
+echo Display::toolbarAction('toolbar', [$actions]);

 display_list_users_without_publication($workId);