splitted layout into _header, _content, _footer; added _before/_after

hiqdev · Aug 31, 2016 · 3740e47 · 3740e47
1 parent b9c2abe
commit 3740e47
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 37 deletions.
diff --git a/src/assets/css/original.css b/src/assets/css/original.css
@@ -10,12 +10,7 @@ body {
     padding: 0 0 60px;
 }
 
-.wrap > .container {
-    padding: 70px 15px 20px;
-}
-
 .footer {
-    height: 60px;
     background-color: #f5f5f5;
     border-top: 1px solid #ddd;
     padding-top: 20px;
@@ -36,6 +31,10 @@ body {
     font-style: italic;
 }
 
+a {
+    word-break: break-word;
+}
+
 /* add sorting icons to gridview sort links */
 a.asc:after, a.desc:after {
     position: relative;

diff --git a/src/views/layouts/_after_footer.php b/src/views/layouts/_after_footer.php
diff --git a/src/views/layouts/_after_header.php b/src/views/layouts/_after_header.php
diff --git a/src/views/layouts/_content.php b/src/views/layouts/_content.php
@@ -0,0 +1,12 @@
+<div class="container">
+    <?php if (Yii::$app->themeManager->hasWidget('Flashes')) : ?>
+        <?= Yii::$app->themeManager->widget('Flashes') ?>
+    <?php endif ?>
+    <?= Yii::$app->themeManager->widget([
+        'class' => 'Breadcrumbs',
+        'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+    ]) ?>
+    <div class="row"><div class="col-xs-12">
+        <?= $content ?>
+    </div></div>
+</div>
diff --git a/src/views/layouts/_footer.php b/src/views/layouts/_footer.php
@@ -0,0 +1,8 @@
+<footer class="footer">
+    <div class="container">
+        <p class="pull-left">
+            &copy; <?= Yii::$app->themeManager->widget('CopyrightYears') ?> <?= Yii::$app->themeManager->widget('OrganizationLink') ?>.
+            <?= Yii::t('hiqdev/themes/original', 'All rights reserved.') ?>
+        <p class="pull-right"><?= $this->render('//layouts/_poweredBy') ?></p>
+    </div>
+</footer>
diff --git a/src/views/layouts/_header.php b/src/views/layouts/_header.php
@@ -0,0 +1,19 @@
+<?php
+
+use yii\bootstrap\Nav;
+use yii\bootstrap\NavBar;
+
+?>
+<?php NavBar::begin([
+    'brandLabel' => Yii::$app->name,
+    'brandUrl' => Yii::$app->homeUrl,
+    'options' => [
+        'class' => 'navbar-inverse navbar-fixed-top',
+    ],
+]) ?>
+    <?= Yii::$app->menuManager->render('main', [
+        'class'   => Nav::class,
+        'options' => ['class' => 'navbar-nav navbar-right'],
+    ]) ?>
+<?php NavBar::end() ?>
+<div style="margin-top:50px"></div>
diff --git a/src/views/layouts/_poweredBy.php b/src/views/layouts/_poweredBy.php
@@ -0,0 +1 @@
+<?= Yii::powered() ?>
diff --git a/src/views/layouts/main.php b/src/views/layouts/main.php
@@ -4,8 +4,6 @@
 /* @var $content string */
 
 use yii\helpers\Html;
-use yii\bootstrap\Nav;
-use yii\bootstrap\NavBar;
 
 Yii::$app->themeManager->registerAssets();
 
@@ -24,39 +22,14 @@
 <?php $this->beginBody() ?>
 
 <div class="wrap">
-    <?php NavBar::begin([
-        'brandLabel' => Yii::$app->name,
-        'brandUrl' => Yii::$app->homeUrl,
-        'options' => [
-            'class' => 'navbar-inverse navbar-fixed-top',
-        ],
-    ]) ?>
-        <?= Yii::$app->menuManager->render('main', [
-            'class'   => Nav::class,
-            'options' => ['class' => 'navbar-nav navbar-right'],
-        ]) ?>
-    <?php NavBar::end() ?>
+    <?= $this->render('//layouts/_header') ?>
+    <?= $this->render('//layouts/_after_header') ?>
 
-    <div class="container">
-        <?php if (Yii::$app->themeManager->hasWidget('Flashes')) : ?>
-            <?= Yii::$app->themeManager->widget('Flashes') ?>
-        <?php endif ?>
-        <?= Yii::$app->themeManager->widget([
-            'class' => 'Breadcrumbs',
-            'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
-        ]) ?>
-        <?= $content ?>
-    </div>
+    <?= $this->render('//layouts/_content', compact('content')) ?>
 </div>
 
-<footer class="footer">
-    <div class="container">
-        <p class="pull-left">
-            &copy; <?= Yii::$app->themeManager->widget('CopyrightYears') ?> <?= Yii::$app->themeManager->widget('OrganizationLink') ?>
-            <?= Yii::t('hiqdev/themes/original', 'All rights reserved.') ?>
-        <p class="pull-right"><?= Yii::powered() ?></p>
-    </div>
-</footer>
+<?= $this->render('//layouts/_footer') ?>
+<?= $this->render('//layouts/_after_footer') ?>
 
 <?php $this->endBody() ?>
 </body>