Error202
/
yii2-swiftmailer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Refactored the basic app.

tags/2.0.0-beta
Qiang Xue 12 years ago
parent
8ee92fdb80
commit
bc21de98bd
10 changed files with 148 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      apps/basic/config/web.php
  2. 5
      apps/basic/controllers/SiteController.php
  3. 13
      apps/basic/views/site/about.php
  4. 54
      apps/basic/views/site/contact.php
  5. 29
      apps/basic/views/site/error.php
  6. 68
      apps/basic/views/site/index.php
  7. 26
      apps/basic/views/site/login.php
  8. 2
      apps/basic/web/index.php
  9. 2
      framework/yii/YiiBase.php
  10. 28
      framework/yii/views/errorHandler/error.php

6
apps/basic/config/web.php
Unescape View File

@ -7,7 +7,7 @@ return array(
'modules' => array( 'modules' => array(
'debug' => array( 'debug' => array(
'class' => 'yii\debug\Module', 'class' => 'yii\debug\Module',
'enabled' => YII_DEBUG && YII_ENV_DEV, 'enabled' => YII_ENV_DEV,
), ),
), ),
'components' => array( 'components' => array(
@ -15,9 +15,11 @@ return array(
'class' => 'yii\caching\FileCache', 'class' => 'yii\caching\FileCache',
), ),
'user' => array( 'user' => array(
'class' => 'yii\web\User',
'identityClass' => 'app\models\User', 'identityClass' => 'app\models\User',
), ),
'errorHandler' => array(
'errorAction' => 'site/error',
),
'log' => array( 'log' => array(
'traceLevel' => YII_DEBUG ? 3 : 0, 'traceLevel' => YII_DEBUG ? 3 : 0,
'targets' => array( 'targets' => array(

5
apps/basic/controllers/SiteController.php
Unescape View File

@ -12,9 +12,12 @@ class SiteController extends Controller
public function actions() public function actions()
{ {
return array( return array(
'error' => array(
'class' => 'yii\web\ErrorAction',
),
'captcha' => array( 'captcha' => array(
'class' => 'yii\captcha\CaptchaAction', 'class' => 'yii\captcha\CaptchaAction',
'fixedVerifyCode' => YII_ENV_DEV ? 'testme' : null, 'fixedVerifyCode' => YII_ENV_TEST ? 'testme' : null,
), ),
); );
} }

13
apps/basic/views/site/about.php
Unescape View File

@ -7,11 +7,12 @@ use yii\helpers\Html;
$this->title = 'About'; $this->title = 'About';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<h1><?php echo Html::encode($this->title); ?></h1> <div class="site-about">
<h1><?php echo Html::encode($this->title); ?></h1>
<p> <p>
This is the About page. You may modify the following file to customize its content: This is the About page. You may modify the following file to customize its content:
</p> </p>
<code><?php echo __FILE__; ?></code>
<code><?php echo __FILE__; ?></code>
</div>

54
apps/basic/views/site/contact.php
Unescape View File

@ -11,32 +11,38 @@ use yii\captcha\Captcha;
$this->title = 'Contact'; $this->title = 'Contact';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<h1><?php echo Html::encode($this->title); ?></h1> <div class="site-contact">
<h1><?php echo Html::encode($this->title); ?></h1>
<?php if (Yii::$app->session->hasFlash('contactFormSubmitted')): ?> <?php if (Yii::$app->session->hasFlash('contactFormSubmitted')): ?>
<div class="alert alert-success">
Thank you for contacting us. We will respond to you as soon as possible. <div class="alert alert-success">
</div> Thank you for contacting us. We will respond to you as soon as possible.
<?php return; endif; ?> </div>
<p> <?php else: ?>
If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
</p>
<div class="row"> <p>
<div class="col-lg-5"> If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
<?php $form = ActiveForm::begin(array('id' => 'contact-form')); ?> </p>
<?php echo $form->field($model, 'name')->textInput(); ?>
<?php echo $form->field($model, 'email')->textInput(); ?> <div class="row">
<?php echo $form->field($model, 'subject')->textInput(); ?> <div class="col-lg-5">
<?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?> <?php $form = ActiveForm::begin(array('id' => 'contact-form')); ?>
<?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), array( <?php echo $form->field($model, 'name')->textInput(); ?>
'options' => array('class' => 'form-control'), <?php echo $form->field($model, 'email')->textInput(); ?>
'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>', <?php echo $form->field($model, 'subject')->textInput(); ?>
)); ?> <?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?>
<div class="form-actions"> <?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), array(
<?php echo Html::submitButton('Submit', array('class' => 'btn btn-primary')); ?> 'options' => array('class' => 'form-control'),
</div> 'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
<?php ActiveForm::end(); ?> )); ?>
<div class="form-actions">
<?php echo Html::submitButton('Submit', array('class' => 'btn btn-primary')); ?>
</div>
<?php ActiveForm::end(); ?>
</div>
</div> </div>
<?php endif; ?>
</div> </div>

29
apps/basic/views/site/error.php
Unescape View File

@ -0,0 +1,29 @@
<?php
use yii\helpers\Html;
/**
* @var yii\base\View $this
* @var string $name
* @var string $message
* @var Exception $exception
*/
$this->title = $name;
?>
<div class="site-error">
<h1><?php echo Html::encode($this->title); ?></h1>
<div class="alert alert-danger">
<?php echo nl2br(Html::encode($message)); ?>
</div>
<p>
The above error occurred while the Web server was processing your request.
</p>
<p>
Please contact us if you think this is a server error. Thank you.
</p>
</div>

68
apps/basic/views/site/index.php
Unescape View File

@ -2,50 +2,52 @@
/** /**
* @var yii\base\View $this * @var yii\base\View $this
*/ */
$this->title = 'Welcome'; $this->title = 'My Yii Application';
?> ?>
<div class="jumbotron"> <div class="site-index">
<h1>Congratulations!</h1>
<p class="lead">You have successfully created your Yii-powered application.</p> <div class="jumbotron">
<h1>Congratulations!</h1>
<p><a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a></p> <p class="lead">You have successfully created your Yii-powered application.</p>
</div>
<div class="body-content"> <p><a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a></p>
</div>
<div class="row"> <div class="body-content">
<div class="col-lg-4">
<h2>Heading</h2>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et <div class="row">
dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip <div class="col-lg-4">
ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu <h2>Heading</h2>
fugiat nulla pariatur.</p>
<p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p> <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
</div> dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
<div class="col-lg-4"> ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
<h2>Heading</h2> fugiat nulla pariatur.</p>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et <p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip </div>
ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu <div class="col-lg-4">
fugiat nulla pariatur.</p> <h2>Heading</h2>
<p><a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p> <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
</div> dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
<div class="col-lg-4"> ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
<h2>Heading</h2> fugiat nulla pariatur.</p>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et <p><a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip </div>
ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu <div class="col-lg-4">
fugiat nulla pariatur.</p> <h2>Heading</h2>
<p><a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p> <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
fugiat nulla pariatur.</p>
<p><a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
</div>
</div> </div>
</div>
</div>
</div> </div>

26
apps/basic/views/site/login.php
Unescape View File

@ -10,19 +10,21 @@ use yii\widgets\ActiveForm;
$this->title = 'Login'; $this->title = 'Login';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<h1><?php echo Html::encode($this->title); ?></h1> <div class="site-login">
<h1><?php echo Html::encode($this->title); ?></h1>
<p>Please fill out the following fields to login:</p> <p>Please fill out the following fields to login:</p>
<div class="row"> <div class="row">
<div class="col-lg-3"> <div class="col-lg-3">
<?php $form = ActiveForm::begin(array('id' => 'login-form')); ?> <?php $form = ActiveForm::begin(array('id' => 'login-form')); ?>
<?php echo $form->field($model, 'username')->textInput(); ?> <?php echo $form->field($model, 'username')->textInput(); ?>
<?php echo $form->field($model, 'password')->passwordInput(); ?> <?php echo $form->field($model, 'password')->passwordInput(); ?>
<?php echo $form->field($model, 'rememberMe')->checkbox(); ?> <?php echo $form->field($model, 'rememberMe')->checkbox(); ?>
<div class="form-actions"> <div class="form-actions">
<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?> <?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?>
</div> </div>
<?php ActiveForm::end(); ?> <?php ActiveForm::end(); ?>
</div>
</div> </div>
</div> </div>

2
apps/basic/web/index.php
Unescape View File

@ -1,6 +1,6 @@
<?php <?php
// comment out the following line to disable debug mode // comment out the following two lines when deployed to production
defined('YII_DEBUG') or define('YII_DEBUG', true); defined('YII_DEBUG') or define('YII_DEBUG', true);
defined('YII_ENV') or define('YII_ENV', 'dev'); defined('YII_ENV') or define('YII_ENV', 'dev');

2
framework/yii/YiiBase.php
Unescape View File

@ -567,7 +567,7 @@ class YiiBase
*/ */
public static function powered() public static function powered()
{ {
return 'Powered by <a href="http://www.yiiframework.com/" rel="external">Yii Framework</a>.'; return 'Powered by <a href="http://www.yiiframework.com/" rel="external">Yii Framework</a>';
} }
/** /**

28
framework/yii/views/errorHandler/error.php
Unescape View File

@ -3,14 +3,32 @@
* @var \Exception $exception * @var \Exception $exception
* @var \yii\base\ErrorHandler $handler * @var \yii\base\ErrorHandler $handler
*/ */
$title = $handler->htmlEncode($exception instanceof \yii\base\Exception ? $exception->getName() : get_class($exception)); if ($exception instanceof \yii\web\HttpException) {
$code = $exception->statusCode;
} else {
$code = $exception->getCode();
}
if ($exception instanceof \yii\base\Exception) {
$name = $exception->getName();
} else {
$name = 'Error';
}
if ($code) {
$name .= " (#$code)";
}
if ($exception instanceof \yii\base\UserException) {
$message = $exception->getMessage();
} else {
$message = 'An internal server error occurred.';
}
?> ?>
<?php if (method_exists($this, 'beginPage')) $this->beginPage(); ?> <?php if (method_exists($this, 'beginPage')) $this->beginPage(); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title><?php echo $title?></title> <title><?php echo $handler->htmlEncode($name); ?></title>
<style> <style>
body { body {
@ -51,8 +69,8 @@ $title = $handler->htmlEncode($exception instanceof \yii\base\Exception ? $excep
</head> </head>
<body> <body>
<h1><?php echo $title?></h1> <h1><?php echo $handler->htmlEncode($name); ?></h1>
<h2><?php echo nl2br($handler->htmlEncode($exception->getMessage()))?></h2> <h2><?php echo nl2br($handler->htmlEncode($message)); ?></h2>
<p> <p>
The above error occurred while the Web server was processing your request. The above error occurred while the Web server was processing your request.
</p> </p>
@ -60,7 +78,7 @@ $title = $handler->htmlEncode($exception instanceof \yii\base\Exception ? $excep
Please contact us if you think this is a server error. Thank you. Please contact us if you think this is a server error. Thank you.
</p> </p>
<div class="version"> <div class="version">
<?php echo date('Y-m-d H:i:s', time())?> <?php echo date('Y-m-d H:i:s', time()); ?>
</div> </div>
<?php if (method_exists($this, 'endBody')) $this->endBody(); // to allow injecting code into body (mostly by Yii Debug Toolbar) ?> <?php if (method_exists($this, 'endBody')) $this->endBody(); // to allow injecting code into body (mostly by Yii Debug Toolbar) ?>
</body> </body>

Write Preview
Loading…
Cancel
Save