Merge pull request yiisoft#1912 from johonunu/1822-sticky-futter

Added sticky futter. Fixes yiisoft#1822
switchy · Jan 11, 2014 · 8496b21 · 8496b21
2 parents 442393d + 98e9f30
commit 8496b21
Show file tree

Hide file tree

Showing 6 changed files with 142 additions and 99 deletions.
diff --git a/apps/advanced/backend/views/layouts/main.php b/apps/advanced/backend/views/layouts/main.php
@@ -22,34 +22,36 @@
 </head>
 <body>
  <?php $this->beginBody() ?>
- <?php
- NavBar::begin([
- 'brandLabel' => 'My Company',
- 'brandUrl' => Yii::$app->homeUrl,
- 'options' => [
- 'class' => 'navbar-inverse navbar-fixed-top',
- ],
- ]);
- $menuItems = [
- ['label' => 'Home', 'url' => ['/site/index']],
- ];
- if (Yii::$app->user->isGuest) {
- $menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
- } else {
- $menuItems[] = ['label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => ['/site/logout']];
- }
- echo Nav::widget([
- 'options' => ['class' => 'navbar-nav navbar-right'],
- 'items' => $menuItems,
- ]);
- NavBar::end();
- ?>
+ <div class="wrap">
+ <?php
+ NavBar::begin([
+ 'brandLabel' => 'My Company',
+ 'brandUrl' => Yii::$app->homeUrl,
+ 'options' => [
+ 'class' => 'navbar-inverse navbar-fixed-top',
+ ],
+ ]);
+ $menuItems = [
+ ['label' => 'Home', 'url' => ['/site/index']],
+ ];
+ if (Yii::$app->user->isGuest) {
+ $menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
+ } else {
+ $menuItems[] = ['label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => ['/site/logout']];
+ }
+ echo Nav::widget([
+ 'options' => ['class' => 'navbar-nav navbar-right'],
+ 'items' => $menuItems,
+ ]);
+ NavBar::end();
+ ?>
 
- <div class="container">
- <?= Breadcrumbs::widget([
- 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
- ]) ?>
- <?= $content ?>
+ <div class="container">
+ <?= Breadcrumbs::widget([
+ 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+ ]) ?>
+ <?= $content ?>
+ </div>
  </div>
 
  <footer class="footer">

diff --git a/apps/advanced/backend/web/css/site.css b/apps/advanced/backend/web/css/site.css
@@ -1,12 +1,24 @@
+html,
 body {
- padding-top: 70px;
+ height: 100%;
+}
+
+.wrap {
+ min-height: 100%;
+ height: auto;
+ margin: 0 auto -60px;
+ padding: 0 0 60px;
+}
+
+.wrap > .container {
+ padding: 70px 15px 20px;
 }
 
 .footer {
+ height: 60px;
+ background-color: #f5f5f5;
  border-top: 1px solid #ddd;
- margin-top: 30px;
- padding-top: 15px;
- padding-bottom: 30px;
+ padding-top: 20px;
 }
 
 .jumbotron {

diff --git a/apps/advanced/frontend/views/layouts/main.php b/apps/advanced/frontend/views/layouts/main.php
@@ -23,40 +23,42 @@
 </head>
 <body>
  <?php $this->beginBody() ?>
- <?php
- NavBar::begin([
- 'brandLabel' => 'My Company',
- 'brandUrl' => Yii::$app->homeUrl,
- 'options' => [
- 'class' => 'navbar-inverse navbar-fixed-top',
- ],
- ]);
- $menuItems = [
- ['label' => 'Home', 'url' => ['/site/index']],
- ['label' => 'About', 'url' => ['/site/about']],
- ['label' => 'Contact', 'url' => ['/site/contact']],
- ];
- if (Yii::$app->user->isGuest) {
- $menuItems[] = ['label' => 'Signup', 'url' => ['/site/signup']];
- $menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
- } else {
- $menuItems[] = ['label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => ['/site/logout']];
- }
- echo Nav::widget([
- 'options' => ['class' => 'navbar-nav navbar-right'],
- 'items' => $menuItems,
- ]);
- NavBar::end();
- ?>
+ <div class="wrap">
+ <?php
+ NavBar::begin([
+ 'brandLabel' => 'My Company',
+ 'brandUrl' => Yii::$app->homeUrl,
+ 'options' => [
+ 'class' => 'navbar-inverse navbar-fixed-top',
+ ],
+ ]);
+ $menuItems = [
+ ['label' => 'Home', 'url' => ['/site/index']],
+ ['label' => 'About', 'url' => ['/site/about']],
+ ['label' => 'Contact', 'url' => ['/site/contact']],
+ ];
+ if (Yii::$app->user->isGuest) {
+ $menuItems[] = ['label' => 'Signup', 'url' => ['/site/signup']];
+ $menuItems[] = ['label' => 'Login', 'url' => ['/site/login']];
+ } else {
+ $menuItems[] = ['label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => ['/site/logout']];
+ }
+ echo Nav::widget([
+ 'options' => ['class' => 'navbar-nav navbar-right'],
+ 'items' => $menuItems,
+ ]);
+ NavBar::end();
+ ?>
 
- <div class="container">
- <?= Breadcrumbs::widget([
- 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
- ]) ?>
- <?= Alert::widget() ?>
- <?= $content ?>
+ <div class="container">
+ <?= Breadcrumbs::widget([
+ 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+ ]) ?>
+ <?= Alert::widget() ?>
+ <?= $content ?>
+ </div>
  </div>
-
+ 
  <footer class="footer">
  <div class="container">
  <p class="pull-left">&copy; My Company <?= date('Y') ?></p>

diff --git a/apps/advanced/frontend/web/css/site.css b/apps/advanced/frontend/web/css/site.css
@@ -1,12 +1,24 @@
+html,
 body {
- padding-top: 70px;
+ height: 100%;
+}
+
+.wrap {
+ min-height: 100%;
+ height: auto;
+ margin: 0 auto -60px;
+ padding: 0 0 60px;
+}
+
+.wrap > .container {
+ padding: 70px 15px 20px;
 }
 
 .footer {
+ height: 60px;
+ background-color: #f5f5f5;
  border-top: 1px solid #ddd;
- margin-top: 30px;
- padding-top: 15px;
- padding-bottom: 30px;
+ padding-top: 20px;
 }
 
 .jumbotron {

diff --git a/apps/basic/views/layouts/main.php b/apps/basic/views/layouts/main.php
@@ -21,36 +21,39 @@
  <?php $this->head() ?>
 </head>
 <body>
+
 <?php $this->beginBody() ?>
- <?php
- NavBar::begin([
- 'brandLabel' => '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();
- ?>
+ <div class="wrap">
+ <?php
+ NavBar::begin([
+ 'brandLabel' => '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();
+ ?>
 
- <div class="container">
- <?= Breadcrumbs::widget([
- 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
- ]) ?>
- <?= $content ?>
+ <div class="container">
+ <?= Breadcrumbs::widget([
+ 'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : [],
+ ]) ?>
+ <?= $content ?>
+ </div>
  </div>
 
  <footer class="footer">

diff --git a/apps/basic/web/css/site.css b/apps/basic/web/css/site.css
@@ -1,12 +1,24 @@
+html,
 body {
- padding-top: 70px;
+ height: 100%;
+}
+
+.wrap {
+ min-height: 100%;
+ height: auto;
+ margin: 0 auto -60px;
+ padding: 0 0 60px;
+}
+
+.wrap > .container {
+ padding: 70px 15px 20px;
 }
 
 .footer {
+ height: 60px;
+ background-color: #f5f5f5;
  border-top: 1px solid #ddd;
- margin-top: 30px;
- padding-top: 15px;
- padding-bottom: 30px;
+ padding-top: 20px;
 }
 
 .jumbotron {