Adding favicon in each theme.

New theme must be to have favicon.ico

htdocs/core/tpl/login.tpl.php

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: login.tpl.php,v 1.19 2011/07/31 23:45:11 eldy Exp $
+ * $Id: login.tpl.php,v 1.20 2011/08/19 15:06:27 cdelambert Exp $
  */
 
 header('Cache-Control: Public, must-revalidate');
@@ -35,7 +35,11 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client);
 <meta name="robots" content="noindex,nofollow" />
 <title><?php echo $langs->trans('Login'); ?></title>
 <script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/js/jquery-latest.min.js"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo $conf_css; ?>" />
+<?php echo $conf->global->MAIN_HTML_HEADER ?>
+<?php
+$favicon=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/favicon.ico';
+?>
+<link rel="shortcut icon" type="image/x-icon" href="<?php echo $favicon; ?>" />
 <style type="text/css">
 <!--
 #login {

htdocs/main.inc.php

@@ -25,7 +25,7 @@
  *	\file       htdocs/main.inc.php
  *	\ingroup	core
  *	\brief      File that defines environment for Dolibarr pages only (variables not required by scripts)
- *	\version    $Id: main.inc.php,v 1.766 2011/08/19 07:22:17 hregis Exp $
+ *	\version    $Id: main.inc.php,v 1.767 2011/08/19 15:06:28 cdelambert Exp $
  */
 
 @ini_set('memory_limit', '64M');	// This may be useless if memory is hard limited by your PHP
@@ -846,12 +846,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
 		// Displays meta
 		print '<meta name="robots" content="noindex,nofollow">'."\n";      // Evite indexation par robots
 		print '<meta name="author" content="Dolibarr Development Team">'."\n";
-		if (!empty($conf->global->MAIN_FAVICON_THEME) ){
-			$favicon=$conf->global->MAIN_FAVICON_THEME;
-		}else{
-			$favicon=DOL_URL_ROOT.'/favicon.ico';
-		}
-		print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";;
+		$favicon=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/favicon.ico';
+		print '<link rel="shortcut icon" type="image/x-icon" href="'.$favicon.'"/>'."\n";
 		// Displays title
 		$appli='Dolibarr';
 		if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;

htdocs/theme/bureau2crea/init_ihm.php

@@ -15,5 +15,4 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-dolibarr_set_const($db, "MAIN_FAVICON_THEME", DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/favicon.ico','chaine',0,'',$conf->entity);
 dolibarr_set_const($db, "MAIN_JS_ON_PAYMENT", 1,'chaine',0,'',$conf->entity);

htdocs/theme/bureau2crea/tpl/login.tpl.php

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
- * $Id: login.tpl.php,v 1.3 2011/08/18 17:22:12 cdelambert Exp $
+ * $Id: login.tpl.php,v 1.4 2011/08/19 15:06:29 cdelambert Exp $
  */
 
 header('Cache-Control: Public, must-revalidate');
@@ -37,6 +37,10 @@ header("Content-type: text/html; charset=".$conf->file->character_set_client);
 <script type="text/javascript" src="<?php echo DOL_URL_ROOT ?>/includes/jquery/js/jquery-latest.min.js"></script>
 <link rel="stylesheet" type="text/css" href="<?php echo $conf_css; ?>" />
 <?php echo $conf->global->MAIN_HTML_HEADER ?>
+<?php
+$favicon=DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/favicon.ico';
+?>
+<link rel="shortcut icon" type="image/x-icon" href="<?php echo $favicon; ?>" />
 <!-- HTTP_USER_AGENT = <?php echo $_SERVER['HTTP_USER_AGENT']; ?> -->
 </head>