From e23459d53b411e2627124f61b2c171e5bbf349a3 Mon Sep 17 00:00:00 2001 From: aspangaro <alexandre.spangaro@gmail.com> Date: Wed, 20 May 2015 21:50:38 +0200 Subject: [PATCH] NEW Forms are using the tab look, even in creation mode --- htdocs/comm/action/card.php | 7 ++++++- htdocs/compta/paiement/cheque/card.php | 11 ++++++++--- htdocs/ecm/docdir.php | 6 +++++- htdocs/opensurvey/wizard/create_survey.php | 5 +++++ 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index eb88215fa20..aa34c83523c 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -6,6 +6,7 @@ * Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro> * Copyright (C) 2014 Cedric GROSS <c.gross@kreiz-it.fr> + * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -609,6 +610,8 @@ if ($action == 'create') if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous")); else print_fiche_titre($langs->trans("AddAnAction")); + dol_fiche_head(); + print '<table class="border" width="100%">'; // Type of event @@ -784,7 +787,9 @@ if ($action == 'create') print '</table>'; - print '<br><div class="center">'; + dol_fiche_end(); + + print '<div class="center">'; print '<input type="submit" class="button" value="'.$langs->trans("Add").'">'; print ' '; print '<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">'; diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php index 49af748c115..e2422bffa70 100644 --- a/htdocs/compta/paiement/cheque/card.php +++ b/htdocs/compta/paiement/cheque/card.php @@ -4,6 +4,7 @@ * Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com> + * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -347,7 +348,9 @@ if ($action == 'new') print '<form class="nocellnopadd" action="'.$_SERVER["PHP_SELF"].'" method="POST">'; print '<input type="hidden" name="action" value="new">'; - //print '<fieldset><legend>aaa</legend>'; + + dol_fiche_head(); + print '<table class="border" width="100%">'; //print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>'; // Filter @@ -358,6 +361,9 @@ if ($action == 'new') $form->select_comptes($filteraccountid,'accountid',0,'courant <> 2',1); print '</td></tr>'; print '</table>'; + + dol_fiche_end(); + print '<div class="center">'; print '<input type="submit" class="button" name="filter" value="'.dol_escape_htmltag($langs->trans("ToFilter")).'">'; if ($filterdate || $filteraccountid > 0) @@ -366,8 +372,7 @@ if ($action == 'new') print '<input type="submit" class="button" name="removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">'; } print '</div>'; - //print '</fieldset>'; - print '</form>'; + print '</form>'; print '<br>'; $sql = "SELECT ba.rowid as bid, b.datec as datec, b.dateo as date, b.rowid as chqid, "; diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php index b1f09ffcb22..226987c0c44 100644 --- a/htdocs/ecm/docdir.php +++ b/htdocs/ecm/docdir.php @@ -1,6 +1,7 @@ <?php /* Copyright (C) 2008-2012 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2008-2012 Regis Houssin <regis.houssin@capnetworks.com> + * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,7 +21,6 @@ * \file htdocs/ecm/docdir.php * \ingroup ecm * \brief Main page for ECM section area - * \author Laurent Destailleur */ require '../main.inc.php'; @@ -154,6 +154,8 @@ if ($action == 'create') $title=$langs->trans("ECMNewSection"); print_fiche_titre($title); + + dol_fiche_head(); print '<table class="border" width="100%">'; @@ -174,6 +176,8 @@ if ($action == 'create') print '</td></tr>'."\n"; print '</table><br>'; + + dol_fiche_end(); print '<div class="center">'; print '<input type="submit" class="button" name="create" value="'.$langs->trans("Create").'">'; diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php index 7443fbdfba0..9c5d27d070e 100644 --- a/htdocs/opensurvey/wizard/create_survey.php +++ b/htdocs/opensurvey/wizard/create_survey.php @@ -1,6 +1,7 @@ <?php /* Copyright (C) 2013-2014 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com> + * Copyright (C) 2015 Alexandre Spangaro <alexandre.spangaro@gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -135,6 +136,8 @@ print_fiche_titre($langs->trans("CreatePoll").' (1 / 2)'); //debut du formulaire print '<form name="formulaire" action="" method="POST">'."\n"; +dol_fiche_head(); + //Affichage des différents champs textes a remplir print '<table class="border" width="100%">'."\n"; @@ -158,6 +161,8 @@ print $form->select_date($champdatefin?$champdatefin:-1,'champdatefin','','','', print '</tr>'."\n"; print '</table>'."\n"; +dol_fiche_end(); + //focus javascript sur le premier champ print '<script type="text/javascript">'."\n"; print 'document.formulaire.titre.focus();'."\n"; -- GitLab