From 63619daeb2e79071f1733357fd8cfabd01c5f4d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Mon, 4 Jan 2010 19:47:26 +0000
Subject: [PATCH] Core templates are in core/templates directory. Make
 templates simpler.

---
 htdocs/core/templates/google_ad.tpl | 34 -----------------------------
 htdocs/core/templates/login.tpl     | 12 +++++++++-
 htdocs/core/templates/login.tpl.php |  8 +++----
 3 files changed, 15 insertions(+), 39 deletions(-)
 delete mode 100644 htdocs/core/templates/google_ad.tpl

diff --git a/htdocs/core/templates/google_ad.tpl b/htdocs/core/templates/google_ad.tpl
deleted file mode 100644
index 38b3599edbf..00000000000
--- a/htdocs/core/templates/google_ad.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-{* Copyright (C) 2009 Regis Houssin <regis@dolibarr.fr>
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * $Id$
- *}
- 
-<!-- BEGIN GOOGLE AD TEMPLATE -->
-
-<script type="text/javascript"><!--
-	google_ad_client = "{$main_google_ad_client}";
-	/* {$main_google_ad_width}x{$main_google_ad_height}, {$main_google_ad_name} */
-	google_ad_slot = "{$main_google_ad_slot}";
-	google_ad_width = {$main_google_ad_width};
-	google_ad_height = {$main_google_ad_height};
-	//-->
-</script>
-<script type="text/javascript"
-	src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
-</script>
-
-<!-- END GOOGLE AD TEMPLATE -->
\ No newline at end of file
diff --git a/htdocs/core/templates/login.tpl b/htdocs/core/templates/login.tpl
index cccb767cb83..1b77eda5379 100644
--- a/htdocs/core/templates/login.tpl
+++ b/htdocs/core/templates/login.tpl
@@ -162,7 +162,17 @@ function donnefocus() {ldelim}
 
 	{if $main_google_ad_client}
 		<div align="center">
-		{include file=$google_ad_tpl}
+			<script type="text/javascript"><!--
+				google_ad_client = "{$main_google_ad_client}";
+				/* {$main_google_ad_width}x{$main_google_ad_height}, {$main_google_ad_name} */
+				google_ad_slot = "{$main_google_ad_slot}";
+				google_ad_width = {$main_google_ad_width};
+				google_ad_height = {$main_google_ad_height};
+				//-->
+			</script>
+			<script type="text/javascript"
+				src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+			</script>
 		</div>
 	{/if}
 
diff --git a/htdocs/core/templates/login.tpl.php b/htdocs/core/templates/login.tpl.php
index 05d9525fb5a..6b309292d58 100644
--- a/htdocs/core/templates/login.tpl.php
+++ b/htdocs/core/templates/login.tpl.php
@@ -165,11 +165,11 @@ function donnefocus() {
 	<?php if ($main_google_ad_client) { ?>
 		<div align="center">
 			<script type="text/javascript"><!--
-				google_ad_client = "{$main_google_ad_client}";
+				google_ad_client = <?php echo $main_google_ad_client ?>;
 				/* {$main_google_ad_width}x{$main_google_ad_height}, {$main_google_ad_name} */
-				google_ad_slot = "{$main_google_ad_slot}";
-				google_ad_width = {$main_google_ad_width};
-				google_ad_height = {$main_google_ad_height};
+				google_ad_slot = <?php echo $main_google_ad_slot ?>;
+				google_ad_width = <?php echo $main_google_ad_width ?>;
+				google_ad_height = <?php echo $main_google_ad_height ?>;
 				//-->
 			</script>
 			<script type="text/javascript"