' . $toolbar . '
';
$tpl = new Template(get_lang('Badges'));
$tpl->assign('backpack', $backpack);
$templateName = $tpl->get_template('skill/badge.tpl');
$contentTemplate = $tpl->fetch($templateName);
-$tpl->assign('actions', $actions);
+$tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+);
$tpl->assign('content', $contentTemplate);
$tpl->display_one_col_template();
diff --git a/main/admin/skill_badge_create.php b/main/admin/skill_badge_create.php
index 4e1ec6833d..11d7c8a418 100644
--- a/main/admin/skill_badge_create.php
+++ b/main/admin/skill_badge_create.php
@@ -115,13 +115,15 @@ $toolbar = Display::toolbarButton(
'primary',
['title' => get_lang('ManageSkills')]
);
-$actions = '' . $toolbar . '
';
$tpl = new Template(get_lang('CreateBadge'));
$tpl->assign('platformAdminEmail', api_get_setting('emailAdministrator'));
$tpl->assign('skill', $skill);
$tpl->assign('badge_studio', $badgeStudio);
$templateName = $tpl->get_template('skill/badge_create.tpl');
$contentTemplate = $tpl->fetch($templateName);
-$tpl->assign('actions', $actions);
+$tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+);
$tpl->assign('content', $contentTemplate);
$tpl->display_one_col_template();
diff --git a/main/admin/skill_badge_list.php b/main/admin/skill_badge_list.php
index f11c811939..245bc3da3b 100644
--- a/main/admin/skill_badge_list.php
+++ b/main/admin/skill_badge_list.php
@@ -46,14 +46,16 @@ $toolbar = Display::toolbarButton(
'primary',
['title' => get_lang('ManageSkills')]
);
-$actions = '' . $toolbar . '
';
$tpl = new Template(get_lang('Skills'));
$tpl->assign('errorMessage', $errorMessage);
$tpl->assign('skills', $skills);
$templateName = $tpl->get_template('skill/badge_list.tpl');
$contentTemplate = $tpl->fetch($templateName);
-$tpl->assign('actions', $actions);
+$tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+);
$tpl->assign('content', $contentTemplate);
$tpl->display_one_col_template();
diff --git a/main/admin/skill_level.php b/main/admin/skill_level.php
index cfd59d415c..d3c6e2613e 100644
--- a/main/admin/skill_level.php
+++ b/main/admin/skill_level.php
@@ -73,11 +73,11 @@ switch ($action) {
header('Location: '.$listAction);
exit;
}
- $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+ $toolbarAction = Display::url(get_lang('List'), $listAction);
break;
case 'edit':
$tpl->assign('form', $formToDisplay);
- $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+ $toolbarAction = Display::url(get_lang('List'), $listAction);
if ($form->validate()) {
$values = $form->exportValues();
@@ -94,7 +94,7 @@ switch ($action) {
}
break;
case 'delete':
- $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+ $toolbarAction = Display::url(get_lang('List'), $listAction);
$em->remove($item);
$em->flush();
header('Location: '.$listAction);
@@ -102,11 +102,15 @@ switch ($action) {
break;
default:
- $tpl->assign('actions', Display::url(get_lang('Add'), api_get_self().'?action=add'));
+ $toolbarAction = Display::url(get_lang('Add'), api_get_self().'?action=add');
}
$tpl->assign('list', $list);
$templateName = $tpl->get_template('admin/skill_level.tpl');
$contentTemplate = $tpl->fetch($templateName);
+$tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbarAction])
+);
$tpl->assign('content', $contentTemplate);
$tpl->display_one_col_template();
diff --git a/main/admin/skill_list.php b/main/admin/skill_list.php
index e4c0605f91..79cb5caa90 100644
--- a/main/admin/skill_list.php
+++ b/main/admin/skill_list.php
@@ -144,7 +144,6 @@ switch ($action) {
'info',
['title' => get_lang('BadgesManagement')]
);
- $actions = '' . $toolbar . '
';
$extraField = new ExtraField('skill');
$arrayVals = $extraField->get_handler_field_info_by_tags('tags');
$tags = [];
@@ -179,7 +178,10 @@ switch ($action) {
$templateName = $tpl->get_template('skill/list.tpl');
$content = $tpl->fetch($templateName);
- $tpl->assign('actions', $actions);
+ $tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar], [12])
+ );
$tpl->assign('content', $content);
$tpl->display_one_col_template();
diff --git a/main/admin/skill_profile.php b/main/admin/skill_profile.php
index 7b209e90e3..b674be5762 100644
--- a/main/admin/skill_profile.php
+++ b/main/admin/skill_profile.php
@@ -47,6 +47,8 @@ $interbreadcrumb[] = array('url' => 'index.php', 'name' => get_lang('PlatformAdm
$interbreadcrumb[] = array('url' => 'skill.php', 'name' => get_lang('ManageSkillsLevels'));
$interbreadcrumb[] = array('url' => api_get_self(), 'name' => get_lang('SkillProfile'));
+$toolbar = null;
+
$tpl = new Template($action);
switch ($action) {
case 'move_up':
@@ -87,11 +89,11 @@ switch ($action) {
header('Location: '.$listAction);
exit;
}
- $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+ $toolbar = Display::url(get_lang('List'), $listAction);
break;
case 'edit':
$tpl->assign('form', $formToDisplay);
- $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+ $toolbar = Display::url(get_lang('List'), $listAction);
if ($form->validate()) {
$values = $form->exportValues();
@@ -104,7 +106,7 @@ switch ($action) {
break;
case 'delete':
- $tpl->assign('actions', Display::url(get_lang('List'), $listAction));
+ $toolbar = Display::url(get_lang('List'), $listAction);
$em->remove($item);
$em->flush();
header('Location: '.$listAction);
@@ -112,11 +114,19 @@ switch ($action) {
break;
default:
- $tpl->assign('actions', Display::url(get_lang('Add'), api_get_self().'?action=add'));
+ $toolbar = Display::url(get_lang('Add'), api_get_self().'?action=add');
}
$tpl->assign('list', $list);
$templateName = $tpl->get_template('admin/skill_profile.tpl');
$contentTemplate = $tpl->fetch($templateName);
+
+if ($toolbar) {
+ $tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+ );
+}
+
$tpl->assign('content', $contentTemplate);
$tpl->display_one_col_template();
diff --git a/main/admin/teachers_time_by_session_report.php b/main/admin/teachers_time_by_session_report.php
index e41a817404..ce13d5ef7f 100644
--- a/main/admin/teachers_time_by_session_report.php
+++ b/main/admin/teachers_time_by_session_report.php
@@ -176,21 +176,6 @@ $interbreadcrumb[] = [
'name' => get_lang('FollowedSessions')
];
-$actions = [];
-
-if ($session) {
- $actions = [
- Display::url(
- Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
- api_get_self() . '?' . http_build_query(['export' => 'csv', 'session' => $session->getId()])
- ),
- Display::url(
- Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), [], ICON_SIZE_MEDIUM),
- api_get_self() . '?' . http_build_query(['export' => 'xls', 'session' => $session->getId()])
- )
- ];
-}
-
$view = new Template($toolName);
$view->assign('form', $form->returnForm());
@@ -198,12 +183,25 @@ if ($session) {
$view->assign('session', ['id' => $session->getId(), 'name' => $session->getName()]);
$view->assign('courses', $coursesInfo);
$view->assign('users', $usersInfo);
+
+ $actions = Display::url(
+ Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
+ api_get_self() . '?' . http_build_query(['export' => 'csv', 'session' => $session->getId()])
+ );
+ $actions .= Display::url(
+ Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), [], ICON_SIZE_MEDIUM),
+ api_get_self() . '?' . http_build_query(['export' => 'xls', 'session' => $session->getId()])
+ );
+
+ $view->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$actions])
+ );
}
$template = $view->get_template('admin/teachers_time_by_session_report.tpl');
$content = $view->fetch($template);
$view->assign('header', $toolName);
-$view->assign('actions', implode(' ', $actions));
$view->assign('content', $content);
$view->display_one_col_template();
diff --git a/main/admin/user_add.php b/main/admin/user_add.php
index b68c8890e8..deb7a2075e 100755
--- a/main/admin/user_add.php
+++ b/main/admin/user_add.php
@@ -469,7 +469,6 @@ if (!empty($message)){
$content = $form->returnForm();
$tpl = new Template($tool_name);
-//$tpl->assign('actions', $actions);
$tpl->assign('message', $message);
$tpl->assign('content', $content);
$tpl->display_one_col_template();
diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index 8536bcd94c..bb08977c41 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -973,14 +973,10 @@ if ($table->get_total_number_of_items() == 0) {
}
}
}
-$toolbarActions = Display::toolbarAction(
- 'toolbarUser',
- array($actionsLeft, $actionsCenter, $actionsRight),
- 3
-);
+$toolbarActions = Display::toolbarAction('toolbarUser', [$actionsLeft, $actionsCenter, $actionsRight], [4, 4, 4]);
$tpl = new Template($tool_name);
-//$tpl->assign('actions', $toolbarActions);
+$tpl->assign('actions', $toolbarActions);
$tpl->assign('message', $message);
-$tpl->assign('content', $toolbarActions.$form.$table_result.$extra_search_options);
+$tpl->assign('content', $form.$table_result.$extra_search_options);
$tpl->display_one_col_template();
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index c5a60edd80..fa9e852bab 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -667,7 +667,7 @@ if ($allowToEdit) {
}
if ($show_actions) {
- echo Display::toolbarAction('toolbar', array($actionsLeft, $searchFormToString), 2, false);
+ echo Display::toolbarAction('toolbar', array($actionsLeft, $searchFormToString));
}
echo $content;
diff --git a/main/attendance/attendance_sheet.php b/main/attendance/attendance_sheet.php
index 03d0b48c20..5a96ae8366 100755
--- a/main/attendance/attendance_sheet.php
+++ b/main/attendance/attendance_sheet.php
@@ -110,7 +110,7 @@ if (api_is_allowed_to_edit(null, true) ||
Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'';
$actionsRight = $form->returnForm();
- $toolbar = Display::toolbarAction('toolbar-attendance', array($actionsLeft, $actionsRight), 2, false);
+ $toolbar = Display::toolbarAction('toolbar-attendance', array($actionsLeft, $actionsRight));
echo $toolbar;
}
diff --git a/main/auth/profile.php b/main/auth/profile.php
index 5ab117a2fa..c6f9b2fff0 100755
--- a/main/auth/profile.php
+++ b/main/auth/profile.php
@@ -703,18 +703,14 @@ if ($form->validate()) {
// the header
-$actions = null;
+$actions = '';
if (api_get_setting('allow_social_tool') !== 'true') {
if (api_get_setting('extended_profile') === 'true') {
- $actions .= '
diff --git a/main/document/upload.php b/main/document/upload.php
index 68132de12a..a37eccd57e 100755
--- a/main/document/upload.php
+++ b/main/document/upload.php
@@ -225,7 +225,7 @@ if ($is_certificate_mode) {
}
// Link to create a folder
-echo $toolbar = Display::toolbarAction('toolbar-upload', array($actions), 1);
+echo $toolbar = Display::toolbarAction('toolbar-upload', array($actions));
// Form to select directory
$folders = DocumentManager::get_all_document_folders(
$_course,
diff --git a/main/forum/editthread.php b/main/forum/editthread.php
index 6c96075e29..a23b91e1b4 100644
--- a/main/forum/editthread.php
+++ b/main/forum/editthread.php
@@ -142,14 +142,13 @@ $htmlHeadXtra[] = <<
- '
- .Display::return_icon('back.png',get_lang('BackToForum'),'',ICON_SIZE_MEDIUM)
- .'
-
-';
+$actions = [
+ Display::url(
+ Display::return_icon('back.png', get_lang('BackToForum'), '', ICON_SIZE_MEDIUM),
+ 'viewforum.php?forum='.$forumId.'&'.$cidreq
+ ),
+ search_link()
+];
$threadData = getThreadInfo($threadId, $cId);
@@ -267,6 +266,9 @@ if ($form->validate()) {
$orginIsLearpath = $origin == 'learnpath';
$view = new Template('', !$orginIsLearpath, !$orginIsLearpath, $orginIsLearpath, $orginIsLearpath);
-$view->assign('actions', $actions);
+$view->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', $actions)
+);
$view->assign('content', $form->returnForm());
$view->display_one_col_template();
diff --git a/main/group/group.php b/main/group/group.php
index b701e4011a..3fc3e5d292 100755
--- a/main/group/group.php
+++ b/main/group/group.php
@@ -211,7 +211,7 @@ if (api_is_allowed_to_edit(false, true)) {
}
$actionsRight = GroupManager::getSearchForm();
-$toolbar = Display::toolbarAction('toolbar-groups', $content = array($actionsLeft, $actionsRight));
+$toolbar = Display::toolbarAction('toolbar-groups', array($actionsLeft, $actionsRight));
$group_cats = GroupManager::get_categories(api_get_course_id());
echo $toolbar;
diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php
index 7af78b103a..fd569b123e 100644
--- a/main/inc/lib/agenda.lib.php
+++ b/main/inc/lib/agenda.lib.php
@@ -3063,9 +3063,7 @@ class Agenda
$toolbar = Display::toolbarAction(
'toolbar-agenda',
- array(0 => $actionsLeft, 1 => $actionsRight),
- 2,
- false
+ array($actionsLeft, $actionsRight)
);
return $toolbar;
diff --git a/main/inc/lib/glossary.lib.php b/main/inc/lib/glossary.lib.php
index 15a4ad82f1..a6fe7ba721 100755
--- a/main/inc/lib/glossary.lib.php
+++ b/main/inc/lib/glossary.lib.php
@@ -413,7 +413,7 @@ class GlossaryManager
$toolbar = Display::toolbarAction(
'toolbar-document',
- array(0 => $actionsLeft, 1 => $actionsRight)
+ array($actionsLeft, $actionsRight)
);
$content = $toolbar;
diff --git a/main/lp/lp_list.php b/main/lp/lp_list.php
index 1cd451f568..f8908fbb6b 100755
--- a/main/lp/lp_list.php
+++ b/main/lp/lp_list.php
@@ -104,7 +104,7 @@ if ($is_allowed_to_edit) {
'../upload/upload_ppt.php?'.api_get_cidreq().'&curdirpath=/&tool='.TOOL_LEARNPATH
);
}
- $actions = Display::toolbarAction('actions-lp', array(0 => $actionLeft) );
+ $actions = Display::toolbarAction('actions-lp', array($actionLeft));
}
$token = Security::get_token();
diff --git a/main/lp/lp_report.php b/main/lp/lp_report.php
index 63900a2979..e524bcbc9d 100644
--- a/main/lp/lp_report.php
+++ b/main/lp/lp_report.php
@@ -130,6 +130,9 @@ $template->assign('lp_id', $lpId);
$layout = $template->get_template('learnpath/report.tpl');
$template->assign('header', $lpInfo['name']);
-$template->assign('actions', $actions);
+$template->assign(
+ 'actions',
+ Display::toolbarAction('lp_actions', [$actions])
+);
$template->assign('content', $template->fetch($layout));
$template->display_one_col_template();
diff --git a/main/messages/inbox.php b/main/messages/inbox.php
index 9d4a50b882..97e9baefa0 100755
--- a/main/messages/inbox.php
+++ b/main/messages/inbox.php
@@ -175,17 +175,19 @@ if (!isset($_GET['del_msg'])) {
}
$tpl = new Template(null);
+
+if ($actions) {
+ $tpl->assign('actions', Display::toolbarAction('toolbar', [$actions]));
+}
// Block Social Avatar
SocialManager::setSocialUserBlock($tpl, api_get_user_id(), 'messages');
if (api_get_setting('allow_social_tool') == 'true') {
- $tpl->assign('actions', $actions);
$tpl->assign('social_menu_block', $social_menu_block);
$tpl->assign('social_right_content', $social_right_content);
$social_layout = $tpl->get_template('social/inbox.tpl');
$tpl->display($social_layout);
} else {
$content = $social_right_content;
- $tpl->assign('actions', $actions);
$tpl->assign('message', $show_message);
$tpl->assign('content', $content);
$tpl->display_one_col_template();
diff --git a/main/messages/outbox.php b/main/messages/outbox.php
index 41bcd35cda..a3b7e7f085 100755
--- a/main/messages/outbox.php
+++ b/main/messages/outbox.php
@@ -150,7 +150,14 @@ if (api_get_setting('allow_social_tool') == 'true') {
$tpl->display($social_layout);
} else {
$content = $social_right_content;
- $tpl->assign('actions', $actions);
+
+ if ($actions) {
+ $tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$actions])
+ );
+ }
+
$tpl->assign('content', $content);
$tpl->display_one_col_template();
}
diff --git a/main/mySpace/works_in_session_report.php b/main/mySpace/works_in_session_report.php
index 61b7902a89..9632097bce 100644
--- a/main/mySpace/works_in_session_report.php
+++ b/main/mySpace/works_in_session_report.php
@@ -152,19 +152,17 @@ $interbreadcrumb[] = [
'name' => get_lang('MySpace')
];
-$actions = [];
+$actions = null;
if ($session) {
- $actions = [
- Display::url(
- Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
- api_get_self() . '?' . http_build_query(['export' => 'csv', 'session' => $session->getId()])
- ),
- Display::url(
- Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), [], ICON_SIZE_MEDIUM),
- api_get_self() . '?' . http_build_query(['export' => 'xls', 'session' => $session->getId()])
- )
- ];
+ $actions = Display::url(
+ Display::return_icon('export_csv.png', get_lang('ExportAsCSV'), [], ICON_SIZE_MEDIUM),
+ api_get_self() . '?' . http_build_query(['export' => 'csv', 'session' => $session->getId()])
+ );
+ $actions .=Display::url(
+ Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), [], ICON_SIZE_MEDIUM),
+ api_get_self() . '?' . http_build_query(['export' => 'xls', 'session' => $session->getId()])
+ );
}
$view = new Template($toolName);
@@ -180,6 +178,13 @@ $template = $view->get_template('my_space/works_in_session_report.tpl');
$content = $view->fetch($template);
$view->assign('header', $toolName);
+
+if ($actions) {
+ $view->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$actions])
+ );
+}
+
$view->assign('content', $content);
-$view->assign('actions', implode(' ', $actions));
$view->display_one_col_template();
diff --git a/main/social/myfiles.php b/main/social/myfiles.php
index 646091fc6b..fd007bbf55 100755
--- a/main/social/myfiles.php
+++ b/main/social/myfiles.php
@@ -73,22 +73,10 @@ $social_menu_block = SocialManager::show_social_menu('myfiles');
$actions = null;
if (isset($_GET['cidReq'])) {
- $actions = '
' . Display::return_icon(
- 'back.png',
- get_lang('BackTo') . ' ' . get_lang('Documents') . ' (' . get_lang(
- 'Course'
- ) . ')'
- ) . '';
+ $actions = Display::url(
+ Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('Documents').' ('.get_lang('Course').')'),
+ api_get_self().'?'.api_get_cidreq().'&id='.$_GET['parent_id']
+ );
}
if (api_get_setting('allow_social_tool') == 'true') {
@@ -122,7 +110,10 @@ if (api_get_setting('allow_social_tool') == 'true') {
$tpl->display($social_layout);
} else {
$controller = new IndexManager(get_lang('MyCourses'));
- $tpl->assign('actions', $actions);
+ $tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$actions])
+ );
$tpl->assign('content', $editor);
$tpl->assign('profile_block', $controller->return_profile_block());
$tpl->assign('user_image_block', $controller->return_user_image_block());
diff --git a/main/timeline/index.php b/main/timeline/index.php
index 21f3af45ad..8900958179 100755
--- a/main/timeline/index.php
+++ b/main/timeline/index.php
@@ -62,7 +62,7 @@ $(function() {
'.Display::grid_js('timelines', $url,$columns,$column_model,$extra_params, array(), null,true).'
});
';
-
+$toolbarAction = '';
$timeline = new Timeline();
// Action handling: Add
diff --git a/main/timeline/view.php b/main/timeline/view.php
index 85bf13aeb7..087ba9e594 100755
--- a/main/timeline/view.php
+++ b/main/timeline/view.php
@@ -29,7 +29,6 @@ $htmlHeadXtra[] = '
$content = '
';
$tpl = new Template($tool_name);
-$tpl->assign('actions', $actions);
$tpl->assign('message', $message);
$tpl->assign('content', $content);
$tpl->display_one_col_template();
diff --git a/main/tracking/courseLog.php b/main/tracking/courseLog.php
index 12dfa79220..6e1b14c11e 100755
--- a/main/tracking/courseLog.php
+++ b/main/tracking/courseLog.php
@@ -259,7 +259,7 @@ $form_search->addElement('hidden', 'session_id', $sessionId);
$form_search->addElement('hidden', 'id_session', $sessionId);
$form_search->addElement('text', 'user_keyword');
$form_search->addButtonSearch(get_lang('SearchUsers'));
-echo Display::toolbarAction('toolbar-courselog', [$actionsLeft, $form_search->returnForm(), $actionsRight], 3);
+echo Display::toolbarAction('toolbar-courselog', [$actionsLeft, $form_search->returnForm(), $actionsRight]);
$course_name = get_lang('Course').' '.$courseInfo['name'];
if ($session_id) {
diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php
index 314382b8f9..dbe372a12f 100755
--- a/main/user/subscribe_user.php
+++ b/main/user/subscribe_user.php
@@ -204,7 +204,7 @@ $form->addText('keyword', '', false);
$form->addElement('hidden', 'type', $type);
$form->addElement('hidden', 'cidReq', api_get_course_id());
$form->addButtonSearch(get_lang('Search'));
-echo Display::toolbarAction('toolbar-subscriber', [$actionsLeft.$extraForm, $form->returnForm()]);
+echo Display::toolbarAction('toolbar-subscriber', [$actionsLeft, $extraForm, $form->returnForm()], [4, 4, 4]);
$option = $type == COURSEMANAGER ? 2 : 1;
echo UserManager::getUserSubscriptionTab($option);
diff --git a/main/work/view.php b/main/work/view.php
index 67e7ce23ac..fc4658bd69 100755
--- a/main/work/view.php
+++ b/main/work/view.php
@@ -160,10 +160,9 @@ if ((user_is_author($id) || $isDrhOfCourse || (api_is_allowed_to_edit() || api_i
$tpl->assign('work', $work);
$tpl->assign('comments', $comments);
- $actions = '';
if (isset($work['contains_file'])) {
if (isset($work['download_url'])) {
- $actions .= Display::url(
+ $actions = Display::url(
Display::return_icon(
'save.png',
get_lang('Download'),
@@ -195,10 +194,14 @@ if ((user_is_author($id) || $isDrhOfCourse || (api_is_allowed_to_edit() || api_i
);
}
}
+
+ $tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$actions])
+ );
}
}
- $tpl->assign('actions', $actions);
if (api_is_allowed_to_session_edit()) {
$tpl->assign('form', $commentForm);
}
diff --git a/main/work/work_list.php b/main/work/work_list.php
index da246ad655..6278b83260 100755
--- a/main/work/work_list.php
+++ b/main/work/work_list.php
@@ -82,7 +82,7 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !api_is_in
$tpl = new Template('');
-$content = Display::toolbarAction('toolbar-work', array($actionsLeft . $actionsRight));
+$content = Display::toolbarAction('toolbar-work', array($actionsLeft, $actionsRight));
if (!empty($my_folder_data['title'])) {
$content .= Display::page_subheader($my_folder_data['title']);
}
diff --git a/main/work/work_list_all.php b/main/work/work_list_all.php
index 3dd67e9e5b..7d6a531216 100755
--- a/main/work/work_list_all.php
+++ b/main/work/work_list_all.php
@@ -197,7 +197,7 @@ if (api_is_allowed_to_session_edit(false, true) && !empty($workId) && !$isDrhOfC
$actionsLeft .= Display::toolbarButton(get_lang('DeleteCorrections'), $url, 'remove', 'danger');
}
-echo Display::toolbarAction('toolbar-worklist', array($actionsLeft), 1);
+echo Display::toolbarAction('toolbar-worklist', array($actionsLeft), [12]);
if (!empty($my_folder_data['title'])) {
echo Display::page_subheader($my_folder_data['title']);
diff --git a/news_list.php b/news_list.php
index fa77ba849d..ced750383f 100755
--- a/news_list.php
+++ b/news_list.php
@@ -5,12 +5,6 @@
require_once 'main/inc/global.inc.php';
$tool_name = get_lang('SystemAnnouncements');
-$actions = '';
-if (api_is_platform_admin()) {
- $actions = '
'.
- Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), array(), 32).'';
-}
-
if (api_is_anonymous()) {
$visibility = SystemAnnouncementManager::VISIBLE_GUEST;
} else {
@@ -24,7 +18,18 @@ if (!isset($_GET['id']) || empty($_GET['id'])) {
}
$tpl = new Template($tool_name);
-$tpl->assign('actions', $actions);
-//$tpl->assign('message', $message);
+
+if (api_is_platform_admin()) {
+ $actionEdit = Display::url(
+ Display::return_icon('edit.png', get_lang('EditSystemAnnouncement'), [], ICON_SIZE_MEDIUM),
+ api_get_path(WEB_PATH).'main/admin/system_announcements.php'
+ );
+
+ $tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$actionEdit])
+ );
+}
+
$tpl->assign('content', $content);
$tpl->display_one_col_template();
diff --git a/plugin/bbb/admin.php b/plugin/bbb/admin.php
index 0313e7fee1..26f98ccfa6 100644
--- a/plugin/bbb/admin.php
+++ b/plugin/bbb/admin.php
@@ -36,8 +36,6 @@ $form->addDatePicker('search_meeting_end', get_lang('DateEnd'));
$form->addButtonSearch(get_lang('Search'));
$form->setDefaults($dateRange);
-$actions = [];
-
if ($form->validate()) {
$dateRange = $form->getSubmitValues();
}
@@ -107,10 +105,9 @@ $tpl->assign('meetings', $meetings);
$tpl->assign('search_form', $form->returnForm());
$content = $tpl->fetch('bbb/admin.tpl');
-$actions = [];
if ($meetings) {
- $actions[] = Display::toolbarButton(
+ $actions = Display::toolbarButton(
get_lang('ExportInExcel'),
api_get_self().'?'.http_build_query([
'action' => 'export',
@@ -120,9 +117,13 @@ if ($meetings) {
'file-excel-o',
'success'
);
+
+ $tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$actions])
+ );
}
$tpl->assign('header', $plugin->get_lang('RecordList'));
-$tpl->assign('actions', implode('', $actions));
$tpl->assign('content', $content);
$tpl->display_one_col_template();
diff --git a/plugin/bbb/listing.php b/plugin/bbb/listing.php
index 007f22cf88..094c350698 100755
--- a/plugin/bbb/listing.php
+++ b/plugin/bbb/listing.php
@@ -189,16 +189,17 @@ $listing_tpl = 'bbb/listing.tpl';
$content = $tpl->fetch($listing_tpl);
if (api_is_platform_admin()) {
- $actionLinks = [
- Display::toolbarButton(
- $plugin->get_lang('AdminView'),
- api_get_path(WEB_PLUGIN_PATH) . 'bbb/admin.php',
- 'list',
- 'primary'
- )
- ];
-
- $tpl->assign('actions', implode(PHP_EOL, $actionLinks));
+ $actionLinks = Display::toolbarButton(
+ $plugin->get_lang('AdminView'),
+ api_get_path(WEB_PLUGIN_PATH) . 'bbb/admin.php',
+ 'list',
+ 'primary'
+ );
+
+ $tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$actionLinks])
+ );
}
$tpl->assign('content', $content);
diff --git a/plugin/buycourses/src/course_panel.php b/plugin/buycourses/src/course_panel.php
index b2635f37d9..38d37a587b 100644
--- a/plugin/buycourses/src/course_panel.php
+++ b/plugin/buycourses/src/course_panel.php
@@ -55,7 +55,10 @@ $tpl->assign('sale_list', $saleList);
$content = $tpl->fetch('buycourses/view/course_panel.tpl');
-$tpl->assign('actions', $toolbar);
+$tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+);
$tpl->assign('header', $templateName);
$tpl->assign('content', $content);
$tpl->display_one_col_template();
\ No newline at end of file
diff --git a/plugin/buycourses/src/payout_panel.php b/plugin/buycourses/src/payout_panel.php
index 33cca12b18..aecee20513 100644
--- a/plugin/buycourses/src/payout_panel.php
+++ b/plugin/buycourses/src/payout_panel.php
@@ -51,7 +51,10 @@ $tpl->assign('payout_list', $payoutList);
$content = $tpl->fetch('buycourses/view/payout_panel.tpl');
-$tpl->assign('actions', $toolbar);
+$tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+);
$tpl->assign('header', $templateName);
$tpl->assign('content', $content);
$tpl->display_one_col_template();
\ No newline at end of file
diff --git a/plugin/buycourses/src/sales_report.php b/plugin/buycourses/src/sales_report.php
index de27e42f4a..a481dc844e 100644
--- a/plugin/buycourses/src/sales_report.php
+++ b/plugin/buycourses/src/sales_report.php
@@ -139,11 +139,8 @@ $templateName = $plugin->get_lang('SalesReport');
$template = new Template($templateName);
-$toolbar = '';
-
if ($paypalEnable == "true" && $commissionsEnable == "true") {
-
- $toolbar .= Display::toolbarButton(
+ $toolbar = Display::toolbarButton(
$plugin->get_lang('PaypalPayoutCommissions'),
api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/paypal_payout.php',
'paypal',
@@ -151,13 +148,14 @@ if ($paypalEnable == "true" && $commissionsEnable == "true") {
['title' => $plugin->get_lang('PaypalPayoutCommissions')]
);
- $template->assign('actions', $toolbar);
-
+ $template->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+ );
}
if ($commissionsEnable == "true") {
-
- $toolbar .= Display::toolbarButton(
+ $toolbar = Display::toolbarButton(
$plugin->get_lang('PayoutReport'),
api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/payout_report.php',
'money',
@@ -165,8 +163,10 @@ if ($commissionsEnable == "true") {
['title' => $plugin->get_lang('PayoutReport')]
);
- $template->assign('actions', $toolbar);
-
+ $template->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+ );
}
$template->assign('form', $form->returnForm());
$template->assign('selected_sale', $selectedSale);
diff --git a/plugin/buycourses/src/service_panel.php b/plugin/buycourses/src/service_panel.php
index af020bb409..071e33d686 100644
--- a/plugin/buycourses/src/service_panel.php
+++ b/plugin/buycourses/src/service_panel.php
@@ -69,7 +69,10 @@ if ($servicesOnly) {
$content = $tpl->fetch('buycourses/view/service_panel.tpl');
-$tpl->assign('actions', $toolbar);
+$tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+);
$tpl->assign('header', $templateName);
$tpl->assign('content', $content);
$tpl->display_one_col_template();
\ No newline at end of file
diff --git a/plugin/buycourses/src/service_sales_report.php b/plugin/buycourses/src/service_sales_report.php
index bd22b607cb..4115efc8bc 100644
--- a/plugin/buycourses/src/service_sales_report.php
+++ b/plugin/buycourses/src/service_sales_report.php
@@ -51,11 +51,8 @@ $templateName = $plugin->get_lang('SalesReport');
$template = new Template($templateName);
-$toolbar = '';
-
if ($paypalEnable == 'true' && $commissionsEnable == 'true') {
-
- $toolbar .= Display::toolbarButton(
+ $toolbar = Display::toolbarButton(
$plugin->get_lang('PaypalPayoutCommissions'),
api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/paypal_payout.php',
'paypal',
@@ -63,13 +60,14 @@ if ($paypalEnable == 'true' && $commissionsEnable == 'true') {
['title' => $plugin->get_lang('PaypalPayoutCommissions')]
);
- $template->assign('actions', $toolbar);
-
+ $template->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+ );
}
if ($commissionsEnable == 'true') {
-
- $toolbar .= Display::toolbarButton(
+ $toolbar = Display::toolbarButton(
$plugin->get_lang('PayoutReport'),
api_get_path(WEB_PLUGIN_PATH) . 'buycourses/src/payout_report.php',
'money',
@@ -77,8 +75,10 @@ if ($commissionsEnable == 'true') {
['title' => $plugin->get_lang('PayoutReport')]
);
- $template->assign('actions', $toolbar);
-
+ $template->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+ );
}
$template->assign('form', $form->returnForm());
$template->assign('showing_services', true);
diff --git a/plugin/buycourses/src/session_panel.php b/plugin/buycourses/src/session_panel.php
index c6c896358d..b471206c62 100644
--- a/plugin/buycourses/src/session_panel.php
+++ b/plugin/buycourses/src/session_panel.php
@@ -56,7 +56,10 @@ $tpl->assign('sale_list', $saleList);
$content = $tpl->fetch('buycourses/view/session_panel.tpl');
-$tpl->assign('actions', $toolbar);
+$tpl->assign(
+ 'actions',
+ Display::toolbarAction('toolbar', [$toolbar])
+);
$tpl->assign('header', $templateName);
$tpl->assign('content', $content);
$tpl->display_one_col_template();
\ No newline at end of file
diff --git a/plugin/vchamilo/views/manage.controller.php b/plugin/vchamilo/views/manage.controller.php
index 7e5c1b0427..9dac5c89d6 100644
--- a/plugin/vchamilo/views/manage.controller.php
+++ b/plugin/vchamilo/views/manage.controller.php
@@ -162,7 +162,6 @@ switch ($action) {
$content .= '
';
$tpl = new Template(get_lang('Snapshot'), true, true, false, true, false);
- $tpl->assign('actions', '');
$tpl->assign('message', '