updated default app template

12 years ago · 90b2a54f2d
3 changed files with 12 additions and 7 deletions
--- a/framework/console/webapp/default/index.php
+++ b/framework/console/webapp/default/index.php
@ -1,10 +1,10 @@
 <?php
 define('YII_DEBUG', true);
-$yii = __DIR__.'/../framework/yii.php';
+require __DIR__.'/../framework/yii.php';
-require $yii;
+
 $config = require dirname(__DIR__).'/protected/config/main.php';
 $config['basePath'] = dirname(__DIR__).'/protected';
-$basePath = dirname(__DIR__).'/protected';
+$app = new \yii\web\Application($config);
 $app = new \yii\web\Application('webapp', $basePath, $config);
 $app->run();
--- a/framework/console/webapp/default/protected/config/main.php
+++ b/framework/console/webapp/default/protected/config/main.php
@ -1,5 +1,6 @@
 <?php
 return array(
 	'id' => 'webapp',
 	'name' => 'My Web Application',
 	'components' => array(
@ -12,5 +13,8 @@ return array(
 			'password' => '',
 		),
 		*/
 		'cache' => array(
 			'class' => 'yii\caching\DummyCache',
 		),
 	),
 );
--- a/framework/console/webapp/default/protected/views/layouts/main.php
+++ b/framework/console/webapp/default/protected/views/layouts/main.php
@ -1,11 +1,12 @@
 <?php use yii\helpers\Html as Html; ?>
 <!doctype html>
-<html lang="en">
+<html lang="<?php \Yii::$app->language?>">
 	<head>
 		<meta charset="utf-8" />
-		<title><?php echo $this->context->pageTitle?></title>
+		<title><?php echo Html::encode($this->page->title)?></title>
 	</head>
 	<body>
-		<h1><?php echo $this->context->pageTitle?></h1>
+		<h1><?php echo Html::encode($this->page->title)?></h1>
 		<div class="content">
 			<?php echo $content?>
 		</div>