From 58e942681d5794a5cc3bfccb9003fcbb6a1b8f32 Mon Sep 17 00:00:00 2001 From: aspangaro Date: Wed, 20 May 2015 07:03:17 +0200 Subject: [PATCH] NEW Forms are using the tab look, even in creation mode --- htdocs/accountancy/admin/card.php | 29 +++++++++++--------- htdocs/accountancy/admin/fiscalyear_card.php | 8 ++++-- htdocs/compta/tva/card.php | 5 +++- htdocs/loan/card.php | 10 +++++-- htdocs/resource/add.php | 24 ++++++++-------- 5 files changed, 45 insertions(+), 31 deletions(-) diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php index fdc2f78be64..d555ed46092 100644 --- a/htdocs/accountancy/admin/card.php +++ b/htdocs/accountancy/admin/card.php @@ -1,6 +1,6 @@ - * Copyright (C) 2013-2014 Alexandre Spangaro + * Copyright (C) 2013-2015 Alexandre Spangaro * Copyright (C) 2014 Florian Henry * * This program is free software; you can redistribute it and/or modify @@ -128,7 +128,6 @@ else if ($action == 'delete') /* * View - * */ llxheader('', $langs->trans('AccountAccounting')); @@ -142,7 +141,9 @@ if ($action == 'create') print '
' . "\n"; print ''; print ''; - + + dol_fiche_head(); + print ''; print ''; @@ -163,8 +164,10 @@ if ($action == 'create') print ''; print '
' . $langs->trans("AccountNumber") . '
'; - - print '
'; + + dol_fiche_end(); + + print '
'; print ''; print '     '; print ''; @@ -216,16 +219,16 @@ else if ($id) print ''; print ''; - - print '
'; + + dol_fiche_end(); + + print '
'; print ''; print '     '; print ''; print '
'; print ''; - - print '
'; } else { @@ -268,8 +271,8 @@ else if ($id) print ''; print ''; - - print '
'; + + dol_fiche_end(); /* * Barre d'actions @@ -297,6 +300,6 @@ else if ($id) dol_print_error($db); } } +$db->close(); -llxFooter(); -$db->close(); \ No newline at end of file +llxFooter(); \ No newline at end of file diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php index 040419c89c2..fc985efffe7 100644 --- a/htdocs/accountancy/admin/fiscalyear_card.php +++ b/htdocs/accountancy/admin/fiscalyear_card.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2014-2015 Alexandre Spangaro * * 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 @@ -176,6 +176,8 @@ if ($action == 'create') print ''; print ''; + dol_fiche_head(); + print ''; // Label @@ -199,8 +201,10 @@ if ($action == 'create') print ''; print '
'; + + dol_fiche_end(); - print '
'; + print '
'; print ''; print '     '; print ''; diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php index b612a9b6459..978396e0cf5 100644 --- a/htdocs/compta/tva/card.php +++ b/htdocs/compta/tva/card.php @@ -2,6 +2,7 @@ /* Copyright (C) 2003 Rodolphe Quiedeville * Copyright (C) 2004-2013 Laurent Destailleur * Copyright (C) 2005-2013 Regis Houssin + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -187,6 +188,8 @@ if ($action == 'create') print_fiche_titre($langs->trans("NewVATPayment")); + dol_fiche_head(); + print ''; print ""; @@ -228,7 +231,7 @@ if ($action == 'create') print '
'; - print "
"; + dol_fiche_end(); print '
'; print ''; diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php index 670f2180bf0..ad32f7b6ced 100644 --- a/htdocs/loan/card.php +++ b/htdocs/loan/card.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2014-2015 Alexandre Spangaro * Copyright (C) 2015 Frederic France * * This program is free software; you can redistribute it and/or modify @@ -191,6 +191,8 @@ if ($action == 'create') print ''; print ''; + dol_fiche_head(); + print ''; // Label @@ -287,8 +289,10 @@ if ($action == 'create') print '
'; - print '
    '; - print '
'; + dol_fiche_end(); + + print '
     '; + print '
'; print ''; } diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php index 679644ac9e0..b13e60bd0bc 100644 --- a/htdocs/resource/add.php +++ b/htdocs/resource/add.php @@ -1,5 +1,6 @@ +/* Copyright (C) 2013 Jean-François Ferry + * Copyright (C) 2015 Alexandre Spangaro * * 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 @@ -22,15 +23,10 @@ * Initialy built by build_class_from_table on 2013-07-24 16:03 */ +require '../main.inc.php'; -// Change this following line to use the correct relative path (../, ../../, etc) -$res=0; -$res=@include("../main.inc.php"); // For root directory -if (! $res) $res=@include("../../main.inc.php"); // For "custom" directory -if (! $res) die("Include of main fails"); - -require_once 'class/resource.class.php'; -require_once 'class/html.formresource.class.php'; +require_once DOL_DOCUMENT_ROOT.'/resource/class/resource.class.php'; +require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php'; // Load traductions files required by page $langs->load("resource"); @@ -132,6 +128,8 @@ if (! $action) print '
'; print ''; + dol_fiche_head(''); + print ''; // Ref / label @@ -161,7 +159,7 @@ if (! $action) print ''; print ''; print ''; @@ -169,9 +167,11 @@ if (! $action) print '
'; - require_once (DOL_DOCUMENT_ROOT . "/core/class/doleditor.class.php"); + require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; $doleditor = new DolEditor($field, $$field, 160, '', '', false); $doleditor->Create(); print '
'; - echo '
', + dol_fiche_end(''); + + echo '
', '', - ' ', + '     ', '', '
';