From c312e4c9dfdbdbfbffcf3a1bf75a5885d083ee6d Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Fri, 16 Apr 2021 14:11:39 +0200 Subject: [PATCH] Minor - Replace div actions with Display::toolbarAction --- public/main/exercise/category.php | 10 ++++---- public/main/exercise/exercise_history.php | 6 ++--- .../exercise/exercise_question_reminder.php | 7 +++--- public/main/exercise/exercise_reminder.php | 7 +++--- public/main/exercise/exercise_submit.php | 8 +++---- public/main/exercise/overview.php | 7 +++--- public/main/exercise/question_create.php | 11 +++------ public/main/exercise/question_pool.php | 12 ++++------ public/main/exercise/result.php | 7 +++--- public/main/exercise/tests_category.php | 13 +++++------ public/main/exercise/upload_exercise.php | 5 +--- public/main/forum/editpost.php | 12 +++++----- public/main/forum/newthread.php | 8 +++---- public/main/forum/viewforumcategory.php | 14 ++++------- public/main/gradebook/gradebook_edit_all.php | 23 +++++++++---------- .../main/gradebook/gradebook_showlog_link.php | 4 +--- public/main/group/group_category.php | 6 ++--- public/main/group/group_space.php | 6 ++--- public/main/lp/lp_add_category.php | 6 ++--- public/main/lp/lp_view_item.php | 2 +- public/main/messages/new_message.php | 12 ++++++---- public/main/messages/view_message.php | 12 ++++++---- .../main/session/add_courses_to_session.php | 4 +--- public/main/session/session_list.php | 1 - public/main/work/student_work.php | 11 ++++----- public/main/work/work_list_others.php | 9 +++----- public/main/work/work_missing.php | 13 ++++------- 27 files changed, 100 insertions(+), 136 deletions(-) diff --git a/public/main/exercise/category.php b/public/main/exercise/category.php index 58eb494a8b..fdd2be5c9c 100644 --- a/public/main/exercise/category.php +++ b/public/main/exercise/category.php @@ -97,10 +97,9 @@ switch ($action) { header('Location: '.$url); exit; } else { - $content = '
'; - $content .= ''. + $actions = ''. Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).''; - $content .= '
'; + $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 = '
'; - $content .= ''. + $actions = ''. Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).''; - $content .= '
'; + $content .= Display::toolbarAction('toolbar', [$actions]); $form->addElement('hidden', 'sec_token'); $form->setConstants(['sec_token' => $token]); $content .= $form->returnForm(); diff --git a/public/main/exercise/exercise_history.php b/public/main/exercise/exercise_history.php index 3f1a3bf8e8..ac8ae06feb 100644 --- a/public/main/exercise/exercise_history.php +++ b/public/main/exercise/exercise_history.php @@ -49,11 +49,9 @@ if (isset($_GET['message'])) { } } -echo '
'; -echo ''. +$actions = ''. Display::return_icon('back.png', get_lang('Back to result list'), '', ICON_SIZE_MEDIUM).''; -echo '
'; - +echo Display::toolbarAction('toolbar', [$actions]); ?> diff --git a/public/main/exercise/exercise_question_reminder.php b/public/main/exercise/exercise_question_reminder.php index f4f31977ff..c23cd696f0 100644 --- 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 '
'; - echo ''. + $actions = ''. Display::return_icon('back.png', get_lang('GoBackToQuestionList'), [], 32).''; - echo ''. + $actions .= ''. Display::return_icon('edit.png', get_lang('ModifyExercise'), [], 32).''; - echo '
'; + echo Display::toolbarAction('toolbar', [$actions]); } echo Display::page_header($categoryObj->name); echo '

'.Security::remove_XSS($categoryObj->description).'

'; diff --git a/public/main/exercise/exercise_reminder.php b/public/main/exercise/exercise_reminder.php index fa3e9cf774..9952921d6e 100644 --- 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 '
'; - echo ''. + $actions = ''. Display::return_icon('back.png', get_lang('Go back to the questions list'), [], 32).''; - echo ''. + $actions .= ''. Display::return_icon('edit.png', get_lang('ModifyTest'), [], 32).''; - echo '
'; + echo Display::toolbarAction('toolbar', [$actions]); } echo Display::page_header(get_lang('Questions to be reviewed')); diff --git a/public/main/exercise/exercise_submit.php b/public/main/exercise/exercise_submit.php index 5b1030bea3..38026e6183 100644 --- 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 '
'; + $actions = ''; if (false == $show_quiz_edition) { - echo ''. + $actions .= ''. Display::return_icon('settings.png', get_lang('Edit test name and settings'), '', ICON_SIZE_MEDIUM).''; } else { - echo ''. + $actions .= ''. Display::return_icon('settings_na.png', get_lang('Edit test name and settings'), '', ICON_SIZE_MEDIUM).''; } - echo '
'; + echo Display::toolbarAction('toolbar', [$actions]); } $is_visible_return = $objExercise->is_visible( diff --git a/public/main/exercise/overview.php b/public/main/exercise/overview.php index c9063e1db3..52b57fc066 100644 --- 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 '
'; - echo ''. +if ('mobileapp' === $origin) { + $actions = ''. Display::return_icon('back.png', get_lang('GoBackToQuestionList'), [], 32).''; - echo '
'; + echo Display::toolbarAction('toolbar', [$actions]); } $html = ''; diff --git a/public/main/exercise/question_create.php b/public/main/exercise/question_create.php index 9def6247a0..4f53969377 100644 --- 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 = ''. + Display::return_icon('back.png', get_lang('BackToTestsList'), '', ICON_SIZE_MEDIUM).''; + echo Display::toolbarAction('toolbar', [$actions]); - echo '
'; - echo ''.Display::return_icon('back.png', get_lang('BackToTestsList'), '', ICON_SIZE_MEDIUM).''; - echo '
'; - - // displaying the form $form->display(); - - // footer Display::display_footer(); } diff --git a/public/main/exercise/question_pool.php b/public/main/exercise/question_pool.php index 4067b036c0..a55418300b 100644 --- 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 '
'; +$actions = ''; if (isset($fromExercise) && $fromExercise > 0) { - echo ''. + $actions .= ''. Display::return_icon('back.png', get_lang('Go back to the questions list'), '', ICON_SIZE_MEDIUM).''; } else { - echo ''. + $actions .= ''. Display::return_icon('back.png', get_lang('BackToTestsList'), '', ICON_SIZE_MEDIUM).''; - echo "". + $actions .= "". Display::return_icon('add_question.gif', get_lang('New question'), '', ICON_SIZE_MEDIUM).''; } -echo '
'; +echo Display::toolbarAction('toolbar', [$actions]); if ('' != $displayMessage) { echo Display::return_message($displayMessage, 'confirm'); diff --git a/public/main/exercise/result.php b/public/main/exercise/result.php index 8dae83ee9c..b09bfeba3d 100644 --- a/public/main/exercise/result.php +++ b/public/main/exercise/result.php @@ -92,11 +92,10 @@ if ($show_headers) { body { background: none;} '; - if ('mobileapp' == $origin) { - echo '
'; - echo ''. + if ('mobileapp' === $origin) { + $actions = ''. Display::return_icon('back.png', get_lang('GoBackToQuestionList'), [], 32).''; - echo '
'; + echo Display::toolbarAction('toolbar', [$actions]); } } diff --git a/public/main/exercise/tests_category.php b/public/main/exercise/tests_category.php index d5ee48869f..ed9358fda5 100644 --- 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 '
'; - echo ''. + $actions = ''. Display::return_icon('back.png', get_lang('Go back to the questions list'), '', ICON_SIZE_MEDIUM).''; - echo ''. + $actions .= ''. Display::return_icon('new_folder.png', get_lang('Add category'), null, ICON_SIZE_MEDIUM).''; - 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 '
'; - echo '
'; + echo Display::toolbarAction('toolbar', [$actions]); + echo '
'.get_lang('Questions category').'
'; } diff --git a/public/main/exercise/upload_exercise.php b/public/main/exercise/upload_exercise.php index 2bb0deef72..1559157b7c 100644 --- 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 '
'; -echo lp_upload_quiz_actions(); -echo '
'; +echo Display::toolbarAction('toolbar', [lp_upload_quiz_actions()]); -// the main content lp_upload_quiz_main(); function lp_upload_quiz_actions() diff --git a/public/main/forum/editpost.php b/public/main/forum/editpost.php index 7aa97246b9..54c067c274 100644 --- 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 '
'; - echo ''.search_link().''; + $actions = ''; + //$actions .= ''.search_link().''; if ('group' === $origin) { - echo ''. + $actions .= ''. Display::return_icon( 'back.png', get_lang('Back to').' '.get_lang('Groups'), @@ -260,7 +260,7 @@ if ('learnpath' !== $origin) { ). ''; } else { - echo ''. + $actions .= ''. Display::return_icon( 'back.png', get_lang('Back toForumOverview'), @@ -269,7 +269,7 @@ if ('learnpath' !== $origin) { ). ''; } - echo ''. + $actions .= ''. Display::return_icon( 'forum.png', get_lang('Back toForum'), @@ -277,7 +277,7 @@ if ('learnpath' !== $origin) { ICON_SIZE_MEDIUM ). ''; - echo '
'; + echo Display::toolbarAction('toolbar', [$actions]); } /* Display Forum Category and the Forum information */ diff --git a/public/main/forum/newthread.php b/public/main/forum/newthread.php index 68c36341ca..a4b74d84a9 100644 --- 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 '
'; -echo ''.search_link().''; -echo ''. +//$actions ''.search_link().''; +$actions = ''. Display::return_icon('back.png', get_lang('Back to forum'), '', ICON_SIZE_MEDIUM).''; -echo '
'; +echo Display::toolbarAction('toolbar', [$actions]); // Set forum attachment data into $_SESSION getAttachedFiles($forumEntity->getIid(), 0, 0); diff --git a/public/main/forum/viewforumcategory.php b/public/main/forum/viewforumcategory.php index 52a70822d1..6dcde455e9 100644 --- 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 = '
'; -$html .= ''. +$actions = ''. Display::return_icon('back.png', get_lang('Back to forum overview'), '', ICON_SIZE_MEDIUM).''; if (api_is_allowed_to_edit(false, true)) { - $html .= ' ' + $actions .= ' ' .Display::return_icon('new_forum.png', get_lang('Add a forum'), '', ICON_SIZE_MEDIUM).''; } -$html .= search_link(); -$html .= '
'; +$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); diff --git a/public/main/gradebook/gradebook_edit_all.php b/public/main/gradebook/gradebook_edit_all.php index a0e65b891e..453347c83d 100644 --- 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(''); } } -?> -
- - - -
- + '.Display::return_icon( + 'back.png', + get_lang('Assessment home'), + '', + ICON_SIZE_MEDIUM + ).' + '; + +echo Display::toolbarAction('toolbar', [$actions]); $form->display(); diff --git a/public/main/gradebook/gradebook_showlog_link.php b/public/main/gradebook/gradebook_showlog_link.php index 3ad09eae96..a6492517d6 100644 --- 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 '
'; -api_display_tool_title(get_lang('AssessmentsQualifyLog')); -echo '
'; +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); diff --git a/public/main/group/group_category.php b/public/main/group/group_category.php index d265c34ca1..14e8c2228a 100644 --- 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 '
'; -echo ''. +$actions = ''. Display::return_icon('back.png', get_lang('Back to Groups list'), '', ICON_SIZE_MEDIUM).''; -echo '
'; +echo Display::toolbarAction('toolbar', [$actions]); $defaults = $category; $defaults['action'] = $action; diff --git a/public/main/group/group_space.php b/public/main/group/group_space.php index 038fbc1316..f5b0f9cd60 100644 --- 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 '
'; -echo ''. +$actions = ''. 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.').''; } -echo ' 
'; + +echo Display::toolbarAction('toolbar', [$actions]); $edit_url = ''; if (api_is_allowed_to_edit(false, true) || diff --git a/public/main/lp/lp_add_category.php b/public/main/lp/lp_add_category.php index 3994d06006..1ca8dd067a 100644 --- 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 '
'; -echo ''. +$actions = ''. Display::return_icon( 'back.png', get_lang('ReturnToLearning paths'), @@ -89,7 +88,8 @@ echo ''. ICON_SIZE_MEDIUM ). ''; -echo '
'; + +echo Display::toolbarAction('toolbar', [$actions]); $form->display(); diff --git a/public/main/lp/lp_view_item.php b/public/main/lp/lp_view_item.php index ecec4455e6..bdaa9355a2 100644 --- 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 '
'; echo '
'; - echo $lp->return_new_tree(); + echo $lp->return_new_tree();exit; echo '
'; echo '
'; echo $lp->display_item($lpItem); diff --git a/public/main/messages/new_message.php b/public/main/messages/new_message.php index b335b5d63a..1d67d02d66 100644 --- 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( '', - '' ); @@ -368,10 +368,12 @@ if ($allowSocial) { $social_menu_block = SocialManager::show_social_menu('messages'); $social_right_content .= '
'; $social_right_content .= '
'; - $social_right_content .= '
'; - $social_right_content .= ''. + + $actions = ''. Display::return_icon('back.png', get_lang('Back'), [], 32).''; - $social_right_content .= '
'; + + $social_right_content .= Display::toolbarAction('toolbar', [$actions]); + $social_right_content .= '
'; $social_right_content .= '
'; } diff --git a/public/main/messages/view_message.php b/public/main/messages/view_message.php index 9cb85c6dfa..9800404229 100644 --- 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 = '
'; + +$actions = ''; if ($allowMessage) { - $social_right_content .= ''. + $actions .= ''. Display::return_icon('new-message.png', get_lang('Compose message')).''; - $social_right_content .= ''. + $actions .= ''. Display::return_icon('inbox.png', get_lang('Inbox')).''; - $social_right_content .= ''. + $actions .= ''. Display::return_icon('outbox.png', get_lang('Outbox')).''; } -$social_right_content .= '
'; +$social_right_content = Display::toolbarAction('toolbar', [$actions]); + $type = isset($_GET['type']) ? (int) $_GET['type'] : MessageManager::MESSAGE_TYPE_INBOX; $show_menu = 'messages_inbox'; diff --git a/public/main/session/add_courses_to_session.php b/public/main/session/add_courses_to_session.php index 51a0596666..78b542d255 100644 --- 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 '
'; -echo $link_add_type_unique.$link_add_type_multiple; -echo '
'; +echo Display::toolbarAction('toolbar', [$link_add_type_unique.$link_add_type_multiple]); $ajax_search = 'unique' === $add_type ? true : false; $nosessionCourses = $sessionCourses = []; diff --git a/public/main/session/session_list.php b/public/main/session/session_list.php index 4af6217d3b..c8caaa9e30 100644 --- 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().'
'; - } echo Display::toolbarAction( diff --git a/public/main/work/student_work.php b/public/main/work/student_work.php index afbfc28f0b..b380bc7c38 100644 --- a/public/main/work/student_work.php +++ b/public/main/work/student_work.php @@ -90,29 +90,28 @@ $interbreadcrumb[] = [ Display::display_header(null); -echo ''; +echo Display::toolbarAction('toolbar', [$actions]); $table = new HTML_Table(['class' => 'data_table']); $column = 0; diff --git a/public/main/work/work_list_others.php b/public/main/work/work_list_others.php index 3bb7b7b8ff..3b0d4523fb 100644 --- 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 ''; - +echo Display::toolbarAction('toolbar', [$actions]); if (!empty($my_folder_data['description'])) { echo '

'.get_lang('Description').':

'. Security::remove_XSS($my_folder_data['description']).'

'; diff --git a/public/main/work/work_missing.php b/public/main/work/work_missing.php index b743e0033f..684a27bd07 100644 --- 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 '
'; -echo ''. +$actions = ''. Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).''; -$output = ''; if (!empty($workId)) { if (empty($_GET['list']) or 'with' == Security::remove_XSS($_GET['list'])) { - $output .= ''. + $actions .= ''. Display::return_icon('exercice_uncheck.png', get_lang('ViewLearners who didn\'t send their work'), '', ICON_SIZE_MEDIUM). ''; } else { if (!isset($_GET['action']) || (isset($_GET['action']) && 'send_mail' != $_GET['action'])) { - $output .= ''. + $actions .= ''. Display::return_icon('mail_send.png', get_lang('Send a reminder'), '', ICON_SIZE_MEDIUM). ''; } 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 '
'; +echo Display::toolbarAction('toolbar', [$actions]); display_list_users_without_publication($workId);