Merge pull request #5625 from aspangaro/4.0-p42

Uniformize presentation, add button cancel everywhere
This commit is contained in:
Laurent Destailleur 2016-08-17 16:11:59 +02:00 committed by GitHub
commit 88afc4ad5a
5 changed files with 27 additions and 13 deletions

View File

@ -507,7 +507,11 @@ if ($action == 'create')
dol_fiche_end(); dol_fiche_end();
print '<div class="center"><input value="'.$langs->trans("CreateAccount").'" type="submit" class="button"></div>'; print '<div class="center">';
print '<input type="submit" class="button" value="' . $langs->trans("CreateAccount") . '">';
print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
print '</div>';
print '</form>'; print '</form>';
} }

View File

@ -260,7 +260,7 @@ if ($action == 'create')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print "<tr>"; print "<tr>";
// Label // Label
print '<td class="fieldrequired">'; print '<td class="titlefield fieldrequired">';
print $langs->trans("Label"); print $langs->trans("Label");
print '</td>'; print '</td>';
print '<td align="left"><input type="text" size="34" name="label" class="flat" value="'.GETPOST('label').'"></td>'; print '<td align="left"><input type="text" size="34" name="label" class="flat" value="'.GETPOST('label').'"></td>';
@ -305,8 +305,10 @@ if ($action == 'create')
dol_fiche_end(); dol_fiche_end();
print '<div class="center">'; print '<div class="center">';
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">'; print '<input type="submit" class="button" value="' . $langs->trans("Create") . '">';
print '<div>'; print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
print '</div>';
print '</form>'; print '</form>';
} }
@ -496,7 +498,7 @@ if ($id > 0)
if ($action == 'edit') if ($action == 'edit')
{ {
print '<div align="center">'; print '<div class="center">';
print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">'; print '<input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
print ' &nbsp; '; print ' &nbsp; ';
print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">'; print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';

View File

@ -1152,7 +1152,11 @@ else
dol_fiche_end(); dol_fiche_end();
print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div>'; print '<div class="center">';
print '<input type="submit" class="button" value="' . $langs->trans("Create") . '">';
print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
print '</div>';
print '</form>'; print '</form>';
} }

View File

@ -234,7 +234,11 @@ if ($action == 'create')
dol_fiche_end(); dol_fiche_end();
print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div>'; print '<div class="center">';
print '<input type="submit" class="button" value="' . $langs->trans("Create") . '">';
print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '" onClick="javascript:history.go(-1)">';
print '</div>';
print '</form>'; print '</form>';
} }

View File

@ -135,7 +135,7 @@ if (! $action)
// Ref / label // Ref / label
$field = 'ref'; $field = 'ref';
print '<tr>'; print '<tr>';
print '<td class="fieldrequired">'; print '<td class="titlefieldcreate fieldrequired">';
print $langs->trans('ResourceFormLabel_'.$field); print $langs->trans('ResourceFormLabel_'.$field);
print '</td>'; print '</td>';
print '<td>'; print '<td>';
@ -166,11 +166,11 @@ if (! $action)
dol_fiche_end(''); dol_fiche_end('');
echo '<div align="center">', print '<div class="center">';
'<input type="submit" class="button" name="add" value="'.$langs->trans('Save').'" />', print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
' &nbsp; ', print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
'<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'" />', print '<input type="button" class="button" value="' . $langs->trans("Cancel") . '">';
'</div>'; print '</div>';
print '</form>'; print '</form>';
} }