Skip to content

Commit e35ea2e

Browse files
Fix yiisoft#267: Adjust main layout for Bootstrap5 (yiisoft#268)
1 parent 27e20ee commit e35ea2e

File tree

1 file changed

+29
-27
lines changed

1 file changed

+29
-27
lines changed

views/layouts/main.php

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,67 +11,69 @@
1111
use yii\bootstrap5\NavBar;
1212

1313
AppAsset::register($this);
14+
15+
$this->registerCsrfMetaTags();
16+
$this->registerMetaTag(['charset' => Yii::$app->charset], 'charset');
17+
$this->registerMetaTag(['name' => 'viewport', 'content' => 'width=device-width, initial-scale=1, shrink-to-fit=no']);
18+
$this->registerMetaTag(['name' => 'description', 'content' => $this->params['meta_description'] ?? '']);
19+
$this->registerMetaTag(['name' => 'keywords', 'content' => $this->params['meta_keywords'] ?? '']);
20+
$this->registerLinkTag(['rel' => 'icon', 'type' => 'image/x-icon', 'href' => '@web/favicon.ico']);
1421
?>
1522
<?php $this->beginPage() ?>
1623
<!DOCTYPE html>
1724
<html lang="<?= Yii::$app->language ?>" class="h-100">
1825
<head>
19-
<meta charset="<?= Yii::$app->charset ?>">
20-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
21-
<?php $this->registerCsrfMetaTags() ?>
2226
<title><?= Html::encode($this->title) ?></title>
2327
<?php $this->head() ?>
2428
</head>
2529
<body class="d-flex flex-column h-100">
2630
<?php $this->beginBody() ?>
2731

28-
<header>
32+
<header id="header">
2933
<?php
3034
NavBar::begin([
3135
'brandLabel' => Yii::$app->name,
3236
'brandUrl' => Yii::$app->homeUrl,
33-
'options' => [
34-
'class' => 'navbar navbar-expand-md navbar-dark bg-dark fixed-top',
35-
],
37+
'options' => ['class' => 'navbar-expand-md navbar-dark bg-dark fixed-top']
3638
]);
3739
echo Nav::widget([
3840
'options' => ['class' => 'navbar-nav'],
3941
'items' => [
4042
['label' => 'Home', 'url' => ['/site/index']],
4143
['label' => 'About', 'url' => ['/site/about']],
4244
['label' => 'Contact', 'url' => ['/site/contact']],
43-
Yii::$app->user->isGuest ? (
44-
['label' => 'Login', 'url' => ['/site/login']]
45-
) : (
46-
'<li>'
47-
. Html::beginForm(['/site/logout'], 'post', ['class' => 'form-inline'])
48-
. Html::submitButton(
49-
'Logout (' . Yii::$app->user->identity->username . ')',
50-
['class' => 'btn btn-link logout']
51-
)
52-
. Html::endForm()
53-
. '</li>'
54-
)
55-
],
45+
Yii::$app->user->isGuest
46+
? ['label' => 'Login', 'url' => ['/site/login']]
47+
: '<li class="nav-item">'
48+
. Html::beginForm(['/site/logout'])
49+
. Html::submitButton(
50+
'Logout (' . Yii::$app->user->identity->username . ')',
51+
['class' => 'nav-link btn btn-link logout']
52+
)
53+
. Html::endForm()
54+
. '</li>'
55+
]
5656
]);
5757
NavBar::end();
5858
?>
5959
</header>
6060

61-
<main role="main" class="flex-shrink-0">
61+
<main id="main" class="flex-shrink-0" role="main">
6262
<div class="container">
63-
<?= Breadcrumbs::widget([
64-
'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
65-
]) ?>
63+
<?php if (!empty($this->params['breadcrumbs'])): ?>
64+
<?= Breadcrumbs::widget(['links' => $this->params['breadcrumbs']]) ?>
65+
<?php endif ?>
6666
<?= Alert::widget() ?>
6767
<?= $content ?>
6868
</div>
6969
</main>
7070

71-
<footer class="footer mt-auto py-3 text-muted">
71+
<footer id="footer" class="mt-auto py-3 bg-light">
7272
<div class="container">
73-
<p class="float-left">&copy; My Company <?= date('Y') ?></p>
74-
<p class="float-right"><?= Yii::powered() ?></p>
73+
<div class="row text-muted">
74+
<div class="col-md-6 text-center text-md-start">&copy; My Company <?= date('Y') ?></div>
75+
<div class="col-md-6 text-center text-md-end"><?= Yii::powered() ?></div>
76+
</div>
7577
</div>
7678
</footer>
7779

0 commit comments

Comments
 (0)