diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 4c99acf4205..46d8dc0dc80 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -361,11 +361,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
} else {
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 16463ec027b..2aa33f21645 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -242,11 +242,7 @@ if ($action == 'create') {
print '';
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 42e0b84228f..e5593ef6107 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -1121,15 +1121,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- if (!empty($backtopage)) {
- print '';
- } else {
- print '';
- }
- print '
';
+ print $form->buttonsSaveCancel("AddMember");
print "\n";
}
@@ -1396,11 +1388,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print '';
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Save", '');
print '';
}
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 575d6d2301b..3f4a3872980 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -245,11 +245,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
print "\n";
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index f640407c570..7ff9c3806a5 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -399,9 +399,8 @@ if ($action == 'create') {
print dol_get_fiche_end();
print '';
- print '';
- print ' ';
- print '';
+ print '';
+ print '';
print '
';
print "\n";
@@ -830,11 +829,7 @@ if ($rowid > 0) {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print "";
}
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 6c8f273ae77..63ff01584b0 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -228,13 +228,7 @@ if ($action == 'edit') {
}
}
- print '
';
-
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
} elseif ($action != 'create') {
@@ -297,11 +291,7 @@ if ($action == 'create' && $user->rights->adherent->configurer) {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index 24df7e0cb68..c7bd40efa37 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -177,12 +177,7 @@ print '';
print '';
-print '
';
-print '';
-//print ' ';
-//print '';
-print '
';
-//print '
';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index a3d725bee93..730983ad090 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -209,9 +209,7 @@ print '';
print dol_get_fiche_end();
-print '';
-print '';
-print "
";
+print $form->buttonsSaveCancel("Save", '');
print "\n";
diff --git a/htdocs/admin/agenda_other.php b/htdocs/admin/agenda_other.php
index 54d5158b4ed..463df5475f9 100644
--- a/htdocs/admin/agenda_other.php
+++ b/htdocs/admin/agenda_other.php
@@ -392,7 +392,7 @@ print '';
print dol_get_fiche_end();
-print '';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 59dd1bf1ac2..4f2a2bbe917 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -139,9 +139,7 @@ print '';
print dol_get_fiche_end();
-print '';
-print '';
-print "
";
+print $form->buttonsSaveCancel("Save", '');
print "\n";
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index 79853c9cda9..fb937dc1dbe 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -499,9 +499,7 @@ print "\n";
print '';
print dol_get_fiche_end();
-print '';
-print '';
-print '
';
+$form->buttonsSaveCancel("Save", '');
print "\n";
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index e6211f0b56f..b0eb36d81ac 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -272,8 +272,7 @@ if ($resql) {
print "\n";
if (empty($conf->use_javascript_ajax)) {
- print '';
- print '';
+ print $form->buttonsSaveCancel("Save", '');
}
print "
";
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 56971457f76..c4e697bfe00 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -473,9 +473,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL == 2 || !empty($conf->global->MAIN_ACTIVA
print '';
print '';
-print '
';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print '';
print "\n".''."\n";
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 0ca1ae7d98e..7420aa17ce9 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -824,10 +824,7 @@ if ($mysoc->useRevenueStamp()) {
print "";
-
-print '
';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index 2d4b2e6d128..57c75b352f8 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -135,9 +135,7 @@ print '';
print '
';
-print '
';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index c10a6ed04b4..ea8a80b17d6 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -468,9 +468,7 @@ print '';
print '';
-print '';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 4b1e34335e8..2c6f9dc17c9 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -448,8 +448,8 @@ if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METE
if ($action == 'edit') {
- print '
';
- print '
';
+ print $form->buttonsSaveCancel("Save", '');
+ print '';
} else {
print '
';
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index fdc0b893087..fe1a61c686c 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -276,11 +276,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
}
@@ -309,9 +305,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index d01aece1ca0..c37c5ccd41f 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -298,11 +298,7 @@ if ($action == 'edit') {
}
print '';
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
print '
';
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index 7ff30242336..0b6beb2abc6 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -460,9 +460,7 @@ print ''."\n";
print '';
-print '';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 3388b649a67..9d3fd768647 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -215,7 +215,7 @@ if (empty($conf->use_javascript_ajax)) {
print $conf->global->FCKEDITOR_TEST;
print '';
}
- print '
'."\n";
+ print $form->buttonsSaveCancel("Save", '');
print '';
print ''."\n";
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index c9214742d13..9dfb15477cc 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -556,10 +556,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
print '';
print '';
-
-print '';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index e86c78763ee..de160a1c946 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -536,11 +536,7 @@ if ($action == 'edit') {
print dol_get_fiche_end();
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
} else {
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 511f5dde698..436ffa3d003 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -405,11 +405,7 @@ if ($action == 'edit') {
print dol_get_fiche_end();
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
} else {
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index d8c827337ad..f91b9685c88 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -395,12 +395,8 @@ if ($action != 'create') {
print $form->selectarray('active', $object->fields['active']['arrayofkeyval'], (GETPOSTISSET('active') ? GETPOST('active', 'int') : $object->active), 0, 0, 0, '', 1);
print '';
print '';
- print '
';
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+
+ print $form->buttonsSaveCancel();
}
} else {
/*print '';
}
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index 939273c1da2..667f58807dc 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -380,11 +380,7 @@ if ($action == 'edit') {
print dol_get_fiche_end();
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
} else {
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 2e84efbfb06..aaadde965a2 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -391,11 +391,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
} elseif ($action == 'edit') {
@@ -516,12 +512,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- // Bouton
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 4c1df0fa938..8137c34e1e6 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -201,7 +201,7 @@ print '';
print '';
print '';
-print '';
+print $form->buttonsSaveCancel("Save", '');
print '';
@@ -280,7 +280,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
}
print '';
- print '';
+ print $form->buttonsSaveCancel("Save", '');
} else {
print '';
print '';
@@ -463,7 +463,7 @@ print '
';
print '
';
-print '';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php
index 2e262a1bb7e..e6bc6ee8f1d 100644
--- a/htdocs/admin/openinghours.php
+++ b/htdocs/admin/openinghours.php
@@ -131,10 +131,7 @@ if (empty($action) || $action == 'edit' || $action == 'updateedit') {
print '';
- print '
';
- print '';
- print '
';
- print '
';
+ print $form->buttonsSaveCancel("Save", '');
print '';
}
diff --git a/htdocs/admin/payment.php b/htdocs/admin/payment.php
index 9b380b676b4..b4b06d62e5e 100644
--- a/htdocs/admin/payment.php
+++ b/htdocs/admin/payment.php
@@ -273,11 +273,7 @@ print '';
print dol_get_fiche_end();
-print '
';
-print '';
-print '';
-print '
';
-print '
';
+print $form->buttonsSaveCancel("Modify", '');
print '';
diff --git a/htdocs/admin/paymentbybanktransfer.php b/htdocs/admin/paymentbybanktransfer.php
index 43ad8c15929..e130f0479c4 100644
--- a/htdocs/admin/paymentbybanktransfer.php
+++ b/htdocs/admin/paymentbybanktransfer.php
@@ -200,9 +200,8 @@ if (!$conf->global->PAYMENTBYBANKTRANSFER_ADDDAYS) {
print '';
print '';
print '';
-print '
';
-print '';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index 3f58353320e..5030c487537 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -466,9 +466,7 @@ print '';
print '';
print '';
-print '
';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index 7dec909ecb6..3883e885619 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -128,9 +128,7 @@ print '';
print '';
/*
-print '
';
-print '';
-print '
';
+ print $form->buttonsSaveCancel();
*/
print '';
diff --git a/htdocs/admin/prelevement.php b/htdocs/admin/prelevement.php
index 01e3b6d4913..739709410ce 100644
--- a/htdocs/admin/prelevement.php
+++ b/htdocs/admin/prelevement.php
@@ -214,9 +214,8 @@ print '';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 883a6ff6f03..988023175db 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -341,7 +341,7 @@ if ($mode == 'config' && $user->admin) {
print ''.$printer->profileresprint.' | ';
print ' | ';
print '';
- print '';
+ print $form->buttonsSaveCancel("Save", '');
print ' | ';
print '';
} else {
@@ -432,7 +432,7 @@ if ($mode == 'template' && $user->admin) {
print '';
print '';
print '';
- print '';
+ print $form->buttonsSaveCancel("Save", '');
print ' | ';
} else {
print ''.$printer->listprinterstemplates[$line]['name'].' | ';
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index 320857de887..bfd2ae4b09b 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -580,9 +580,7 @@ print '';
print '';
-print '';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 98ce554c363..22e4a4a1b42 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -390,7 +390,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
print '';
print '';
- print '';
+ print $form->buttonsSaveCancel("Save", '');
print '';
}
diff --git a/htdocs/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index c6cd45a0cc5..07da0541619 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -81,9 +81,7 @@ if ($action == 'edit') {
print '';
- print '
';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Save", '');
print '';
print '
';
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 3d722bca400..4a2e98fc666 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -169,11 +169,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
@@ -210,9 +206,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/asset/type.php b/htdocs/asset/type.php
index 6103b963e21..6f743172617 100644
--- a/htdocs/asset/type.php
+++ b/htdocs/asset/type.php
@@ -396,11 +396,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ $form->buttonsSaveCancel("Add");
print "\n";
}
@@ -600,9 +596,7 @@ if ($rowid > 0) {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print "";
}
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index cd530994b9b..235336d4f73 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -267,11 +267,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
}
@@ -302,9 +298,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
}
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index f7795a14f47..045e656de50 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -301,7 +301,8 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
print dol_get_fiche_end();
if ($action == 'edit') {
- print '
';
+ print $form->buttonsSaveCancel();
+
print '';
}
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index cd5d7ad8214..80f64210bf5 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -274,11 +274,7 @@ if ($action == 'edit') {
print '
';
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
} elseif ($action != 'add') {
@@ -334,11 +330,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
print '';
print '';
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 97a573ce86f..a403a1cdf40 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -1317,15 +1317,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- if (empty($backtopage)) {
- print '';
- } else {
- print '';
- }
- print '
';
+ print $form->buttonsSaveCancel("Add");
print "";
}
@@ -1804,11 +1796,7 @@ if ($id > 0) {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
} else {
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index fb10c6435af..25ef23dd7de 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -121,7 +121,7 @@ if ($_socid > 0) {
print dol_get_fiche_end();
- print '';
+ print $form->buttonsSaveCancel("Save", '');
print "";
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 163581221a8..3020f9af822 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1860,11 +1860,8 @@ if ($action == 'create') {
print dol_get_fiche_end();
$langs->load("bills");
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+
+ print $form->buttonsSaveCancel("CreateDraft");
print "";
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 8420a5e7f87..004b5a3c205 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -1822,12 +1822,7 @@ if ($action == 'create' && $usercancreate) {
print dol_get_fiche_end();
- // Button "Create Draft"
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("CreateDraft");
// Show origin lines
if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index d1cc0413bfd..02b967f6fdb 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -565,11 +565,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("CreateAccount");
print '';
} else {
@@ -1081,11 +1077,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Modify");
print '';
}
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 2b4a68bec90..68c6ed20458 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -512,11 +512,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index affdd2e8991..0da621efd97 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -1144,10 +1144,8 @@ if ($action == 'create') {
}
print "\n";
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Create");
+
print "\n";
} else {
dol_print_error('', "Error, no invoice ".$object->id);
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index 5d81da90088..0e1ff6b405b 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -3785,11 +3785,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- // Button "Create Draft"
- print '';
- print '';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("CreateDraft");
// Show origin lines
if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 451007932d7..e2a96f4fb5b 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -196,11 +196,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index daf5afb025e..a093a086050 100755
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -726,12 +726,9 @@ if ($id) {
print dol_get_fiche_end();
if ($action == 'edit') {
- print '';
- print '';
- print ' ';
- print '';
- print '
';
- print "\n";
+ print $form->buttonsSaveCancel();
+
+ print "";
}
/*
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 469869f00e9..13096ddcd40 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -883,16 +883,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print dol_get_fiche_end();
- print '';
- print '';
- if (!empty($backtopage)) {
- print ' ';
- print '';
- } else {
- print ' ';
- print '';
- }
- print '
';
+ print $form->buttonsSaveCancel("Add");
print "";
} elseif ($action == 'edit' && !empty($id)) {
@@ -1220,11 +1211,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print "";
}
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index 261ffebf29c..a5b64e37998 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -205,11 +205,7 @@ if ($action == 'edit') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print "";
} else {
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index d5187c6a040..470895a2c22 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -1174,11 +1174,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Create");
if (is_object($objectsrc)) {
print '';
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 07abdb4b465..d7576981cea 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -9250,4 +9250,74 @@ class Form
return $retstring;
}
+
+ /**
+ * Output the buttons to submit a creation/edit form
+ *
+ * @param string $save_label Alternative label for save button
+ * @param string $cancel_label Alternative label for cancel button
+ * @param array $morefields Add additional buttons between save and cancel
+ * @param bool $withoutdiv Option to remove enclosing centered div
+ *
+ * @return string
+ */
+ /**
+ * @param string $save_label
+ * @param string $cancel_label
+ * @param array $morefields
+ * @param false $withoutdiv
+ *
+ * @return string
+ */
+ public function buttonsSaveCancel( $save_label = 'Save', $cancel_label = 'Cancel', $morefields = array(), $withoutdiv = 0 )
+ {
+ global $langs;
+
+ $buttons = array();
+
+ $save = array(
+ 'name' => 'save',
+ 'label_key' => $save_label,
+ );
+
+ if ($save_label == 'Create' || $save_label == 'Add' ) {
+ $save['name'] = 'add';
+ $save['label_key'] = $save_label;
+ }
+
+ $cancel = array(
+ 'name' => 'cancel',
+ 'label_key' => 'Cancel',
+ );
+
+ !empty($save_label) ? $buttons[] = $save : '';
+
+ if (!empty($morefields)) {
+ $buttons[] = $morefields;
+ }
+
+ !empty($cancel_label) ? $buttons[] = $cancel : '';
+
+ $retstring = $withoutdiv ? '': '';
+
+ foreach ($buttons as $button) {
+ $retstring .= $this->button($button['name'], $langs->trans($button['label_key']), $button['addclass']);
+ }
+ $retstring .= $withoutdiv ? '': '
';
+
+ return $retstring;
+ }
+
+ /**
+ * Return a button (input submit)
+ *
+ * @param string $name
+ * @param string $label
+ * @param string $addclass
+ *
+ * @return string
+ */
+ public function button($name, $label, $addclass = '') {
+ return '';
+ }
}
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index 5afbf30d292..28078242dc6 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -110,9 +110,7 @@ print '';
print dol_get_fiche_end();
-print '';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 7911194603b..727bf56f836 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -532,11 +532,7 @@ if (($action == "create") || ($action == "edit")) {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print "
";
+ print $form->buttonsSaveCancel();
print "\n";
} else {
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 1b3c72906b4..c0c81d71aa8 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -500,11 +500,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print "\n";
}
@@ -634,7 +630,7 @@ if (!empty($id) && $action == 'edit') {
print dol_get_fiche_end();
- print '
';
+ print $form->buttonsSaveCancel();
print "\n";
}
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index cf6328d15c4..719b6e9951b 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -280,11 +280,7 @@ if ($action == 'create') {
print "";
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print "\n";
}
diff --git a/htdocs/ecm/dir_card.php b/htdocs/ecm/dir_card.php
index d84a7330e69..fec8151728e 100644
--- a/htdocs/ecm/dir_card.php
+++ b/htdocs/ecm/dir_card.php
@@ -421,11 +421,7 @@ print $object->showOptionals($extrafields, ($action == 'edit' ? 'edit' : 'view')
print '';
if ($action == 'edit') {
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
}
print '';
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 5ca1667ac9f..44bc91e387e 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -405,11 +405,7 @@ print ajax_autoselect('downloadlink');
print dol_get_fiche_end();
if ($action == 'edit') {
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 6ae9ab9664b..be22ed2481b 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -382,11 +382,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
@@ -425,9 +421,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index fe5ea292e8b..034df1fcae3 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -396,11 +396,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
@@ -442,9 +438,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 582b23aec45..676a5cae22c 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -1543,11 +1543,7 @@ if ($action == 'create') {
print '
';
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 048209fbf7d..86aedebbf34 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -1432,10 +1432,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel("AddTrip");
print '';
} elseif ($id > 0 || $ref) {
@@ -1554,10 +1551,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel("Modify");
print '';
} else {
@@ -2287,11 +2281,8 @@ if ($action == 'create') {
//print $line->fk_ecm_files;
print '';
- print '';
print '';
- print '';
- print ' ';
- print ' | ';
+ print $form->buttonsSaveCancel();
print '';
}
@@ -2469,7 +2460,9 @@ if ($action == 'create') {
print ' | ';
}
- print ' | ';
+ print '';
+ print $form->buttonsSaveCancel("Add", '', '', 1);
+ print ' | ';
print '';
} // Fin si c'est payé/validé
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 1f3468d06fc..610713d6f48 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -487,9 +487,7 @@ if ($resql) {
print '';
} else {
- print '';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Save", '');
}
} else {
$title = $langs->trans("ListTripsAndExpenses");
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index b7057af86fc..85c9c813598 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -324,11 +324,7 @@ if ($action == 'create' || empty($action)) {
print "";
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print "\n";
}
diff --git a/htdocs/externalsite/admin/index.php b/htdocs/externalsite/admin/index.php
index a9a41c5e555..d8dbb316593 100644
--- a/htdocs/externalsite/admin/index.php
+++ b/htdocs/externalsite/admin/index.php
@@ -124,9 +124,7 @@ print "";
print "";
-print '
';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print "\n";
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 44ff46b233c..e35736b648f 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -436,10 +436,8 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Create");
+
print "\n";
} else {
dol_print_error('', "Error, no fichinter ".$object->id);
@@ -457,11 +455,9 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
print '';
print '';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("CreateDraftIntervention", '');
print '';
} else {
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index d15f036b963..1b647af00a6 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -977,11 +977,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("CreateDraftIntervention");
// Show origin lines
if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
@@ -1017,12 +1013,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("CreateDraftIntervention");
print '';
}
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 0affc7dcce4..2614c5cede0 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -1777,13 +1777,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
-
-
+ print $form->buttonsSaveCancel("CreateDraft");
// Show origin lines
if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index b39041542eb..6a7d2d44725 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -2337,16 +2337,12 @@ if ($action == 'create') {
$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
print $hookmanager->resPrint;
- // Bouton "Create Draft"
+
print "\n";
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("CreateDraft");
print "\n";
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index caec6191d0d..9daf1d768b8 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -326,11 +326,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index 24b8797a670..4dfc3250014 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -166,9 +166,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index 1500de628e7..68ab9fe98f4 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -200,11 +200,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel('Create');
print '';
@@ -241,9 +237,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index c3c08b6cf2f..f54da087731 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -380,11 +380,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Add");
print '';
}
@@ -706,11 +702,7 @@ if ($id > 0) {
print dol_get_fiche_end();
if ($action == 'edit') {
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 58783be181e..47fa5b37846 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -372,11 +372,7 @@ if ($action == 'create') {
print '';
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print "\n";
}
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index 62eccc5be18..5aaae9f93eb 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -193,7 +193,7 @@ print '';
print '';
-print '';
+print $form->buttonsSaveCancel("Save", '');
if (GETPOST('withtab', 'alpha')) {
print dol_get_fiche_end();
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index b074412b6b3..d928fd3f76a 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -258,11 +258,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
@@ -298,9 +294,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 732cde2ef2f..6eaf42ed833 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -286,11 +286,7 @@ if ($action == 'create') {
';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '';
+ print $form->buttonsSaveCancel("Create");
if (GETPOST('fk_bom', 'int') > 0) {
print load_fiche_titre($langs->trans("ToConsume"));
@@ -341,9 +337,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index fd9fa3e0456..db3f54901b9 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -342,11 +342,7 @@ print '';
print dol_get_fiche_end();
if ($action == 'edit') {
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
}
print ''."\n";
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index e0fa5b90f4c..bf980ab9cda 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -288,11 +288,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
@@ -328,9 +324,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/product/admin/dynamic_prices.php b/htdocs/product/admin/dynamic_prices.php
index d90ea7090f7..9a354a8dcdb 100644
--- a/htdocs/product/admin/dynamic_prices.php
+++ b/htdocs/product/admin/dynamic_prices.php
@@ -228,10 +228,8 @@ if ($action == 'create_variable' || $action == 'edit_variable') {
print '';
//Form Buttons
- print '
';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
+
print '';
}
@@ -349,10 +347,8 @@ if ($action == 'create_updater' || $action == 'edit_updater') {
print '';
//Form Buttons
- print '
';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
+
print '';
}
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 3f2833fde52..9558f004bdb 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1564,11 +1564,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
} elseif ($object->id > 0) {
@@ -2024,11 +2020,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
} else {
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index e2539dae31c..000e5da6cbc 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -650,9 +650,8 @@ if ($id > 0 || !empty($ref)) {
print '';
if ($num > 0) {
- print '
';
- print '
trans("Update").'">';
- print ' ';
+ print '
';
+ print 'trans("Update").'">';
print '';
print '
';
}
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 067869ba5ba..539456351cb 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -204,11 +204,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '
';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
@@ -244,9 +240,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '
';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 03867bb65e9..62d4532080f 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -1207,11 +1207,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
print dol_get_fiche_end();
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '
';
}
@@ -1321,13 +1317,9 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
print dol_get_fiche_end();
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
- print '
';
+ print '';
} else {
print ''."\n";
?>
@@ -1444,10 +1436,8 @@ if ($action == 'edit_price' && $object->getRights()->creer) {
//print dol_get_fiche_end();
- print '
';
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
+
print '';
}
}
@@ -1776,10 +1766,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '
';
print '
';
- print '';
- print ' ';
- print '';
- print '';
+ print $form->buttonsSaveCancel();
print '';
} elseif ($action == 'edit_customer_price') {
@@ -1861,10 +1848,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '';
print "";
- print '';
- print ' ';
- print '';
- print '';
+ print $form->buttonsSaveCancel();
print '
';
} elseif ($action == 'showlog_customer_price') {
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 5ea58da6deb..6760da10cb0 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -358,11 +358,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
} else {
@@ -913,11 +909,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index 22f32f0c8b9..7a75019c8d1 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -401,11 +401,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 0cae81e36c7..170544e0e6d 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -282,11 +282,7 @@ if ($action == 'edit') {
print '
';
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
} elseif ($action != 'add') {
@@ -356,11 +352,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 6e474ea8568..97c54b73675 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -596,9 +596,7 @@ print '';
print ''."\n";
print ''."\n";
-print '';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print ''."\n\n";
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index ecb2a0bdaf5..08304cecaab 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -852,9 +852,7 @@ print '';
print ''."\n";
-print '';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print ''."\n\n";
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index b14fcfc73fd..4299028d621 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -690,16 +690,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
print dol_get_fiche_end();
- print '';
- print '';
- if (!empty($backtopage)) {
- print ' ';
- print '';
- } else {
- print ' ';
- print '';
- }
- print '
';
+ print $form->buttonsSaveCancel('CreateDraft');
print '';
@@ -1150,10 +1141,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
print dol_get_fiche_end();
if ($action == 'edit' && $userWrite > 0) {
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
}
print '';
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index d4b5bf89bbf..367f7a27681 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -674,11 +674,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Add");
print '';
} elseif ($id > 0 || !empty($ref)) {
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 780d387512e..99b390870a8 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -458,10 +458,7 @@ if ($id > 0 || !empty($ref)) {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Modify");
print '';
} else {
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 57ef8981393..68f314cdd03 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -1199,11 +1199,7 @@ if ($action == 'create') {
print '
';
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index a84644d30cb..db51171a04a 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -338,11 +338,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
@@ -378,9 +374,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/recruitment/recruitmentjobposition_applications.php b/htdocs/recruitment/recruitmentjobposition_applications.php
index 95daeae54a6..e5740fb203c 100644
--- a/htdocs/recruitment/recruitmentjobposition_applications.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -240,11 +240,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
@@ -280,9 +276,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index 58ee9260617..e2a848e9760 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -265,11 +265,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
@@ -305,9 +301,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index 1b4c71b158b..88b3d0fdb03 100644
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -252,11 +252,9 @@ if ($action == 'create' || $object->fetch($id, $ref) > 0) {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ $button_label = ($action == "create" ? "Create" : "Modify");
+ print $form->buttonsSaveCancel($button_label);
+
print '';
print '';
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index d3c7ba504cb..ca111adf4d1 100755
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -549,16 +549,16 @@ if ($action == 'create') {
print '';
print ''.$langs->trans("ClosePaidSalaryAutomatically");
- print '
';
print '
';
- print '';
- print ' ';
- print '';
- print ' ';
- print '';
print '';
+ $addition_button = array(
+ 'name' => 'saveandnew',
+ 'label_key' => 'SaveAndNew',
+ );
+ print $form->buttonsSaveCancel("Save", "Cancel", $addition_button);
+
print '';
}
@@ -886,12 +886,8 @@ if ($id) {
if ($action == 'edit') {
- print '';
- print '';
- print ' ';
- print '';
- print '
';
- print "\n";
+ print $form->buttonsSaveCancel();
+ print "";
}
print dol_get_fiche_end();
diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index a266a2ed88b..895226d0207 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -313,14 +313,13 @@ if ($action == 'create') {
}
print "";
-
// Bouton Save payment
- print '
'.$langs->trans("ClosePaidSalaryAutomatically");
- print '
';
- print ' ';
- print '
';
+ print '
';
+ print ' '.$langs->trans("ClosePaidSalaryAutomatically");
+ print $form->buttonsSaveCancel("Save", "Cancel", '', true);
print '
';
+
print "\n";
}
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index b62c277cdf2..d9bffec142a 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1701,16 +1701,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print dol_get_fiche_end();
- print '
';
- print '';
- if (!empty($backtopage)) {
- print ' ';
- print '';
- } else {
- print ' ';
- print '';
- }
- print '
'."\n";
+ print $form->buttonsSaveCancel("AddThirdParty");
print ''."\n";
} elseif ($action == 'edit') {
@@ -2419,11 +2410,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
print dol_get_fiche_end();
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 97d92007885..d88351aabc3 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1651,11 +1651,7 @@ if ($socid && $action == 'edit' && $user->rights->societe->creer) {
print dol_get_fiche_end();
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Modify");
}
// Edit Card
@@ -1697,11 +1693,7 @@ if ($socid && $action == 'editcard' && $user->rights->societe->creer) {
print dol_get_fiche_end();
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Modify");
}
@@ -1817,11 +1809,7 @@ if ($socid && $action == 'create' && $user->rights->societe->creer) {
dol_set_focus('#label');
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Add");
}
// Create Card
@@ -1866,11 +1854,7 @@ if ($socid && $action == 'createcard' && $user->rights->societe->creer) {
dol_set_focus('#label');
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Add");
}
if ($socid && ($action == 'edit' || $action == 'editcard') && $user->rights->societe->creer) {
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index b46a6124396..da4ca1c0cd7 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -355,13 +355,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '';
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
- print '
';
+ print '';
} elseif ($action == 'edit_customer_price') {
// Edit mode
@@ -437,13 +433,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
print '';
- print '
';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
- print '
';
+ print '';
}
} elseif ($action == 'showlog_customer_price') {
print '
';
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index e582cdaf63e..0bb351bf977 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -526,7 +526,7 @@ print '
';
print dol_get_fiche_end();
-print '';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index 5d22ea05684..cc553555b5b 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -1330,11 +1330,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("CreateDraft");
print "";
@@ -1808,11 +1804,8 @@ if ($action == 'create') {
$form_close .= $object->note_private;
$form_close .= '';
$form_close .= '';
- $form_close .= '';
- $form_close .= '';
- $form_close .= ' ';
- $form_close .= ' ';
- $form_close .= '';
+ $form_close .= $form->buttonsSaveCancel();;
+ $form_close .= ' ';
$form_close .= '';
print $form_close;
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
index ef448607b10..135a3b2a9e7 100644
--- a/htdocs/takepos/admin/appearance.php
+++ b/htdocs/takepos/admin/appearance.php
@@ -119,9 +119,7 @@ print "\n";
print '';
-print '
';
-
-print '';
+print $form->buttonsSaveCancel("Save", '');
print "\n";
diff --git a/htdocs/takepos/admin/bar.php b/htdocs/takepos/admin/bar.php
index 796c98de5cb..794cb47290e 100644
--- a/htdocs/takepos/admin/bar.php
+++ b/htdocs/takepos/admin/bar.php
@@ -200,7 +200,7 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT) {
print '
';
- print '';
+ print $form->buttonsSaveCancel("Save", '');
}
if (!empty($conf->global->TAKEPOS_BAR_RESTAURANT)) {
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 74a54400fef..ec05dd89796 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -267,7 +267,7 @@ print '';
print '
';
-print '';
+print $form->buttonsSaveCancel("Save", '');
print "\n";
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 0364ff4e64f..e75321e263b 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -474,7 +474,7 @@ if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
print '
';
-print '';
+print $form->buttonsSaveCancel("Save", '');
print "\n";
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 922a5c5032c..f6562d81693 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -409,7 +409,7 @@ if ($atleastonefound == 0 && !empty($conf->banque->enabled)) {
print '
';
-print '';
+print $form->buttonsSaveCancel("Save", '');
print "\n";
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index 8a11ac23e23..a7e491bd4c6 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -756,11 +756,7 @@ if ($action == 'create' || $action == 'presend') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
print ''; */
} elseif (empty($action) || $action == 'view' || $action == 'addlink' || $action == 'dellink' || $action == 'presend' || $action == 'presend_addmessage' || $action == 'close' || $action == 'abandon' || $action == 'delete' || $action == 'editcustomer' || $action == 'progression' || $action == 'reopen'
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 928db5449d8..5921f7d84cd 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -226,10 +226,12 @@ while ($i <= $MAXAGENDA) {
print '';
print '';
-
-print '';
-print '';
-print "
";
+$addition_button = array(
+ 'name' => 'save',
+ 'label_key' => 'Save',
+ 'addclass' => 'hideifnotset',
+);
+print $form->buttonsSaveCancel("", "", $addition_button);
print dol_get_fiche_end();
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index 0eaf3d533a9..aa6f97a6c05 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -700,11 +700,7 @@ if ($id && ($action == 'edit' || $action == 'create') && $user->rights->user->us
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel("Modify");
}
if ($id && $action == 'edit' && $user->rights->user->user->creer) {
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index cb7aa69949c..ad1007f3c52 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1267,11 +1267,7 @@ if ($action == 'create' || $action == 'adduserldap') {
print dol_get_fiche_end();
- print '';
- print '';
- //print ' ';
- //print '';
- print '
';
+ print $form->buttonsSaveCancel("CreateUser");
print "";
} else {
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 5c1e16e4a0c..1f20b018f2e 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -535,9 +535,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 1ce397626e6..da8c57f918f 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -137,11 +137,7 @@ if ($id) {
print dol_get_fiche_end();
if ($action == 'edit') {
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
}
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 72f9b075be9..76734c26886 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -328,11 +328,7 @@ if ($action == 'edit') {
showSkins($object, (($user->admin || empty($dolibarr_main_demo)) ? 1 : 0), true);
- print '';
- print '';
- print ' ';
- print '';
- print '
';
+ print $form->buttonsSaveCancel();
} else {
print dol_get_fiche_head($head, 'guisetup', $title, -1, 'user');
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index 1c78acae84d..eec667c8a74 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -91,9 +91,7 @@ print '';
print '';
-print '
';
-print '';
-print '
';
+print $form->buttonsSaveCancel("Save", '');
print '';
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index cf4d26b2c33..398affc8cb2 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -140,11 +140,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
}
@@ -172,9 +168,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
index 5b63ca2d481..0cf0f628492 100755
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -231,11 +231,7 @@ if ($action == 'create') {
print dol_get_fiche_end();
- print '';
- print '';
- print ' ';
- print ''; // Cancel for create does not post form if we don't know the backtopage
- print '
';
+ print $form->buttonsSaveCancel("Create");
print '';
@@ -288,9 +284,7 @@ if (($id || $ref) && $action == 'edit') {
print dol_get_fiche_end();
- print '';
- print ' ';
- print '
';
+ print $form->buttonsSaveCancel();
print '';
}