diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index fdc2f78be6446b25d7e567643108214e5397c118..d555ed46092c0a2136568d8457ddb3d4f484dbb9 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -1,6 +1,6 @@
<?PHP
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
- * Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2013-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
*
* 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 '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">' . "\n";
print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
print '<input type="hidden" name="action" value="add">';
-
+
+ dol_fiche_head();
+
print '<table class="border" width="100%">';
print '<tr><td width="25%">' . $langs->trans("AccountNumber") . '</td>';
@@ -163,8 +164,10 @@ if ($action == 'create')
print '</td></tr>';
print '</table>';
-
- print '<br><div class="center">';
+
+ dol_fiche_end();
+
+ print '<div class="center">';
print '<input class="button" type="submit" value="' . $langs->trans("Save") . '">';
print ' ';
print '<input class="button" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
@@ -216,16 +219,16 @@ else if ($id)
print '</td></tr>';
print '</table>';
-
- print '<br><div class="center">';
+
+ dol_fiche_end();
+
+ print '<div class="center">';
print '<input type="submit" class="button" value="' . $langs->trans("Save") . '">';
print ' ';
print '<input type="submit" name="cancel" class="button" value="' . $langs->trans("Cancel") . '">';
print '</div>';
print '</form>';
-
- print '</div>';
}
else
{
@@ -268,8 +271,8 @@ else if ($id)
print '</td></tr>';
print '</table>';
-
- print '</div>';
+
+ 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 040419c89c2daa1a935f420f38718be836eed4a7..fc985efffe7c3d52c020918db1622a9c020b1390 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014-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
@@ -176,6 +176,8 @@ if ($action == 'create')
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
+ dol_fiche_head();
+
print '<table class="border" width="100%">';
// Label
@@ -199,8 +201,10 @@ if ($action == 'create')
print '</td></tr>';
print '</table>';
+
+ dol_fiche_end();
- print '<br><div class="center">';
+ print '<div class="center">';
print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
print ' ';
print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index b612a9b6459d680cf87220d42ab49cbb914a61f1..978396e0cf52021fc90aefa93f22eaab58beccd4 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2013 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
@@ -187,6 +188,8 @@ if ($action == 'create')
print_fiche_titre($langs->trans("NewVATPayment"));
+ dol_fiche_head();
+
print '<table class="border" width="100%">';
print "<tr>";
@@ -228,7 +231,7 @@ if ($action == 'create')
print '</table>';
- print "<br>";
+ dol_fiche_end();
print '<div class="center">';
print '<input type="submit" class="button" value="'.$langs->trans("Save").'">';
diff --git a/htdocs/loan/card.php b/htdocs/loan/card.php
index 670f2180bf0b001873db9defed76423fc36ff876..ad32f7b6ced257b7894da147169c94c047775330 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+/* Copyright (C) 2014-2015 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2015 Frederic France <frederic.france@free.fr>
*
* This program is free software; you can redistribute it and/or modify
@@ -191,6 +191,8 @@ if ($action == 'create')
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
+ dol_fiche_head();
+
print '<table class="border" width="100%">';
// Label
@@ -287,8 +289,10 @@ if ($action == 'create')
print '</table>';
- print '<br><center><input class="button" type="submit" value="'.$langs->trans("Save").'"> ';
- print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></center>';
+ dol_fiche_end();
+
+ print '<div align="center"><input class="button" type="submit" value="'.$langs->trans("Save").'"> ';
+ print '<input class="button" type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></div>';
print '</form>';
}
diff --git a/htdocs/resource/add.php b/htdocs/resource/add.php
index 679644ac9e02c3cf99a85dc1611f02ebe82a68bb..b13e60bd0bc857c97b3e4204e6c4711323e980c5 100644
--- a/htdocs/resource/add.php
+++ b/htdocs/resource/add.php
@@ -1,5 +1,6 @@
<?php
-/* Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
+/* Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.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
@@ -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 '<form method="post" action="'.$_SERVER['PHP_SELF'].'" name="add_resource">';
print '<input type="hidden" name="action" value="confirm_add_resource" />';
+ dol_fiche_head('');
+
print '<table class="border" width="100%">';
// Ref / label
@@ -161,7 +159,7 @@ if (! $action)
print '</label>';
print '</td>';
print '<td>';
- 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 '</td>';
@@ -169,9 +167,11 @@ if (! $action)
print '</table>';
- echo '<br><div align="center">',
+ dol_fiche_end('');
+
+ echo '<div align="center">',
'<input type="submit" class="button" name="add" value="'.$langs->trans('Save').'" />',
- ' ',
+ ' ',
'<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'" />',
'</div>';