diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 99c79995352..af560e73c46 100644 --- a/htdocs/admin/ihm.php +++ b/htdocs/admin/ihm.php @@ -61,7 +61,7 @@ if (empty($conf->use_javascript_ajax)) * Action */ -if ($action == 'cancel') +if (GETPOST('cancel')) { $action=''; } @@ -335,9 +335,9 @@ if ($action == 'edit') // Edit print '
'; - print ''; + print ''; print '   '; - print ''.$langs->trans("Cancel").''; + print ''; print '
'; print ''; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 478d70c5f66..7a57713337f 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -621,6 +621,7 @@ div.fiche { margin-: global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px; margin-: dol_optimize_smallscreen)?'12':'4')); ?>px; dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> + margin-bottom: 15px; } div.fichecenter {