diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php index 99c79995352ea8dc848f128ec65248c8d948d320..af560e73c46a2b01938f98e6190213093bc5616d 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 '<br><div class="center">'; - print '<input class="button" type="submit" value="'.$langs->trans("Save").'">'; + print '<input class="button" type="submit" name="submit" value="'.$langs->trans("Save").'">'; print ' '; - print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=cancel">'.$langs->trans("Cancel").'</a>'; + print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">'; print '</div>'; print '</form>'; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 478d70c5f6611764335366726b81336f455bab9f..7a57713337f8a0eb7f9d99fc5faf888be7b1b672 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -621,6 +621,7 @@ div.fiche { margin-<?php print $left; ?>: <?php print (GETPOST("optioncss") == 'print'?6:((empty($conf->global->MAIN_MENU_USE_JQUERY_LAYOUT))?($dol_hide_leftmenu?'4':'20'):'24')); ?>px; margin-<?php print $right; ?>: <?php print (GETPOST("optioncss") == 'print'?8:(empty($conf->dol_optimize_smallscreen)?'12':'4')); ?>px; <?php if (! empty($conf->dol_hide_leftmenu) && ! empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> + margin-bottom: 15px; } div.fichecenter {