From 0c22cb220611ba25b32169c9929c863493be617a Mon Sep 17 00:00:00 2001 From: Karl Cordes Date: Tue, 28 Jun 2011 10:13:31 +1000 Subject: [PATCH] Different FavIcon for dev copies --- models/industry.php | 4 +--- views/layouts/default.ctp | 18 ++++++++++++++---- webroot/img/cake-stop-taking-my-favicon.ico | Bin 233 -> 0 bytes webroot/img/cake.icon.gif | Bin 233 -> 0 bytes webroot/index.php | 2 +- 5 files changed, 16 insertions(+), 8 deletions(-) delete mode 100755 webroot/img/cake-stop-taking-my-favicon.ico delete mode 100755 webroot/img/cake.icon.gif diff --git a/models/industry.php b/models/industry.php index 7ea4a4d8..250c41d9 100755 --- a/models/industry.php +++ b/models/industry.php @@ -1,10 +1,8 @@ - array( 'className' => 'Customer', diff --git a/views/layouts/default.ctp b/views/layouts/default.ctp index ce9c8adc..ae077010 100755 --- a/views/layouts/default.ctp +++ b/views/layouts/default.ctp @@ -1,4 +1,5 @@ - + @@ -9,8 +10,18 @@ - meta('icon'); ?> - 0) { + echo $html->meta('favicon.ico','/img/core.png', array('type'=>'icon')); + } + else { + echo $html->meta('icon'); + + } + echo $html->css('quotenik'); echo $html->css('jquery-ui.custom.css'); @@ -21,7 +32,6 @@ echo $javascript->link('jquery-ui'); echo $javascript->link('jquery.form'); - //echo $javascript->link('jquery.validate.min'); echo $javascript->link('menu'); echo $javascript->link('global'); echo $javascript->link('search'); diff --git a/webroot/img/cake-stop-taking-my-favicon.ico b/webroot/img/cake-stop-taking-my-favicon.ico deleted file mode 100755 index f29f72ebef20ce39a1e3721d31b76d9054b1dc90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmVOrfx~(a*Br=IF!2lMFyj!pzT(o0Foa zdn-*>Om~4(V_pR~MF2EGA^8La000jFEC2ui02BZe000D*@X1N5t>>`K@|6NJ6h&YL z1u`%~wUB3glC5+ga)976a!3oFOhFu(2DMubr5G5VhQ{x4NGt;hD1iW&9tgW!0iZB! z6O)6HG-waF&;)>@C@r&FLW6?XF3Wfe6jmrIZUbdo27(g_16K`ZTZ}-3IRcmfa});+ jCL}5ZNSK%y0t-u|r5FwZRfnys7YD7i0<9mpxe)+6uKiOz diff --git a/webroot/img/cake.icon.gif b/webroot/img/cake.icon.gif deleted file mode 100755 index f29f72ebef20ce39a1e3721d31b76d9054b1dc90..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmVOrfx~(a*Br=IF!2lMFyj!pzT(o0Foa zdn-*>Om~4(V_pR~MF2EGA^8La000jFEC2ui02BZe000D*@X1N5t>>`K@|6NJ6h&YL z1u`%~wUB3glC5+ga)976a!3oFOhFu(2DMubr5G5VhQ{x4NGt;hD1iW&9tgW!0iZB! z6O)6HG-waF&;)>@C@r&FLW6?XF3Wfe6jmrIZUbdo27(g_16K`ZTZ}-3IRcmfa});+ jCL}5ZNSK%y0t-u|r5FwZRfnys7YD7i0<9mpxe)+6uKiOz diff --git a/webroot/index.php b/webroot/index.php index 6a7966fc..3c54123e 100755 --- a/webroot/index.php +++ b/webroot/index.php @@ -92,4 +92,4 @@ if (Configure::read() > 0) { echo ""; } -?> \ No newline at end of file +?>