Core templates are in core/templates directory. Make templates simpler.

This commit is contained in:
Laurent Destailleur 2010-01-04 19:47:26 +00:00
parent a0521a2614
commit 63619daeb2
3 changed files with 15 additions and 39 deletions

View File

@ -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 -->

View File

@ -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}

View File

@ -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"