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

fixes #736

tags/2.0.0-beta
Alexander Makarov 12 years ago
parent
10e436eeb9
commit
edb77393b2
15 changed files with 268 additions and 339 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. 1
      apps/advanced/backend/config/AppAsset.php
  2. 63
      apps/advanced/backend/views/layouts/main.php
  3. 68
      apps/advanced/backend/views/site/index.php
  4. 24
      apps/advanced/backend/views/site/login.php
  5. 79
      apps/advanced/backend/web/css/site.css
  6. 1
      apps/advanced/frontend/config/AppAsset.php
  7. 78
      apps/advanced/frontend/views/layouts/main.php
  8. 12
      apps/advanced/frontend/views/site/about.php
  9. 41
      apps/advanced/frontend/views/site/contact.php
  10. 68
      apps/advanced/frontend/views/site/index.php
  11. 29
      apps/advanced/frontend/views/site/login.php
  12. 20
      apps/advanced/frontend/views/site/requestPasswordResetToken.php
  13. 20
      apps/advanced/frontend/views/site/resetPassword.php
  14. 24
      apps/advanced/frontend/views/site/signup.php
  15. 79
      apps/advanced/frontend/web/css/site.css

1
apps/advanced/backend/config/AppAsset.php
Unescape View File

@ -6,6 +6,7 @@
*/ */
namespace backend\config; namespace backend\config;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**

63
apps/advanced/backend/views/layouts/main.php
Unescape View File

@ -1,7 +1,8 @@
<?php <?php
use backend\config\AppAsset; use backend\config\AppAsset;
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\Menu; use yii\bootstrap\Nav;
use yii\bootstrap\NavBar;
use yii\widgets\Breadcrumbs; use yii\widgets\Breadcrumbs;
/** /**
@ -19,43 +20,45 @@ AppAsset::register($this);
<?php $this->head(); ?> <?php $this->head(); ?>
</head> </head>
<body> <body>
<div class="container">
<?php $this->beginBody(); ?> <?php $this->beginBody(); ?>
<div class="masthead"> <?php
<h3 class="muted">My Company</h3> NavBar::begin(array(
'brandLabel' => 'My Company',
<div class="navbar fullwidth"> 'brandUrl' => Yii::$app->homeUrl,
<div class="navbar-inner"> 'options' => array(
<div class="container"> 'class' => 'navbar-inverse navbar-fixed-top',
<?php echo Menu::widget(array( ),
'options' => array('class' => 'nav'), ));
'items' => array( $menuItems = array(
array('label' => 'Home', 'url' => array('/site/index')), array('label' => 'Home', 'url' => array('/site/index')),
Yii::$app->user->isGuest ? );
array('label' => 'Login', 'url' => array('/site/login')) : if (Yii::$app->user->isGuest) {
array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout')), $menuItems[] = array('label' => 'Login', 'url' => array('/site/login'));
), }
)); ?> else {
</div> $menuItems[] = array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout'));
</div> }
</div> echo Nav::widget(array(
<!-- /.navbar --> 'options' => array('class' => 'navbar-nav pull-right'),
</div> 'items' => $menuItems,
));
NavBar::end();
?>
<div class="container">
<?php echo Breadcrumbs::widget(array( <?php echo Breadcrumbs::widget(array(
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(), 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(),
)); ?> )); ?>
<?php echo $content; ?> <?php echo $content; ?>
</div>
<hr> <footer class="footer">
<div class="container">
<p class="pull-left">&copy; My Company <?php echo date('Y'); ?></p>
<p class="pull-right"><?php echo Yii::powered(); ?></p>
</div>
</footer>
<div class="footer">
<p>&copy; My Company <?php echo date('Y'); ?></p>
<p>
<?php echo Yii::powered(); ?>
Template by <a href="http://twitter.github.io/bootstrap/">Twitter Bootstrap</a>
</p>
</div>
<?php $this->endBody(); ?> <?php $this->endBody(); ?>
</div> </div>
</body> </body>

68
apps/advanced/backend/views/site/index.php
Unescape View File

@ -2,46 +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>Welcome!</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus <div class="jumbotron">
commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p> <h1>Congratulations!</h1>
<a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a>
</div>
<hr> <p class="lead">You have successfully created your Yii-powered application.</p>
<!-- Example row of columns --> <p><a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a></p>
<div class="row-fluid"> </div>
<div class="span4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris <div class="body-content">
condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod.
Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p> <div class="row">
</div> <div class="col-lg-4">
<div class="span4"> <h2>Heading</h2>
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
Donec sed odio dui. </p> 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" href="#">View details &raquo;</a></p> <p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
</div> </div>
<div class="span4"> <div class="col-lg-4">
<h2>Heading</h2> <h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
massa.</p> 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/forum/">Yii Forum &raquo;</a></p>
</div>
<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
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>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div> </div>
</div> </div>

24
apps/advanced/backend/views/site/login.php
Unescape View File

@ -10,15 +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>
<?php $form = ActiveForm::begin(array('options' => array('class' => 'form-horizontal'))); ?> <div class="row">
<?php echo $form->field($model, 'username')->textInput(); ?> <div class="col-lg-5">
<?php echo $form->field($model, 'password')->passwordInput(); ?> <?php $form = ActiveForm::begin(array('id' => 'login-form')); ?>
<?php echo $form->field($model, 'rememberMe')->checkbox(); ?> <?php echo $form->field($model, 'username')->textInput(); ?>
<div class="form-actions"> <?php echo $form->field($model, 'password')->passwordInput(); ?>
<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?> <?php echo $form->field($model, 'rememberMe')->checkbox(); ?>
<div class="form-actions">
<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?>
</div>
<?php ActiveForm::end(); ?>
</div>
</div> </div>
<?php ActiveForm::end(); ?> </div>

79
apps/advanced/backend/web/css/site.css
Unescape View File

@ -1,78 +1,19 @@
body { body {
padding-top: 20px; padding-top: 70px;
padding-bottom: 60px;
} }
/* Custom container */ .footer {
.container { border-top: 1px solid #ddd;
margin: 0 auto; margin-top: 30px;
max-width: 1000px; padding-top: 15px;
padding-bottom: 30px;
} }
.container > hr {
margin: 60px 0;
}
/* Main marketing message and sign up button */
.jumbotron { .jumbotron {
margin: 80px 0; text-align: center;
text-align: center; background-color: transparent;
}
.jumbotron h1 {
font-size: 100px;
line-height: 1;
}
.jumbotron .lead {
font-size: 24px;
line-height: 1.25;
} }
.jumbotron .btn { .jumbotron .btn {
font-size: 21px; font-size: 21px;
padding: 14px 24px; padding: 14px 24px;
}
/* Supporting marketing content */
.marketing {
margin: 60px 0;
}
.marketing p + h4 {
margin-top: 28px;
}
/* Customize the navbar links to be fill the entire space of the .navbar */
.navbar.fullwidth .navbar-inner {
padding: 0;
}
.navbar.fullwidth .nav {
margin: 0;
display: table;
width: 100%;
}
.navbar.fullwidth .nav li {
display: table-cell;
width: 1%;
float: none;
}
.navbar.fullwidth .nav li a {
font-weight: bold;
text-align: center;
border-left: 1px solid rgba(255, 255, 255, .75);
border-right: 1px solid rgba(0, 0, 0, .1);
}
.navbar.fullwidth .nav li:first-child a {
border-left: 0;
border-radius: 3px 0 0 3px;
}
.navbar.fullwidth .nav li:last-child a {
border-right: 0;
border-radius: 0 3px 3px 0;
} }

1
apps/advanced/frontend/config/AppAsset.php
Unescape View File

@ -6,6 +6,7 @@
*/ */
namespace frontend\config; namespace frontend\config;
use yii\web\AssetBundle; use yii\web\AssetBundle;
/** /**

78
apps/advanced/frontend/views/layouts/main.php
Unescape View File

@ -1,7 +1,8 @@
<?php <?php
use frontend\config\AppAsset; use frontend\config\AppAsset;
use yii\helpers\Html; use yii\helpers\Html;
use yii\widgets\Menu; use yii\bootstrap\Nav;
use yii\bootstrap\NavBar;
use yii\widgets\Breadcrumbs; use yii\widgets\Breadcrumbs;
use frontend\widgets\Alert; use frontend\widgets\Alert;
@ -20,57 +21,50 @@ AppAsset::register($this);
<?php $this->head(); ?> <?php $this->head(); ?>
</head> </head>
<body> <body>
<div class="container">
<?php $this->beginBody(); ?> <?php $this->beginBody(); ?>
<div class="masthead"> <?php
<h3 class="muted">My Company</h3> NavBar::begin(array(
'brandLabel' => 'My Company',
<div class="navbar fullwidth"> 'brandUrl' => Yii::$app->homeUrl,
<div class="navbar-inner"> 'options' => array(
<div class="container"> 'class' => 'navbar-inverse navbar-fixed-top',
<?php ),
$menuItems = array( ));
array('label' => 'Home', 'url' => array('/site/index')), $menuItems = array(
array('label' => 'About', 'url' => array('/site/about')), array('label' => 'Home', 'url' => array('/site/index')),
array('label' => 'Contact', 'url' => array('/site/contact')), array('label' => 'About', 'url' => array('/site/about')),
); array('label' => 'Contact', 'url' => array('/site/contact')),
if (Yii::$app->user->isGuest) { );
$menuItems[] = array('label' => 'Signup', 'url' => array('/site/signup')); if (Yii::$app->user->isGuest) {
$menuItems[] = array('label' => 'Login', 'url' => array('/site/login')); $menuItems[] = array('label' => 'Signup', 'url' => array('/site/signup'));
} $menuItems[] = array('label' => 'Login', 'url' => array('/site/login'));
else { }
$menuItems[] = array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout')); else {
} $menuItems[] = array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout'));
echo Menu::widget(array( }
'options' => array('class' => 'nav'), echo Nav::widget(array(
'items' => $menuItems, 'options' => array('class' => 'navbar-nav pull-right'),
)); 'items' => $menuItems,
?> ));
</div> NavBar::end();
</div> ?>
</div>
<!-- /.navbar -->
</div>
<div class="container">
<?php echo Breadcrumbs::widget(array( <?php echo Breadcrumbs::widget(array(
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(), 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(),
)); ?> )); ?>
<?php echo Alert::widget()?> <?php echo Alert::widget()?>
<?php echo $content; ?> <?php echo $content; ?>
</div>
<hr> <footer class="footer">
<div class="container">
<p class="pull-left">&copy; My Company <?php echo date('Y'); ?></p>
<p class="pull-right"><?php echo Yii::powered(); ?></p>
</div>
</footer>
<div class="footer">
<p>&copy; My Company <?php echo date('Y'); ?></p>
<p>
<?php echo Yii::powered(); ?>
Template by <a href="http://twitter.github.io/bootstrap/">Twitter Bootstrap</a>
</p>
</div>
<?php $this->endBody(); ?> <?php $this->endBody(); ?>
</div>
</body> </body>
</html> </html>
<?php $this->endPage(); ?> <?php $this->endPage(); ?>

12
apps/advanced/frontend/views/site/about.php
Unescape View File

@ -1,16 +1,16 @@
<?php <?php
use yii\helpers\Html; use yii\helpers\Html;
/** /**
* @var yii\base\View $this * @var yii\base\View $this
*/ */
$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>
This is the About page. You may modify the following file to customize its content:
</p>
<code><?php echo __FILE__; ?></code> <p>This is the About page. You may modify the following file to customize its content:</p>
<code><?php echo __FILE__; ?></code>
</div>

41
apps/advanced/frontend/views/site/contact.php
Unescape View File

@ -11,24 +11,29 @@ 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>
<p> <p>
If you have business inquiries or other questions, please fill out the following form to contact us. Thank you. If you have business inquiries or other questions, please fill out the following form to contact us. Thank you.
</p> </p>
<?php $form = ActiveForm::begin(array( <div class="row">
'options' => array('class' => 'form-horizontal'), <div class="col-lg-5">
'fieldConfig' => array('inputOptions' => array('class' => 'input-xlarge')), <?php $form = ActiveForm::begin(array('id' => 'contact-form')); ?>
)); ?> <?php echo $form->field($model, 'name')->textInput(); ?>
<?php echo $form->field($model, 'name')->textInput(); ?> <?php echo $form->field($model, 'email')->textInput(); ?>
<?php echo $form->field($model, 'email')->textInput(); ?> <?php echo $form->field($model, 'subject')->textInput(); ?>
<?php echo $form->field($model, 'subject')->textInput(); ?> <?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?>
<?php echo $form->field($model, 'body')->textArea(array('rows' => 6)); ?> <?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), array(
<?php echo $form->field($model, 'verifyCode')->widget(Captcha::className(), array( 'options' => array('class' => 'form-control'),
'options' => array('class' => 'input-medium'), 'template' => '<div class="row"><div class="col-lg-3">{image}</div><div class="col-lg-6">{input}</div></div>',
)); ?> )); ?>
<div class="form-actions"> <div class="form-actions">
<?php echo Html::submitButton('Submit', array('class' => 'btn btn-primary')); ?> <?php echo Html::submitButton('Submit', array('class' => 'btn btn-primary')); ?>
</div>
<?php ActiveForm::end(); ?>
</div>
</div> </div>
<?php ActiveForm::end(); ?>
</div>

68
apps/advanced/frontend/views/site/index.php
Unescape View File

@ -2,46 +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>Welcome!</h1>
<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus <div class="jumbotron">
commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p> <h1>Congratulations!</h1>
<a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a>
</div>
<hr> <p class="lead">You have successfully created your Yii-powered application.</p>
<!-- Example row of columns --> <p><a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a></p>
<div class="row-fluid"> </div>
<div class="span4">
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris <div class="body-content">
condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod.
Donec sed odio dui. </p>
<p><a class="btn" href="#">View details &raquo;</a></p> <div class="row">
</div> <div class="col-lg-4">
<div class="span4"> <h2>Heading</h2>
<h2>Heading</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
Donec sed odio dui. </p> 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" href="#">View details &raquo;</a></p> <p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
</div> </div>
<div class="span4"> <div class="col-lg-4">
<h2>Heading</h2> <h2>Heading</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
massa.</p> 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/forum/">Yii Forum &raquo;</a></p>
</div>
<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
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>
<p><a class="btn" href="#">View details &raquo;</a></p>
</div> </div>
</div> </div>

29
apps/advanced/frontend/views/site/login.php
Unescape View File

@ -10,17 +10,24 @@ 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>
<?php $form = ActiveForm::begin(array('options' => array('class' => 'form-horizontal'))); ?> <div class="row">
<?php echo $form->field($model, 'username')->textInput(); ?> <div class="col-lg-5">
<?php echo $form->field($model, 'password')->passwordInput(); ?> <?php $form = ActiveForm::begin(array('id' => 'login-form')); ?>
<?php echo $form->field($model, 'rememberMe')->checkbox(); ?> <?php echo $form->field($model, 'username')->textInput(); ?>
<div class="form-actions"> <?php echo $form->field($model, 'password')->passwordInput(); ?>
<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?> <?php echo $form->field($model, 'rememberMe')->checkbox(); ?>
<div style="color:#999;margin:1em 0">
If you forgot your password you can <?php echo Html::a('reset it', array('site/request-password-reset'))?>.
</div>
<div class="form-actions">
<?php echo Html::submitButton('Login', array('class' => 'btn btn-primary')); ?>
</div>
<?php ActiveForm::end(); ?>
</div>
</div> </div>
<?php ActiveForm::end(); ?> </div>
<p>If you forgot your password you can <?php echo Html::a('reset it', array('site/request-password-reset'))?>.</p>

20
apps/advanced/frontend/views/site/requestPasswordResetToken.php
Unescape View File

@ -10,13 +10,19 @@ use yii\widgets\ActiveForm;
$this->title = 'Request password reset'; $this->title = 'Request password reset';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<h1><?php echo Html::encode($this->title); ?></h1> <div class="site-request-password-reset">
<h1><?php echo Html::encode($this->title); ?></h1>
<p>Please fill out your email. A link to reset password will be sent there.</p> <p>Please fill out your email. A link to reset password will be sent there.</p>
<?php $form = ActiveForm::begin(array('options' => array('class' => 'form-horizontal'))); ?> <div class="row">
<?php echo $form->field($model, 'email')->textInput(); ?> <div class="col-lg-5">
<div class="form-actions"> <?php $form = ActiveForm::begin(array('id' => 'request-password-reset-form')); ?>
<?php echo Html::submitButton('Send', array('class' => 'btn btn-primary')); ?> <?php echo $form->field($model, 'email')->textInput(); ?>
<div class="form-actions">
<?php echo Html::submitButton('Send', array('class' => 'btn btn-primary')); ?>
</div>
<?php ActiveForm::end(); ?>
</div>
</div> </div>
<?php ActiveForm::end(); ?> </div>

20
apps/advanced/frontend/views/site/resetPassword.php
Unescape View File

@ -10,13 +10,19 @@ use yii\widgets\ActiveForm;
$this->title = 'Reset password'; $this->title = 'Reset password';
$this->params['breadcrumbs'][] = $this->title; $this->params['breadcrumbs'][] = $this->title;
?> ?>
<h1><?php echo Html::encode($this->title); ?></h1> <div class="site-reset-password">
<h1><?php echo Html::encode($this->title); ?></h1>
<p>Please choose your new password:</p> <p>Please choose your new password:</p>
<?php $form = ActiveForm::begin(array('options' => array('class' => 'form-horizontal'))); ?> <div class="row">
<?php echo $form->field($model, 'password')->passwordInput(); ?> <div class="col-lg-5">
<div class="form-actions"> <?php $form = ActiveForm::begin(array('id' => 'reset-password-form')); ?>
<?php echo Html::submitButton('Save', array('class' => 'btn btn-primary')); ?> <?php echo $form->field($model, 'password')->passwordInput(); ?>
<div class="form-actions">
<?php echo Html::submitButton('Save', array('class' => 'btn btn-primary')); ?>
</div>
<?php ActiveForm::end(); ?>
</div>
</div> </div>
<?php ActiveForm::end(); ?> </div>

24
apps/advanced/frontend/views/site/signup.php
Unescape View File

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

79
apps/advanced/frontend/web/css/site.css
Unescape View File

@ -1,78 +1,19 @@
body { body {
padding-top: 20px; padding-top: 70px;
padding-bottom: 60px;
} }
/* Custom container */ .footer {
.container { border-top: 1px solid #ddd;
margin: 0 auto; margin-top: 30px;
max-width: 1000px; padding-top: 15px;
padding-bottom: 30px;
} }
.container > hr {
margin: 60px 0;
}
/* Main marketing message and sign up button */
.jumbotron { .jumbotron {
margin: 80px 0; text-align: center;
text-align: center; background-color: transparent;
}
.jumbotron h1 {
font-size: 100px;
line-height: 1;
}
.jumbotron .lead {
font-size: 24px;
line-height: 1.25;
} }
.jumbotron .btn { .jumbotron .btn {
font-size: 21px; font-size: 21px;
padding: 14px 24px; padding: 14px 24px;
}
/* Supporting marketing content */
.marketing {
margin: 60px 0;
}
.marketing p + h4 {
margin-top: 28px;
}
/* Customize the navbar links to be fill the entire space of the .navbar */
.navbar.fullwidth .navbar-inner {
padding: 0;
}
.navbar.fullwidth .nav {
margin: 0;
display: table;
width: 100%;
}
.navbar.fullwidth .nav li {
display: table-cell;
width: 1%;
float: none;
}
.navbar.fullwidth .nav li a {
font-weight: bold;
text-align: center;
border-left: 1px solid rgba(255, 255, 255, .75);
border-right: 1px solid rgba(0, 0, 0, .1);
}
.navbar.fullwidth .nav li:first-child a {
border-left: 0;
border-radius: 3px 0 0 3px;
}
.navbar.fullwidth .nav li:last-child a {
border-right: 0;
border-radius: 0 3px 3px 0;
} }

Write Preview
Loading…
Cancel
Save