adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update default layouts to use blocks.

Browse source
This commit is contained in:
mark_story 2011-12-17 21:41:06 -05:00
parent 46bb6c8ad6
commit 0b0a69de1e
3 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
View file

@ -29,7 +29,9 @@
echo $this->Html->css('cake.generic'); echo $this->Html->css('cake.generic');
echo $scripts_for_layout; echo $this->fetch('meta');
echo $this->fetch('css');
echo $this->fetch('script');
?> ?>
</head> </head>
<body> <body>
@ -41,8 +43,7 @@
<?php echo $this->Session->flash(); ?> <?php echo $this->Session->flash(); ?>
<?php echo $content_for_layout; ?> <?php echo $this->fetch('content'); ?>
</div> </div>
<div id="footer"> <div id="footer">
<?php echo $this->Html->link( <?php echo $this->Html->link(
@ -55,4 +56,4 @@
</div> </div>
<?php echo $this->element('sql_dump'); ?> <?php echo $this->element('sql_dump'); ?>
</body> </body>
</html> </html>

9
lib/Cake/View/Layouts/default.ctp
View file

@ -31,7 +31,9 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
echo $this->Html->css('cake.generic'); echo $this->Html->css('cake.generic');
echo $scripts_for_layout; echo $this->fetch('meta');
echo $this->fetch('css');
echo $this->fetch('script');
?> ?>
</head> </head>
<body> <body>
@ -43,8 +45,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
<?php echo $this->Session->flash(); ?> <?php echo $this->Session->flash(); ?>
<?php echo $content_for_layout; ?> <?php echo $this->fetch('content'); ?>
</div> </div>
<div id="footer"> <div id="footer">
<?php echo $this->Html->link( <?php echo $this->Html->link(
@ -57,4 +58,4 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
</div> </div>
<?php echo $this->element('sql_dump'); ?> <?php echo $this->element('sql_dump'); ?>
</body> </body>
</html> </html>

3
lib/Cake/View/View.php
View file

@ -586,7 +586,8 @@ class View extends Object {
} }
/** /**
* Fetch the content for a block. * Fetch the content for a block. If a block is
* empty or undefined '' will be returnned.
* *
* @param string $name Name of the block * @param string $name Name of the block
* @return The block content or '' if the block does not exist. * @return The block content or '' if the block does not exist.