Fix: rename "templates" to "tpl"

htdocs/admin/multicompany.php

@@ -58,7 +58,7 @@ print_fiche_titre($langs->trans("MultiCompanySetup"),$linkback,'setup');
 
 print '<br>';
 
-$smarty->template_dir = DOL_DOCUMENT_ROOT.'/multicompany/templates/';
+$smarty->template_dir = DOL_DOCUMENT_ROOT.'/multicompany/tpl/';
 
 /*
  * Create

htdocs/cashdesk/affIndex.php

@@ -72,7 +72,7 @@ print '<div class="conteneur_img_droite">'."\n";
 print '<h1 class="entete"><span>POINT OF SALE</span></h1>'."\n";
 
 print '<div class="menu_principal">'."\n";
-include_once('templates/menu.tpl.php');
+include_once('tpl/menu.tpl.php');
 print '</div>'."\n";
 
 print '<div class="contenu">'."\n";

htdocs/cashdesk/facturation.php

@@ -157,6 +157,6 @@ $obj_facturation->paiement_le ('RESET');
 
 
 // Affichage des templates
-require ('templates/facturation1.tpl.php');
+require ('tpl/facturation1.tpl.php');
 
 ?>

htdocs/cashdesk/liste_articles.php

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-require ('templates/liste_articles.tpl.php');
+require ('tpl/liste_articles.tpl.php');
 
 $obj_facturation->prix_total_ht ($lst_total_ht);
 $obj_facturation->prix_total_ttc ($lst_total_ttc);

htdocs/cashdesk/validation.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2008 Jérémie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2007-2008 J<EFBFBD>r<EFBFBD>mie Ollivier <jeremie.o@laposte.net>
  *
  * 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
@@ -17,6 +17,6 @@
  */
 
 	// Affichage des templates
-	require ('templates/validation1.tpl.php');
+	require ('tpl/validation1.tpl.php');
 
 ?>

htdocs/cashdesk/validation_ok.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2008 Jérémie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2007-2008 J<EFBFBD>r<EFBFBD>mie Ollivier <jeremie.o@laposte.net>
  *
  * 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
@@ -17,6 +17,6 @@
  */
 
 	// Affichage des templates
-	require ('templates/validation2.tpl.php');
+	require ('tpl/validation2.tpl.php');
 
 ?>

htdocs/cashdesk/validation_ticket.php

@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2008 Jérémie Ollivier <jeremie.o@laposte.net>
+/* Copyright (C) 2007-2008 J<EFBFBD>r<EFBFBD>mie Ollivier <jeremie.o@laposte.net>
  *
  * 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
@@ -23,7 +23,7 @@
 	unset ($_SESSION['serObjFacturation']);
 
 
-		require ('templates/ticket.tpl.php');
+		require ('tpl/ticket.tpl.php');
 
 
 	$_SESSION['serObjFacturation'] = serialize ($obj_facturation);

htdocs/docs/class/pdf_courrier_droit_editeur.class.php

@@ -67,7 +67,7 @@ class pdf_courrier_droit_editeur
 
 		require_once(FPDF_PATH.'fpdf.php');
 		require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
-		require_once(DOL_DOCUMENT_ROOT."/product/templates/product.livre.class.php");
+		require_once(DOL_DOCUMENT_ROOT."/product/canvas/livre/product.livre.class.php");
 		$error = 0;
 		$year = strftime("%Y", time());
 

htdocs/lib/security.lib.php

@@ -53,23 +53,23 @@ function dol_loginfunction($langs,$conf,$mysoc)
 	{
 		if (file_exists(DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone))
 		{
-			$template_dir=DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/templates/";
+			$template_dir=DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/tpl/";
 		}
 		else
 		{
-			$template_dir=DOL_DOCUMENT_ROOT."/theme/phones/others/templates/";
+			$template_dir=DOL_DOCUMENT_ROOT."/theme/phones/others/tpl/";
 		}
 	}
 	else
 	{
-		if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/templates/login.tpl")
+		if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/login.tpl")
-			|| file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/templates/login.tpl.php"))
+			|| file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/login.tpl.php"))
 		{
-			$template_dir=DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/templates/";
+			$template_dir=DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/";
 		}
 		else
 		{
-			$template_dir=DOL_DOCUMENT_ROOT.'/core/templates/';
+			$template_dir=DOL_DOCUMENT_ROOT.'/core/tpl/';
 		}
 
 		$conf->css = "/theme/".$conf->theme."/".$conf->theme.".css.php?lang=".$langs->defaultlang;
@@ -253,7 +253,7 @@ function dol_loginfunction($langs,$conf,$mysoc)
 			$smarty->assign('main_google_ad_width', $conf->global->MAIN_GOOGLE_AD_WIDTH);
 			$smarty->assign('main_google_ad_height', $conf->global->MAIN_GOOGLE_AD_HEIGHT);
 
-			$google_ad_template = DOL_DOCUMENT_ROOT."/core/templates/google_ad.tpl";
+			$google_ad_template = DOL_DOCUMENT_ROOT."/core/tpl/google_ad.tpl";
 			$smarty->assign('google_ad_tpl', $google_ad_template);
 		}
 

htdocs/product/fiche.php

@@ -657,7 +657,7 @@ if ($_GET["action"] == 'create' && ($user->rights->produit->creer || $user->righ
 	{
 		// On assigne les valeurs meme en creation car elles sont definies si
 		// on revient en erreur
-		$smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$_GET["canvas"].'/templates/';
+		$smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$_GET["canvas"].'/tpl/';
 		$tvaarray = load_tva($db,"tva_tx",$conf->defaulttx,$mysoc,'');
 		$smarty->assign('tva_taux_value', $tvaarray['value']);
 		$smarty->assign('tva_taux_libelle', $tvaarray['label']);
@@ -865,7 +865,7 @@ if ($_GET["id"] || $_GET["ref"])
 
 		$result = $product->fetchCanvas($_GET["id"],'',$_GET["action"]);
 
-		$smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/templates/';
+		$smarty->template_dir = DOL_DOCUMENT_ROOT.'/product/canvas/'.$product->canvas.'/tpl/';
 
 		$product->assign_smarty_values($smarty,$_GET["action"]);
 	}

htdocs/product/liste.php

@@ -238,21 +238,21 @@ if ($resql)
 		$title_text = $title;
 		
 		// Check if a custom template is present
-		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/templates/product/'.$_GET["canvas"].'/list.tpl'))
+		if (file_exists(DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/tpl/product/'.$_GET["canvas"].'/list.tpl'))
 		{
-			$template_dir = DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/templates/product/'.$_GET["canvas"].'/';
+			$template_dir = DOL_DOCUMENT_ROOT . '/theme/'.$conf->theme.'/tpl/product/'.$_GET["canvas"].'/';
 			$template = 'list.tpl';
 		}
 		// Check if a default template is present
-		else if (file_exists(DOL_DOCUMENT_ROOT . '/product/canvas/'.$_GET["canvas"].'/templates/list.tpl'))
+		else if (file_exists(DOL_DOCUMENT_ROOT . '/product/canvas/'.$_GET["canvas"].'/tpl/list.tpl'))
 		{
-			$template_dir = DOL_DOCUMENT_ROOT . '/product/canvas/'.$_GET["canvas"].'/templates/';
+			$template_dir = DOL_DOCUMENT_ROOT . '/product/canvas/'.$_GET["canvas"].'/tpl/';
 			$template = 'list.tpl';
 		}
 		// Error template
 		else
 		{
-			$template_dir = DOL_DOCUMENT_ROOT . '/core/templates/';
+			$template_dir = DOL_DOCUMENT_ROOT . '/core/tpl/';
 			$template = 'error.tpl';
 		}
 		

htdocs/user/passwordforgotten.php

@@ -157,23 +157,23 @@ if ($conf->global->MAIN_SMARTY)
 	{
 		if (file_exists(DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone))
 		{
-			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/templates/user/";
+			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/phones/".$conf->browser->phone."/tpl/user/";
 			$smarty->assign('theme', 'default');
 		}
 		else
 		{
-			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/phones/others/templates/user/";
+			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/phones/others/tpl/user/";
 		}
 	}
 	else
 	{
-		if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/core/templates/passwordforgotten.tpl"))
+		if (file_exists(DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/core/tpl/passwordforgotten.tpl"))
 		{
-			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/templates/core/";
+			$smarty->template_dir = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/tpl/core/";
 		}
 		else
 		{
-			$smarty->template_dir = DOL_DOCUMENT_ROOT."/core/templates/";
+			$smarty->template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 		}
 
 		$conf->css  = "/theme/".$conf->theme."/".$conf->theme.".css.php?lang=".$langs->defaultlang;

scripts/books/droits-editeurs.php

@@ -28,7 +28,7 @@
 require_once("../../htdocs/master.inc.php");
 require_once(FPDF_PATH.'fpdf.php');
 require_once(DOL_DOCUMENT_ROOT."/product/product.class.php");
-require_once(DOL_DOCUMENT_ROOT."/product/templates/product.livre.class.php");
+require_once(DOL_DOCUMENT_ROOT."/product/canvas/livre/product.livre.class.php");
 
 $error = 0;
 $year = strftime("%Y", time());