From 14410517d68abab617158acb73e3fe0f48c18814 Mon Sep 17 00:00:00 2001
From: Angel Fernando Quiroz Campos <angelfqc.18@gmail.com>
Date: Thu, 19 Nov 2020 19:00:37 -0500
Subject: [PATCH] XAPI: Improve tincan forms - refs BT#16742

---
 plugin/xapi/launch/add.php  | 18 ++++++++++++++----
 plugin/xapi/launch/edit.php |  6 ++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/plugin/xapi/launch/add.php b/plugin/xapi/launch/add.php
index 75c633093b..216f8dc6ff 100644
--- a/plugin/xapi/launch/add.php
+++ b/plugin/xapi/launch/add.php
@@ -16,7 +16,6 @@ $plugin = XApiPlugin::create();
 $langAddActivity = $plugin->get_lang('AddActivity');
 
 $frmActivity = new FormValidator('frm_activity', 'post', api_get_self().'?'.api_get_cidreq());
-$frmActivity->addHeader($langAddActivity);
 $frmActivity->addFile('file', $plugin->get_lang('TinCanPackage'));
 $frmActivity->addCheckBox('allow_multiple_attempts', '', get_lang('AllowMultipleAttempts'));
 $frmActivity->addButtonAdvancedSettings('advanced_params');
@@ -118,12 +117,23 @@ if ($frmActivity->validate()) {
 
 $frmActivity->setDefaults(['allow_multiple_attempts' => true]);
 
-$pageTitle = $plugin->get_title();
+$actions = Display::url(
+    Display::return_icon('back.png', get_lang('Back'), [], ICON_SIZE_MEDIUM),
+    'list.php?'.api_get_cidreq()
+);
+
 $pageContent = $frmActivity->returnForm();
 
-$interbreadcrumb[] = ['url' => 'list.php', 'name' => $pageTitle];
+$interbreadcrumb[] = ['url' => 'list.php', 'name' => $plugin->get_title()];
 
 $view = new Template($langAddActivity);
-$view->assign('header', $pageTitle);
+$view->assign('header', $langAddActivity);
+$view->assign(
+    'actions',
+    Display::toolbarAction(
+        'xapi_actions',
+        [$actions]
+    )
+);
 $view->assign('content', $pageContent);
 $view->display_one_col_template();
diff --git a/plugin/xapi/launch/edit.php b/plugin/xapi/launch/edit.php
index d810f30f1a..44344c1d8e 100644
--- a/plugin/xapi/launch/edit.php
+++ b/plugin/xapi/launch/edit.php
@@ -33,7 +33,6 @@ $plugin = XApiPlugin::create();
 $langEditActivity = $plugin->get_lang('EditActivity');
 
 $frmActivity = new FormValidator('frm_activity', 'post', api_get_self()."?$cidReq&edit={$toolLaunch->getId()}");
-$frmActivity->addHeader($langEditActivity);
 $frmActivity->addText('title', get_lang('Title'));
 $frmActivity->addTextarea('description', get_lang('Description'));
 $frmActivity->addCheckBox('allow_multiple_attempts', '', get_lang('AllowMultipleAttempts'));
@@ -130,13 +129,12 @@ $actions = Display::url(
     'list.php?'.api_get_cidreq()
 );
 
-$pageTitle = $plugin->get_title();
 $pageContent = $frmActivity->returnForm();
 
-$interbreadcrumb[] = ['url' => 'list.php', 'name' => $pageTitle];
+$interbreadcrumb[] = ['url' => 'list.php', 'name' => $plugin->get_title()];
 
 $view = new Template($langEditActivity);
-$view->assign('header', $pageTitle);
+$view->assign('header', $langEditActivity);
 $view->assign(
     'actions',
     Display::toolbarAction(