Minor - Replace div actions with Display::toolbarAction

pull/3890/head
Julio Montoya 4 years ago
parent 344319fbd2
commit 7fabbe4754
  1. 2
      public/main/admin/course_list.php
  2. 29
      public/main/attendance/index.php
  3. 25
      public/main/exercise/admin.php
  4. 11
      public/main/exercise/exercise_admin.php
  5. 10
      public/main/forum/reply.php
  6. 5
      public/main/forum/viewforum.php
  7. 5
      public/main/forum/viewthread.php
  8. 6
      public/main/inc/lib/agenda.lib.php
  9. 19
      public/main/inc/lib/link.lib.php
  10. 5
      public/main/lp/lp_add.php
  11. 29
      public/main/session/session_list.php
  12. 12
      public/main/survey/survey_list.php
  13. 4
      public/main/template/default/forum/posts.html.twig
  14. 30
      public/main/user/user.php
  15. 4
      public/main/work/work.lib.php
  16. 2
      public/main/work/work.php

@ -515,7 +515,7 @@ if (isset($_GET['search']) && 'advanced' === $_GET['search']) {
$actions = Display::toolbarAction(
'toolbar',
[$actions1, $actions2, $actions3, $actions4],
[$actions1, $actions3, $actions4.$actions2],
[2, 4, 3, 3]
);

@ -213,16 +213,15 @@ $content = '';
switch ($action) {
case 'attendance_list':
if ($allowToEdit) {
$content .= '<div class="actions">';
$content .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_add">';
$content .= Display::return_icon(
$actions = '<a href="index.php?'.api_get_cidreq().'&action=attendance_add">';
$actions .= Display::return_icon(
'new_attendance_list.png',
get_lang('Create a new attendance list'),
'',
ICON_SIZE_MEDIUM
);
$content .= '</a>';
$content .= '</div>';
$actions .= '</a>';
$content .= Display::toolbarAction('toolbar', [$actions]);
}
if (0 === $attendance->getNumberOfAttendances()) {
@ -647,21 +646,21 @@ switch ($action) {
$is_locked_attendance = $attendance->is_locked_attendance($attendanceId);
if (!$is_locked_attendance || api_is_platform_admin()) {
$content .= '<div class="actions">';
$actions = '';
if ('calendar_add' === $action) {
$content .= '<a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendanceId.'">'.
$actions .= '<a href="index.php?'.api_get_cidreq().'&action=calendar_list&attendance_id='.$attendanceId.'">'.
Display::return_icon('back.png', get_lang('Attendance calendar'), '', ICON_SIZE_MEDIUM).'</a>';
} else {
$content .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list&attendance_id='.$attendanceId.'">'.
$actions .= '<a href="index.php?'.api_get_cidreq().'&action=attendance_sheet_list&attendance_id='.$attendanceId.'">'.
Display::return_icon('back.png', get_lang('Attendance sheet'), '', ICON_SIZE_MEDIUM).'</a>';
if (api_is_allowed_to_edit()) {
$content .= '<a href="index.php?'.api_get_cidreq().'&action=calendar_add&attendance_id='.$attendanceId.'">'.
$actions .= '<a href="index.php?'.api_get_cidreq().'&action=calendar_add&attendance_id='.$attendanceId.'">'.
Display::return_icon('add.png', get_lang('Add a date and time'), '', ICON_SIZE_MEDIUM).'</a>';
$content .= '<a onclick="javascript:if(!confirm(\''.get_lang('Are you sure you want to delete all dates?').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=calendar_all_delete&attendance_id='.$attendanceId.'">'.
$actions .= '<a onclick="javascript:if(!confirm(\''.get_lang('Are you sure you want to delete all dates?').'\')) return false;" href="index.php?'.api_get_cidreq().'&action=calendar_all_delete&attendance_id='.$attendanceId.'">'.
Display::return_icon('clean.png', get_lang('Clean the calendar of all lists'), '', ICON_SIZE_MEDIUM).'</a>';
}
}
$content .= '</div>';
$content .= Display::toolbarAction('toolbar', [$actions]);
}
$message_information = get_lang('The attendance calendar allows you to register attendance lists (one per real session the students need to attend). Add new attendance lists here.');
@ -736,10 +735,10 @@ switch ($action) {
case 'calendar_logins':
if (api_is_course_admin() || api_is_drh()) {
$result = $attendance->getAttendanceBaseInLogin(false, true);
$content .= '<div class="actions">';
$content .= '<a href="index.php?'.api_get_cidreq().'&action=calendar_list">'.
Display::return_icon('back.png', get_lang('AttendanceCalendar'), '', ICON_SIZE_MEDIUM).'</a>';
$content .= '</div>';
$actions = '<a href="index.php?'.api_get_cidreq().'&action=calendar_list">'.
Display::return_icon('back.png', get_lang('AttendanceCalendar'), '', ICON_SIZE_MEDIUM).
'</a>';
$content .= Display::toolbarAction('toolbar', [$actions]);
$content .= $result['form'];
$content .= $result['table'];
}

@ -300,25 +300,25 @@ Display::display_header($nameTools, 'Exercise');
$inATest = isset($exerciseId) && $exerciseId > 0;
if ($inATest) {
echo '<div class="actions">';
$actions = '';
if (isset($_GET['hotspotadmin']) || isset($_GET['newQuestion'])) {
echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'">'.
$actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/admin.php?exerciseId='.$exerciseId.'&'.api_get_cidreq().'">'.
Display::return_icon('back.png', get_lang('Go back to the questions list'), '', ICON_SIZE_MEDIUM).'</a>';
}
if (!isset($_GET['hotspotadmin']) && !isset($_GET['newQuestion']) && !isset($_GET['editQuestion'])) {
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('BackToTestsList'), '', ICON_SIZE_MEDIUM).'</a>';
}
echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq().'&exerciseId='.$objExercise->getId().'&preview=1">'.
$actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/overview.php?'.api_get_cidreq().'&exerciseId='.$objExercise->getId().'&preview=1">'.
Display::return_icon('preview_view.png', get_lang('Preview'), '', ICON_SIZE_MEDIUM).'</a>';
echo Display::url(
$actions .= Display::url(
Display::return_icon('test_results.png', get_lang('Results and feedback'), '', ICON_SIZE_MEDIUM),
api_get_path(WEB_CODE_PATH).'exercise/exercise_report.php?'.api_get_cidreq().'&exerciseId='.$objExercise->getId()
);
echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->getId().'">'.
$actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/exercise_admin.php?'.api_get_cidreq().'&modifyExercise=yes&exerciseId='.$objExercise->getId().'">'.
Display::return_icon('settings.png', get_lang('Edit test name and settings'), '', ICON_SIZE_MEDIUM).'</a>';
$maxScoreAllQuestions = 0;
@ -334,7 +334,8 @@ if ($inATest) {
}
}
echo '</div>';
echo Display::toolbarAction('toolbar', [$actions]);
if ($objExercise->added_in_lp()) {
echo Display::return_message(
get_lang(
@ -394,17 +395,15 @@ if ($inATest) {
echo Display::return_message($alert, 'normal', false);
} elseif (isset($_GET['newQuestion'])) {
// we are in create a new question from question pool not in a test
echo '<div class="actions">';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'">'.
$actions = '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/admin.php?'.api_get_cidreq().'">'.
Display::return_icon('back.png', get_lang('Go back to the questions list'), '', ICON_SIZE_MEDIUM).'</a>';
echo '</div>';
echo Display::toolbarAction('toolbar', [$actions]);
} else {
// If we are in question_pool but not in an test, go back to question create in pool
echo '<div class="actions">';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/question_pool.php?'.api_get_cidreq().'">'.
$actions = '<a href="'.api_get_path(WEB_CODE_PATH).'exercise/question_pool.php?'.api_get_cidreq().'">'.
Display::return_icon('back.png', get_lang('Go back to the questions list'), '', ICON_SIZE_MEDIUM).
'</a>';
echo '</div>';
echo Display::toolbarAction('toolbar', [$actions]);
}
if ($newQuestion || $editQuestion) {

@ -180,9 +180,9 @@ if ($form->validate()) {
Display::display_header($nameTools, get_lang('Test'));
echo '<div class="actions">';
$actions = '';
if (0 != $objExercise->getId()) {
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'), '', ICON_SIZE_MEDIUM).'</a>';
} else {
if (!empty($_GET['lp_id']) || !empty($_POST['lp_id'])) {
@ -193,16 +193,17 @@ if ($form->validate()) {
$lp_id = $_GET['lp_id'];
}
$lp_id = (int) $lp_id;
echo '<a
$actions .= '<a
href="../lp/lp_controller.php?'.api_get_cidreq().'&gradebook=&action=add_item&type=step&lp_id='.$lp_id.'#resource_tab-2">'.
Display::return_icon('back.png', get_lang('Back to').' '.get_lang('Learning paths'), '', 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('Back to test list'), '', ICON_SIZE_MEDIUM).
'</a>';
}
}
echo '</div>';
echo Display::toolbarAction('toolbar', [$actions]);
if (in_array($objExercise->getFeedbackType(), [EXERCISE_FEEDBACK_TYPE_DIRECT, EXERCISE_FEEDBACK_TYPE_POPUP])) {
echo Display::return_message(

@ -242,16 +242,16 @@ if ('learnpath' === $origin) {
}
if ('learnpath' !== $origin) {
echo '<div class="actions">';
echo '<span style="float:right;">'.search_link().'</span>';
echo '<a href="viewthread.php?'.api_get_cidreq().'&forum='.$forumId.'&thread='.$threadId.'">';
echo Display::return_icon(
//$actionsLeft = '<span style="float:right;">'.search_link().'</span>';
$actionsLeft = '<a href="viewthread.php?'.api_get_cidreq().'&forum='.$forumId.'&thread='.$threadId.'">';
$actionsLeft .= Display::return_icon(
'back.png',
get_lang('Back to thread'),
'',
ICON_SIZE_MEDIUM
).'</a>';
echo '</div>';
echo Display::toolbarAction('toolbar', [$actionsLeft]);
}
/*New display forum div*/
echo '<div class="forum_title">';

@ -298,7 +298,7 @@ if ('learnpath' === $origin) {
echo '<div style="height:15px">&nbsp;</div>';
}
$actions = '<div class="actions">';
$actions = '';
if ('learnpath' !== $origin) {
if (!empty($groupId)) {
$actions .= '<a href="'.api_get_path(WEB_CODE_PATH).'group/group_space.php?'.api_get_cidreq().'">'
@ -331,9 +331,8 @@ if (api_is_allowed_to_edit(false, true) ||
$actions .= get_lang('Forum blocked');
}
}
$actions .= '</div>';
echo $actions;
echo Display::toolbarAction('toolbar', [$actions]);
if (!empty($message)) {
echo $message;

@ -141,8 +141,7 @@ $(function() {
</script>';
/* Actions */
$my_action = isset($_GET['action']) ? $_GET['action'] : '';
$my_action = $_GET['action'] ?? '';
$logInfo = [
'tool' => TOOL_FORUM,
@ -333,6 +332,8 @@ if (($current_forum_category &&
}
}
$actions = Display::toolbarAction('toolbar', [$actions]);
$template->assign('forum_actions', $actions);
$template->assign('origin', api_get_origin());

@ -2657,16 +2657,14 @@ class Agenda
}
$actionsRight = '';
if ('calendar' == $view) {
if ('calendar' === $view) {
$actionsRight .= $form;
}
$toolbar = Display::toolbarAction(
return Display::toolbarAction(
'toolbar-agenda',
[$actionsLeft, $actionsRight]
);
return $toolbar;
}
/**

@ -1431,39 +1431,38 @@ Do you really want to delete this category and its links ?')."')) return false;\
if ($showActionLinks) {
/* Action Links */
$content = '<div class="actions">';
$actions = '';
if (api_is_allowed_to_edit(null, true)) {
$content .= '<a href="'.api_get_self().'?'.api_get_cidreq(
$actions .= '<a href="'.api_get_self().'?'.api_get_cidreq(
).'&action=addlink&category_id='.$categoryId.'">'.
Display::return_icon('new_link.png', get_lang('Add a link'), '', ICON_SIZE_MEDIUM).'</a>';
$content .= '<a href="'.api_get_self().'?'.api_get_cidreq(
$actions .= '<a href="'.api_get_self().'?'.api_get_cidreq(
).'&action=addcategory&category_id='.$categoryId.'">'.
Display::return_icon('new_folder.png', get_lang('Add a category'), '', ICON_SIZE_MEDIUM).'</a>';
}
if (!empty($countCategories)) {
$content .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=none">';
$content .= Display::return_icon(
$actions .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=none">';
$actions .= Display::return_icon(
'forum_listview.png',
get_lang('List View'),
'',
ICON_SIZE_MEDIUM
).' </a>';
$content .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=all">';
$content .= Display::return_icon(
$actions .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=list&show=all">';
$actions .= Display::return_icon(
'forum_nestedview.png',
get_lang('Nested View'),
'',
ICON_SIZE_MEDIUM
).'</a>';
}
$content .= Display::url(
$actions .= Display::url(
Display::return_icon('pdf.png', get_lang('Export to PDF'), '', ICON_SIZE_MEDIUM),
api_get_self().'?'.api_get_cidreq().'&action=export'
);
$content .= '</div>';
$content .= Display::toolbarAction('toolbar', [$actions]);
}
if (empty($countCategories)) {

@ -220,15 +220,14 @@ 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'),
'',
ICON_SIZE_MEDIUM
).'</a>';
echo '</div>';
echo Display::toolbarAction('toolbar', [$actions]);
echo Display::return_message(
get_lang(

@ -54,7 +54,7 @@ switch ($action) {
$tool_name = get_lang('Session list');
Display::display_header($tool_name);
$courseId = isset($_GET['course_id']) ? $_GET['course_id'] : null;
$courseId = $_GET['course_id'] ?? null;
$sessionFilter = new FormValidator(
'course_filter',
@ -352,21 +352,25 @@ $orderUrl = api_get_path(WEB_AJAX_PATH).'session.ajax.php?a=order';
});
});
</script>
<div class="actions">
<?php
echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.
$actionsRight = '';
$actionsLeft = '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_add.php">'.
Display::return_icon('new_session.png', get_lang('Add a training session'), '', ICON_SIZE_MEDIUM).'</a>';
if (api_is_platform_admin()) {
echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.
$actionsLeft .= '<a href="'.api_get_path(WEB_CODE_PATH).'session/add_many_session_to_category.php">'.
Display::return_icon('session_to_category.png', get_lang('Add a training sessionsInCategories'), '', ICON_SIZE_MEDIUM).'</a>';
echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.
$actionsLeft .= '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_list.php">'.
Display::return_icon('folder.png', get_lang('Sessions categories list'), '', ICON_SIZE_MEDIUM).'</a>';
}
echo $actions;
if (api_is_platform_admin()) {
echo '<div class="pull-right">';
$actionsRight .= '<div class="pull-right">';
$actionsRight .= $sessionFilter->returnForm();
$actionsRight .= '</div>';
$actionsRight .= '<div class="pull-right">';
// Create a search-box
$form = new FormValidator(
'search_simple',
@ -379,17 +383,16 @@ if (api_is_platform_admin()) {
$form->addElement('text', 'keyword', null, ['aria-label' => get_lang('Search')]);
$form->addHidden('list_type', $listType);
$form->addButtonSearch(get_lang('Search'));
$form->display();
echo '</div>';
$actionsRight .= $form->returnForm().'</div>';
echo '<div class="pull-right">';
echo $sessionFilter->returnForm();
echo '</div>';
}
echo '</div>';
echo SessionManager::getSessionListTabs($listType);
echo Display::toolbarAction(
'toolbar',
[$actionsLeft, $actionsRight]
);
echo SessionManager::getSessionListTabs($listType);
echo '<div id="session-table" class="table-responsive">';
echo Display::grid_html('sessions');
echo '</div>';

@ -569,21 +569,21 @@ if (isset($_GET['search']) && 'advanced' === $_GET['search']) {
SurveyUtil::display_survey_search_form();
}
echo '<div class="actions">';
$actions = '';
if (!api_is_session_general_coach() || 'true' === $extend_rights_for_coachs) {
// Action links
echo '<a
$actions .= '<a
href="'.api_get_path(WEB_CODE_PATH).'survey/create_new_survey.php?'.api_get_cidreq().'&amp;action=add">'.
Display::return_icon('new_survey.png', get_lang('Create survey'), '', ICON_SIZE_MEDIUM).'</a> ';
$url = api_get_path(WEB_CODE_PATH).'survey/create_meeting.php?'.api_get_cidreq();
echo Display::url(
$actions .= Display::url(
Display::return_icon('add_doodle.png', get_lang('Create surveyDoodle'), '', ICON_SIZE_MEDIUM),
$url
);
}
echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;search=advanced">'.
$actions .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;search=advanced">'.
Display::return_icon('search.png', get_lang('Search'), '', ICON_SIZE_MEDIUM).'</a>';
echo '</div>';
echo Display::toolbarAction('toolbar', [$actions]);
// Load main content
if (api_is_session_general_coach() && 'false' === $extend_rights_for_coachs) {

@ -10,9 +10,7 @@
{{ move_form }}
{% if forum_actions %}
<div class="actions">
{{ forum_actions }}
</div>
{{ forum_actions }}
{% endif %}
{% for post in posts %}

@ -584,7 +584,6 @@ $actions = '';
$selectedTab = 1;
if ($canRead) {
echo '<div class="actions">';
switch ($type) {
case STUDENT:
$selectedTab = 1;
@ -604,34 +603,29 @@ if ($canRead) {
break;
}
echo '<div class="row">';
echo '<div class="col-md-6">';
$actionsLeft = '';
if ($canEdit) {
echo $icon;
$actionsLeft .= $icon;
}
if ($canRead) {
$actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=csv&type='.$type.'">'.
$actionsLeft .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=csv&type='.$type.'">'.
Display::return_icon('export_csv.png', get_lang('CSV export'), [], ICON_SIZE_MEDIUM).'</a> ';
$actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=xls&type='.$type.'">'.
$actionsLeft .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=xls&type='.$type.'">'.
Display::return_icon('export_excel.png', get_lang('Excel export'), [], ICON_SIZE_MEDIUM).'</a> ';
}
if ($canEditUsers && $canEdit) {
$actions .= '<a href="user_import.php?'.api_get_cidreq().'&action=import&type='.$type.'">'.
$actionsLeft .= '<a href="user_import.php?'.api_get_cidreq().'&action=import&type='.$type.'">'.
Display::return_icon('import_csv.png', get_lang('Import users list'), [], ICON_SIZE_MEDIUM).'</a> ';
}
if ($canRead) {
$actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=pdf&type='.$type.'">'.
$actionsLeft .= '<a href="user.php?'.api_get_cidreq().'&action=export&format=pdf&type='.$type.'">'.
Display::return_icon('pdf.png', get_lang('Export to PDF'), [], ICON_SIZE_MEDIUM).'</a> ';
}
echo $actions;
echo '</div>';
echo '<div class="col-md-6">';
echo '<div class="pull-right">';
// Build search-form
$form = new FormValidator(
'search_user',
@ -645,17 +639,15 @@ if ($canRead) {
$form->addText('keyword', '', false);
$form->addElement('hidden', 'cidReq', api_get_course_id());
$form->addButtonSearch(get_lang('Search'));
$form->display();
echo '</div>';
echo '</div>';
echo '</div>';
$actionsRight = $form->returnForm();
$allowTutors = api_get_setting('allow_tutors_to_assign_students_to_session');
if (api_is_allowed_to_edit() && 'true' === $allowTutors) {
$actions .= ' <a class="btn btn-default" href="session_list.php?'.api_get_cidreq().'">'.
$actionsRight .= ' <a class="btn btn-default" href="session_list.php?'.api_get_cidreq().'">'.
get_lang('Course sessions').'</a>';
}
echo '</div>';
echo Display::toolbarAction('toolbar', [$actionsLeft, $actionsRight]);
}
echo UserManager::getUserSubscriptionTab($selectedTab);

@ -74,9 +74,7 @@ function displayWorkActionLinks($id, $action, $isTutor)
}
if ('' !== $output) {
echo '<div class="actions">';
echo $output;
echo '</div>';
echo Display::toolbarAction('toolbar', [$output]);
}
}

@ -32,7 +32,7 @@ $tool_name = get_lang('Assignments');
$item_id = isset($_REQUEST['item_id']) ? (int) $_REQUEST['item_id'] : null;
$origin = api_get_origin();
$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : 'list';
$action = $_REQUEST['action'] ?? 'list';
$display_upload_form = false;
if ('upload_form' === $action) {

Loading…
Cancel
Save