Commit 37a53aa1dc004bdaaad077eae1faa415d07fc163
1 parent
b4cb8579
Yarik
Showing
3 changed files
with
44 additions
and
66 deletions
Show diff stats
frontend/views/layouts/main.php
| @@ -35,23 +35,22 @@ AppAsset::register($this); | @@ -35,23 +35,22 @@ AppAsset::register($this); | ||
| 35 | ], | 35 | ], |
| 36 | ]); | 36 | ]); |
| 37 | $menuItems = [ | 37 | $menuItems = [ |
| 38 | - ['label' => 'Home', 'url' => ['/site/index']], | ||
| 39 | - ['label' => 'About', 'url' => ['/site/about']], | ||
| 40 | - ['label' => 'Contact', 'url' => ['/site/contact']], | 38 | + ['label' => 'Головна', 'url' => ['/site/index']], |
| 39 | + ['label' => 'Карта', 'url' => ['/map']], | ||
| 41 | ]; | 40 | ]; |
| 42 | - if (Yii::$app->user->isGuest) { | ||
| 43 | - $menuItems[] = ['label' => 'Signup', 'url' => ['/site/signup']]; | ||
| 44 | - $menuItems[] = ['label' => 'Login', 'url' => ['/site/login']]; | ||
| 45 | - } else { | ||
| 46 | - $menuItems[] = '<li>' | ||
| 47 | - . Html::beginForm(['/site/logout'], 'post') | ||
| 48 | - . Html::submitButton( | ||
| 49 | - 'Logout (' . Yii::$app->user->identity->username . ')', | ||
| 50 | - ['class' => 'btn btn-link'] | ||
| 51 | - ) | ||
| 52 | - . Html::endForm() | ||
| 53 | - . '</li>'; | ||
| 54 | - } | 41 | +// if (Yii::$app->user->isGuest) { |
| 42 | +// $menuItems[] = ['label' => 'Signup', 'url' => ['/site/signup']]; | ||
| 43 | +// $menuItems[] = ['label' => 'Login', 'url' => ['/site/login']]; | ||
| 44 | +// } else { | ||
| 45 | +// $menuItems[] = '<li>' | ||
| 46 | +// . Html::beginForm(['/site/logout'], 'post') | ||
| 47 | +// . Html::submitButton( | ||
| 48 | +// 'Logout (' . Yii::$app->user->identity->username . ')', | ||
| 49 | +// ['class' => 'btn btn-link'] | ||
| 50 | +// ) | ||
| 51 | +// . Html::endForm() | ||
| 52 | +// . '</li>'; | ||
| 53 | +// } | ||
| 55 | echo Nav::widget([ | 54 | echo Nav::widget([ |
| 56 | 'options' => ['class' => 'navbar-nav navbar-right'], | 55 | 'options' => ['class' => 'navbar-nav navbar-right'], |
| 57 | 'items' => $menuItems, | 56 | 'items' => $menuItems, |
frontend/views/site/index.php
| @@ -3,62 +3,38 @@ | @@ -3,62 +3,38 @@ | ||
| 3 | /* @var $this yii\web\View */ | 3 | /* @var $this yii\web\View */ |
| 4 | 4 | ||
| 5 | use common\models\GoogleRoad; | 5 | use common\models\GoogleRoad; |
| 6 | + use yii\bootstrap\Html; | ||
| 6 | 7 | ||
| 7 | $this->title = 'My Yii Application'; | 8 | $this->title = 'My Yii Application'; |
| 8 | $this->registerJsFile('/js/test.js'); | 9 | $this->registerJsFile('/js/test.js'); |
| 9 | ?> | 10 | ?> |
| 10 | <div class="site-index"> | 11 | <div class="site-index"> |
| 11 | - | ||
| 12 | - <div class="jumbotron"> | ||
| 13 | - <h1>Congratulations!</h1> | ||
| 14 | - | ||
| 15 | - <p class="lead">You have successfully created your Yii-powered application.</p> | ||
| 16 | - | ||
| 17 | - <p> | ||
| 18 | - <a class="btn btn-lg btn-success" href="http://www.yiiframework.com">Get started with Yii</a> | ||
| 19 | - </p> | ||
| 20 | - </div> | ||
| 21 | - | ||
| 22 | - <div class="body-content"> | ||
| 23 | - | ||
| 24 | - <div class="row"> | ||
| 25 | - <div class="col-lg-4"> | ||
| 26 | - <h2>Heading</h2> | ||
| 27 | - | ||
| 28 | - <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et | ||
| 29 | - dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip | ||
| 30 | - ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu | ||
| 31 | - fugiat nulla pariatur.</p> | ||
| 32 | - | ||
| 33 | - <p> | ||
| 34 | - <a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation »</a> | ||
| 35 | - </p> | ||
| 36 | - </div> | ||
| 37 | - <div class="col-lg-4"> | ||
| 38 | - <h2>Heading</h2> | ||
| 39 | - | ||
| 40 | - <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et | ||
| 41 | - dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip | ||
| 42 | - ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu | ||
| 43 | - fugiat nulla pariatur.</p> | ||
| 44 | - | ||
| 45 | - <p> | ||
| 46 | - <a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum »</a> | ||
| 47 | - </p> | ||
| 48 | - </div> | ||
| 49 | - <div class="col-lg-4"> | ||
| 50 | - <h2>Heading</h2> | ||
| 51 | - | ||
| 52 | - <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et | ||
| 53 | - dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip | ||
| 54 | - ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu | ||
| 55 | - fugiat nulla pariatur.</p> | ||
| 56 | - | ||
| 57 | - <p> | ||
| 58 | - <a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions »</a> | ||
| 59 | - </p> | 12 | + <div class="list-group"> |
| 13 | + <a href="#statements-menu" data-toggle="collapse" class="list-group-item" aria-controls="statements-menu"> | ||
| 14 | + Відомості | ||
| 15 | + </a> | ||
| 16 | + <div class="collapse" id="statements-menu"> | ||
| 17 | + <div class="well well-sm well-nm"> | ||
| 18 | + <ul class="list-unstyled"> | ||
| 19 | + <?php | ||
| 20 | + echo Html::a(Html::tag('li', 'Автомобільні дороги'), ['/statement']); | ||
| 21 | + echo Html::a(Html::tag('li', 'Обслуговування'), ['/road-service']); | ||
| 22 | + echo Html::a(Html::tag('li', 'Прив\'язки населених пунктів'), ['/settlement-address-link']); | ||
| 23 | + echo Html::a(Html::tag('li', 'Інтенсивності'), ['/flow-intensity']); | ||
| 24 | + echo Html::a(Html::tag('li', 'Категорія доріг'), ['/road-to-category']); | ||
| 25 | + echo Html::a(Html::tag('li', 'З\'їзди'), ['/cross-section']); | ||
| 26 | + echo Html::a(Html::tag('li', 'Ширина проїзних частин'), ['/road-width']); | ||
| 27 | + echo Html::a(Html::tag('li', 'Покриття доріг'), ['/road-surface']); | ||
| 28 | + echo Html::a(Html::tag('li', 'Об\'єкти сервісу'), ['/service-object']); | ||
| 29 | + echo Html::a(Html::tag('li', 'Автобусні зупинки'), ['/bus-stop']); | ||
| 30 | + ?> | ||
| 31 | + </ul> | ||
| 60 | </div> | 32 | </div> |
| 61 | </div> | 33 | </div> |
| 62 | - | 34 | + <?php |
| 35 | + echo Html::a('Список доріг', ['/road'], ['class' => 'list-group-item']); | ||
| 36 | + echo Html::a('Список паспортів доріг', ['/road-passport'], ['class' => 'list-group-item']); | ||
| 37 | + echo Html::a('Редагування маршрутів (карта)', ['/map'], ['class' => 'list-group-item']); | ||
| 38 | + ?> | ||
| 63 | </div> | 39 | </div> |
| 64 | </div> | 40 | </div> |
frontend/web/css/site.css
| @@ -134,4 +134,7 @@ a.desc:after { | @@ -134,4 +134,7 @@ a.desc:after { | ||
| 134 | } | 134 | } |
| 135 | .statement-table th { | 135 | .statement-table th { |
| 136 | text-align: center; | 136 | text-align: center; |
| 137 | +} | ||
| 138 | +.well-nm { | ||
| 139 | + margin-bottom: 0; | ||
| 137 | } | 140 | } |
| 138 | \ No newline at end of file | 141 | \ No newline at end of file |