diff --git a/views/layouts/main.php b/views/layouts/main.php index d5bba3a..d5b1b49 100644 --- a/views/layouts/main.php +++ b/views/layouts/main.php @@ -1,13 +1,14 @@ beginPage() ?> @@ -21,47 +22,50 @@ AppAsset::register($this); head() ?> - beginBody() ?> -
- 'My Company', - 'brandUrl' => Yii::$app->homeUrl, - 'options' => [ - 'class' => 'navbar-inverse navbar-fixed-top', - ], - ]); - echo Nav::widget([ - 'options' => ['class' => 'navbar-nav navbar-right'], - 'items' => [ - ['label' => 'Home', 'url' => ['/site/index']], - ['label' => 'About', 'url' => ['/site/about']], - ['label' => 'Contact', 'url' => ['/site/contact']], - Yii::$app->user->isGuest ? - ['label' => 'Login', 'url' => ['/site/login']] : - ['label' => 'Logout (' . Yii::$app->user->identity->username . ')', - 'url' => ['/site/logout'], - 'linkOptions' => ['data-method' => 'post']], - ], - ]); - NavBar::end(); - ?> -
- isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], - ]) ?> - -
+
+ 'My Company', + 'brandUrl' => Yii::$app->homeUrl, + 'options' => [ + 'class' => 'navbar-inverse navbar-fixed-top', + ], + ]); + echo Nav::widget([ + 'options' => ['class' => 'navbar-nav navbar-right'], + 'items' => [ + ['label' => 'Home', 'url' => ['/site/index']], + ['label' => 'About', 'url' => ['/site/about']], + ['label' => 'Contact', 'url' => ['/site/contact']], + Yii::$app->user->isGuest ? + ['label' => 'Login', 'url' => ['/site/login']] : + [ + 'label' => 'Logout (' . Yii::$app->user->identity->username . ')', + 'url' => ['/site/logout'], + 'linkOptions' => ['data-method' => 'post'] + ], + ], + ]); + NavBar::end(); + ?> + +
+ isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [], + ]) ?> +
+
- + endBody() ?> diff --git a/views/site/about.php b/views/site/about.php index 13d85a6..68d5cf3 100644 --- a/views/site/about.php +++ b/views/site/about.php @@ -1,7 +1,9 @@ title = 'About'; $this->params['breadcrumbs'][] = $this->title; ?> diff --git a/views/site/contact.php b/views/site/contact.php index e964a34..22a75bb 100644 --- a/views/site/contact.php +++ b/views/site/contact.php @@ -1,12 +1,13 @@ title = 'Contact'; $this->params['breadcrumbs'][] = $this->title; ?> @@ -15,43 +16,53 @@ $this->params['breadcrumbs'][] = $this->title; session->hasFlash('contactFormSubmitted')): ?> -
- Thank you for contacting us. We will respond to you as soon as possible. -
+
+ Thank you for contacting us. We will respond to you as soon as possible. +
-

- Note that if you turn on the Yii debugger, you should be able - to view the mail message on the mail panel of the debugger. - mailer->useFileTransport): ?> - Because the application is in development mode, the email is not sent but saved as - a file under mailer->fileTransportPath) ?>. - Please configure the useFileTransport property of the mail - application component to be false to enable email sending. - -

+

+ Note that if you turn on the Yii debugger, you should be able + to view the mail message on the mail panel of the debugger. + mailer->useFileTransport): ?> + Because the application is in development mode, the email is not sent but saved as + a file under mailer->fileTransportPath) ?>. + Please configure the useFileTransport property of the mail + application component to be false to enable email sending. + +

-

- 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. +

-
-
- 'contact-form']); ?> - field($model, 'name') ?> - field($model, 'email') ?> - field($model, 'subject') ?> - field($model, 'body')->textArea(['rows' => 6]) ?> - field($model, 'verifyCode')->widget(Captcha::className(), [ - 'template' => '
{image}
{input}
', - ]) ?> -
- 'btn btn-primary', 'name' => 'contact-button']) ?> -
- +
+
+ + 'contact-form']); ?> + + field($model, 'name') ?> + + field($model, 'email') ?> + + field($model, 'subject') ?> + + field($model, 'body')->textArea(['rows' => 6]) ?> + + field($model, 'verifyCode')->widget(Captcha::className(), [ + 'template' => '
{image}
{input}
', + ]) ?> + +
+ 'btn btn-primary', 'name' => 'contact-button']) ?> +
+ + + +
-
diff --git a/views/site/error.php b/views/site/error.php index b9812c4..0ba2574 100644 --- a/views/site/error.php +++ b/views/site/error.php @@ -1,12 +1,12 @@ title = $name; ?>
diff --git a/views/site/index.php b/views/site/index.php index a00ee4d..f780610 100644 --- a/views/site/index.php +++ b/views/site/index.php @@ -1,5 +1,7 @@ title = 'My Yii Application'; ?>
diff --git a/views/site/login.php b/views/site/login.php index bca488c..059ef80 100644 --- a/views/site/login.php +++ b/views/site/login.php @@ -1,11 +1,12 @@ title = 'Login'; $this->params['breadcrumbs'][] = $this->title; ?> @@ -23,19 +24,19 @@ $this->params['breadcrumbs'][] = $this->title; ], ]); ?> - field($model, 'username') ?> + field($model, 'username') ?> - field($model, 'password')->passwordInput() ?> + field($model, 'password')->passwordInput() ?> - field($model, 'rememberMe')->checkbox([ - 'template' => "
{input} {label}
\n
{error}
", - ]) ?> + field($model, 'rememberMe')->checkbox([ + 'template' => "
{input} {label}
\n
{error}
", + ]) ?> -
-
- 'btn btn-primary', 'name' => 'login-button']) ?> +
+
+ 'btn btn-primary', 'name' => 'login-button']) ?> +
-