Minor - Replace div actions with Display::toolbarAction

pull/3890/head
Julio Montoya 4 years ago
parent 7fabbe4754
commit c312e4c9df
  1. 10
      public/main/exercise/category.php
  2. 6
      public/main/exercise/exercise_history.php
  3. 7
      public/main/exercise/exercise_question_reminder.php
  4. 7
      public/main/exercise/exercise_reminder.php
  5. 8
      public/main/exercise/exercise_submit.php
  6. 7
      public/main/exercise/overview.php
  7. 11
      public/main/exercise/question_create.php
  8. 12
      public/main/exercise/question_pool.php
  9. 7
      public/main/exercise/result.php
  10. 13
      public/main/exercise/tests_category.php
  11. 5
      public/main/exercise/upload_exercise.php
  12. 12
      public/main/forum/editpost.php
  13. 8
      public/main/forum/newthread.php
  14. 14
      public/main/forum/viewforumcategory.php
  15. 15
      public/main/gradebook/gradebook_edit_all.php
  16. 4
      public/main/gradebook/gradebook_showlog_link.php
  17. 6
      public/main/group/group_category.php
  18. 6
      public/main/group/group_space.php
  19. 6
      public/main/lp/lp_add_category.php
  20. 2
      public/main/lp/lp_view_item.php
  21. 8
      public/main/messages/new_message.php
  22. 12
      public/main/messages/view_message.php
  23. 4
      public/main/session/add_courses_to_session.php
  24. 1
      public/main/session/session_list.php
  25. 11
      public/main/work/student_work.php
  26. 7
      public/main/work/work_list_others.php
  27. 13
      public/main/work/work_missing.php

@ -97,10 +97,9 @@ switch ($action) {
header('Location: '.$url); header('Location: '.$url);
exit; exit;
} else { } else {
$content = '<div class="actions">'; $actions = '<a href="'.$url.'">'.
$content .= '<a href="'.$url.'">'.
Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>'; 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->addElement('hidden', 'sec_token');
$form->setConstants(['sec_token' => $token]); $form->setConstants(['sec_token' => $token]);
$content .= $form->returnForm(); $content .= $form->returnForm();
@ -122,10 +121,9 @@ switch ($action) {
header('Location: '.$url); header('Location: '.$url);
exit; exit;
} else { } else {
$content = '<div class="actions">'; $actions = '<a href="'.$url.'">'.
$content .= '<a href="'.$url.'">'.
Display::return_icon('back.png', get_lang('Back'), '', ICON_SIZE_MEDIUM).'</a>'; 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->addElement('hidden', 'sec_token');
$form->setConstants(['sec_token' => $token]); $form->setConstants(['sec_token' => $token]);
$content .= $form->returnForm(); $content .= $form->returnForm();

@ -49,11 +49,9 @@ if (isset($_GET['message'])) {
} }
} }
echo '<div class="actions">'; $actions = '<a href="exercise_report.php?'.api_get_cidreq().'&filter=2">'.
echo '<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>'; 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"> <table class="table table-hover table-striped data_table">

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

@ -94,12 +94,11 @@ if (!$hideHeaderAndFooter) {
// I'm in a preview mode as course admin. Display the action menu. // I'm in a preview mode as course admin. Display the action menu.
if (!$hideHeaderAndFooter && api_is_course_admin()) { if (!$hideHeaderAndFooter && api_is_course_admin()) {
echo '<div class="actions">'; $actions = '<a href="admin.php?'.api_get_cidreq().'&exerciseId='.$objExercise->getId().'">'.
echo '<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>'; 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>'; 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')); echo Display::page_header(get_lang('Questions to be reviewed'));

@ -1056,15 +1056,15 @@ $show_quiz_edition = $objExercise->added_in_lp();
// I'm in a preview mode // I'm in a preview mode
if (api_is_course_admin() && !in_array($origin, ['learnpath', 'embeddable'])) { if (api_is_course_admin() && !in_array($origin, ['learnpath', 'embeddable'])) {
echo '<div class="actions">'; $actions = '';
if (false == $show_quiz_edition) { 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>'; Display::return_icon('settings.png', get_lang('Edit test name and settings'), '', ICON_SIZE_MEDIUM).'</a>';
} else { } else {
echo '<a href="#">'. $actions .= '<a href="#">'.
Display::return_icon('settings_na.png', get_lang('Edit test name and settings'), '', ICON_SIZE_MEDIUM).'</a>'; 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( $is_visible_return = $objExercise->is_visible(

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

@ -97,17 +97,12 @@ if ($form->validate()) {
header('Location: admin.php?exerciseId='.$values['exercise'].'&newQuestion=yes&isContent='.$values['is_content'].'&answerType='.$answer_type); header('Location: admin.php?exerciseId='.$values['exercise'].'&newQuestion=yes&isContent='.$values['is_content'].'&answerType='.$answer_type);
exit; exit;
} else { } else {
// header
Display::display_header($nameTools); 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(); $form->display();
// footer
Display::display_footer(); Display::display_footer();
} }

@ -1024,19 +1024,17 @@ $headers = [
]; ];
Display::display_header($nameTools, 'Exercise'); Display::display_header($nameTools, 'Exercise');
$actions = '';
// Menu
echo '<div class="actions">';
if (isset($fromExercise) && $fromExercise > 0) { 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>'; Display::return_icon('back.png', get_lang('Go back to the questions list'), '', ICON_SIZE_MEDIUM).'</a>';
} else { } 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>'; 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>'; Display::return_icon('add_question.gif', get_lang('New question'), '', ICON_SIZE_MEDIUM).'</a>';
} }
echo '</div>'; echo Display::toolbarAction('toolbar', [$actions]);
if ('' != $displayMessage) { if ('' != $displayMessage) {
echo Display::return_message($displayMessage, 'confirm'); echo Display::return_message($displayMessage, 'confirm');

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

@ -253,24 +253,23 @@ function add_category_form($action)
// Display add category button // Display add category button
function displayActionBar() function displayActionBar()
{ {
echo '<div class="actions">'; $actions = '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise.php?'.api_get_cidreq().'">'.
echo '<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>'; 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>'; 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), Display::return_icon('export_csv.png', get_lang('CSV export'), [], ICON_SIZE_MEDIUM),
api_get_self().'?action=export_category&'.api_get_cidreq() 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), Display::return_icon('import_csv.png', get_lang('Import from a CSV'), [], ICON_SIZE_MEDIUM),
api_get_self().'?action=import_category&'.api_get_cidreq() api_get_self().'?action=import_category&'.api_get_cidreq()
); );
echo '</div>'; echo Display::toolbarAction('toolbar', [$actions]);
echo '<br/>';
echo '<fieldset><legend>'.get_lang('Questions category').'</legend></fieldset>'; echo '<fieldset><legend>'.get_lang('Questions category').'</legend></fieldset>';
} }

@ -38,11 +38,8 @@ $interbreadcrumb[] = [
Display::display_header(get_lang('Import quiz from Excel'), 'Exercises'); Display::display_header(get_lang('Import quiz from Excel'), 'Exercises');
echo '<div class="actions">'; echo Display::toolbarAction('toolbar', [lp_upload_quiz_actions()]);
echo lp_upload_quiz_actions();
echo '</div>';
// the main content
lp_upload_quiz_main(); lp_upload_quiz_main();
function lp_upload_quiz_actions() function lp_upload_quiz_actions()

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

@ -225,12 +225,10 @@ if ('learnpath' === $origin) {
Display::display_header(); Display::display_header();
} }
// Action links //$actions '<span style="float:right;">'.search_link().'</span>';
echo '<div class="actions">'; $actions = '<a href="viewforum.php?forum='.(int) ($_GET['forum']).'&'.$cidreq.'">'.
echo '<span style="float:right;">'.search_link().'</span>';
echo '<a href="viewforum.php?forum='.(int) ($_GET['forum']).'&'.$cidreq.'">'.
Display::return_icon('back.png', get_lang('Back to forum'), '', ICON_SIZE_MEDIUM).'</a>'; 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 // Set forum attachment data into $_SESSION
getAttachedFiles($forumEntity->getIid(), 0, 0); getAttachedFiles($forumEntity->getIid(), 0, 0);

@ -168,7 +168,6 @@ if ('learnpath' === $origin) {
Display::display_header(null); Display::display_header(null);
} }
/* ACTIONS */
$whatsnew_post_info = isset($_SESSION['whatsnew_post_info']) ? $_SESSION['whatsnew_post_info'] : null; $whatsnew_post_info = isset($_SESSION['whatsnew_post_info']) ? $_SESSION['whatsnew_post_info'] : null;
/* Is the user allowed here? */ /* Is the user allowed here? */
@ -179,23 +178,20 @@ if (!api_is_allowed_to_edit(false, true) && false === $categoryIsVisible) {
api_not_allowed(); api_not_allowed();
} }
/* Action Links */ $actions = '<a href="'.$url.'">'.
$html = '<div class="actions">';
$html .= '<a href="'.$url.'">'.
Display::return_icon('back.png', get_lang('Back to forum overview'), '', ICON_SIZE_MEDIUM).'</a>'; Display::return_icon('back.png', get_lang('Back to forum overview'), '', ICON_SIZE_MEDIUM).'</a>';
if (api_is_allowed_to_edit(false, true)) { 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>'; .Display::return_icon('new_forum.png', get_lang('Add a forum'), '', ICON_SIZE_MEDIUM).'</a>';
} }
$html .= search_link(); $actions .= search_link();
$html .= '</div>';
echo $html; echo Display::toolbarAction('toolbar', [$actions]);
$logInfo = [ $logInfo = [
'tool' => TOOL_FORUM, 'tool' => TOOL_FORUM,
'action' => $action, 'action' => $action,
'info' => isset($_GET['content']) ? $_GET['content'] : '', 'info' => $_GET['content'] ?? '',
]; ];
Event::registerLog($logInfo); Event::registerLog($logInfo);

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

@ -23,9 +23,7 @@ $interbreadcrumb[] = [
]; ];
$this_section = SECTION_COURSES; $this_section = SECTION_COURSES;
Display::display_header(''); Display::display_header('');
echo '<div class="actions">'; echo Display::toolbarAction('toolbar', [api_display_tool_title(get_lang('AssessmentsQualifyLog'))]);
api_display_tool_title(get_lang('AssessmentsQualifyLog'));
echo '</div>';
$t_user = Database::get_main_table(TABLE_MAIN_USER); $t_user = Database::get_main_table(TABLE_MAIN_USER);
$t_link_log = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG); $t_link_log = Database::get_main_table(TABLE_MAIN_GRADEBOOK_LINKEVAL_LOG);

@ -432,11 +432,9 @@ if ($form->validate()) {
// Else display the form // Else display the form
Display::display_header($nameTools, 'Group'); Display::display_header($nameTools, 'Group');
// actions bar $actions = '<a href="group.php">'.
echo '<div class="actions">';
echo '<a href="group.php">'.
Display::return_icon('back.png', get_lang('Back to Groups list'), '', ICON_SIZE_MEDIUM).'</a>'; 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 = $category;
$defaults['action'] = $action; $defaults['action'] = $action;

@ -70,8 +70,7 @@ Display::display_header(
Display::display_introduction_section(TOOL_GROUP); Display::display_introduction_section(TOOL_GROUP);
echo '<div class="actions">'; $actions = '<a href="'.api_get_path(WEB_CODE_PATH).'group/group.php?'.api_get_cidreq().'">'.
echo '<a href="'.api_get_path(WEB_CODE_PATH).'group/group.php?'.api_get_cidreq().'">'.
Display::return_icon( Display::return_icon(
'back.png', 'back.png',
get_lang('Back to Groups list'), 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;">'. onclick="javascript: if(!confirm('."'".$confirmationMessage."'".')) return false;">'.
get_lang('Unsubscribe me from this group.').'</a>'; get_lang('Unsubscribe me from this group.').'</a>';
} }
echo '&nbsp;</div>';
echo Display::toolbarAction('toolbar', [$actions]);
$edit_url = ''; $edit_url = '';
if (api_is_allowed_to_edit(false, true) || if (api_is_allowed_to_edit(false, true) ||

@ -80,8 +80,7 @@ if ($form->validate()) {
Display::display_header(get_lang('Create new learning path'), 'Path'); Display::display_header(get_lang('Create new learning path'), 'Path');
echo '<div class="actions">'; $actions = '<a href="lp_controller.php?'.api_get_cidreq().'">'.
echo '<a href="lp_controller.php?'.api_get_cidreq().'">'.
Display::return_icon( Display::return_icon(
'back.png', 'back.png',
get_lang('ReturnToLearning paths'), get_lang('ReturnToLearning paths'),
@ -89,7 +88,8 @@ echo '<a href="lp_controller.php?'.api_get_cidreq().'">'.
ICON_SIZE_MEDIUM ICON_SIZE_MEDIUM
). ).
'</a>'; '</a>';
echo '</div>';
echo Display::toolbarAction('toolbar', [$actions]);
$form->display(); $form->display();

@ -120,7 +120,7 @@ if (is_object($lp)) {
echo $lp->build_action_menu(); echo $lp->build_action_menu();
echo '<div class="row">'; echo '<div class="row">';
echo '<div class="col-md-3">'; echo '<div class="col-md-3">';
echo $lp->return_new_tree(); echo $lp->return_new_tree();exit;
echo '</div>'; echo '</div>';
echo '<div class="col-md-9">'; echo '<div class="col-md-9">';
echo $lp->display_item($lpItem); echo $lp->display_item($lpItem);

@ -368,10 +368,12 @@ if ($allowSocial) {
$social_menu_block = SocialManager::show_social_menu('messages'); $social_menu_block = SocialManager::show_social_menu('messages');
$social_right_content .= '<div class="row">'; $social_right_content .= '<div class="row">';
$social_right_content .= '<div class="col-md-12">'; $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>'; 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>';
$social_right_content .= '<div class="col-md-12">'; $social_right_content .= '<div class="col-md-12">';
} }

@ -28,16 +28,18 @@ if ($allowSocial) {
} }
$interbreadcrumb[] = ['url' => 'inbox.php', 'name' => get_lang('Messages')]; $interbreadcrumb[] = ['url' => 'inbox.php', 'name' => get_lang('Messages')];
$social_right_content = '<div class="actions">';
$actions = '';
if ($allowMessage) { 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>'; 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>'; 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>'; 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; $type = isset($_GET['type']) ? (int) $_GET['type'] : MessageManager::MESSAGE_TYPE_INBOX;
$show_menu = 'messages_inbox'; $show_menu = 'messages_inbox';

@ -119,9 +119,7 @@ if ('multiple' === $add_type) {
// the form header // the form header
$session_info = SessionManager::fetch($sessionId); $session_info = SessionManager::fetch($sessionId);
echo '<div class="actions">'; echo Display::toolbarAction('toolbar', [$link_add_type_unique.$link_add_type_multiple]);
echo $link_add_type_unique.$link_add_type_multiple;
echo '</div>';
$ajax_search = 'unique' === $add_type ? true : false; $ajax_search = 'unique' === $add_type ? true : false;
$nosessionCourses = $sessionCourses = []; $nosessionCourses = $sessionCourses = [];

@ -384,7 +384,6 @@ if (api_is_platform_admin()) {
$form->addHidden('list_type', $listType); $form->addHidden('list_type', $listType);
$form->addButtonSearch(get_lang('Search')); $form->addButtonSearch(get_lang('Search'));
$actionsRight .= $form->returnForm().'</div>'; $actionsRight .= $form->returnForm().'</div>';
} }
echo Display::toolbarAction( echo Display::toolbarAction(

@ -90,29 +90,28 @@ $interbreadcrumb[] = [
Display::display_header(null); Display::display_header(null);
echo '<div class="actions">'; $actions = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'">'.
echo '<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). Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).
'</a>'; '</a>';
if (api_is_allowed_to_edit()) { 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().'">'. 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). Display::return_icon('pdf.png', get_lang('Export to PDF'), '', ICON_SIZE_MEDIUM).
'</a>'; '</a>';
echo '<a $actions .= '<a
href="'.api_get_path(WEB_CODE_PATH).'work/student_work.php?action=download&studentId='.$studentId.'&'.api_get_cidreq().'">'. 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). Display::return_icon('save.png', get_lang('Download'), '', ICON_SIZE_MEDIUM).
'</a>'; '</a>';
echo '<a $actions .= '<a
onclick="javascript:if(!confirm(\''.get_lang('Are you sure you want to delete').'\')) return false;" 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().'">'. 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). Display::return_icon('delete.png', get_lang('Delete all papers'), '', ICON_SIZE_MEDIUM).
'</a>'; '</a>';
} }
echo '</div>'; echo Display::toolbarAction('toolbar', [$actions]);
$table = new HTML_Table(['class' => 'data_table']); $table = new HTML_Table(['class' => 'data_table']);
$column = 0; $column = 0;

@ -73,12 +73,9 @@ $interbreadcrumb[] = [
]; ];
Display::display_header(null); Display::display_header(null);
$actions = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work.php?'.api_get_cidreq().'>'.
echo '<div class="actions">';
echo '<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>'; 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'])) { if (!empty($my_folder_data['description'])) {
echo '<p><div><strong>'.get_lang('Description').':</strong><p>'. echo '<p><div><strong>'.get_lang('Description').':</strong><p>'.
Security::remove_XSS($my_folder_data['description']).'</p></div></p>'; Security::remove_XSS($my_folder_data['description']).'</p></div></p>';

@ -97,27 +97,24 @@ if (isset($_GET['list']) && 'with' === $_GET['list']) {
Display::display_header(null); Display::display_header(null);
echo '<div class="actions">'; $actions = '<a href="'.api_get_path(WEB_CODE_PATH).'work/work_list_all.php?id='.$workId.'&'.api_get_cidreq().'">'.
echo '<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>'; Display::return_icon('back.png', get_lang('Back to Assignments list'), '', ICON_SIZE_MEDIUM).'</a>';
$output = '';
if (!empty($workId)) { if (!empty($workId)) {
if (empty($_GET['list']) or 'with' == Security::remove_XSS($_GET['list'])) { 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). Display::return_icon('exercice_uncheck.png', get_lang('ViewLearners who didn\'t send their work'), '', ICON_SIZE_MEDIUM).
'</a>'; '</a>';
} else { } else {
if (!isset($_GET['action']) || (isset($_GET['action']) && 'send_mail' != $_GET['action'])) { 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). Display::return_icon('mail_send.png', get_lang('Send a reminder'), '', ICON_SIZE_MEDIUM).
'</a>'; '</a>';
} else { } 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 Display::toolbarAction('toolbar', [$actions]);
echo '</div>';
display_list_users_without_publication($workId); display_list_users_without_publication($workId);

Loading…
Cancel
Save