Skip to content

Commit

Permalink
Merge pull request #15 from yarcode/olleg-dev
Browse files Browse the repository at this point in the history
Fix small bugs
  • Loading branch information
Alexey Samoylov authored Jul 26, 2017
2 parents 1f1d06f + 6c53001 commit 27fa2ee
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
6 changes: 3 additions & 3 deletions backend/views/layouts/left.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@
</form>
<!-- /.search form -->

<?= \yii\widgets\Menu::widget(
<?= \dmstr\widgets\Menu::widget(
[
'options' => ['class' => 'sidebar-menu'],
'items' => [
['label' => 'Main Menu', 'options' => ['class' => 'header']],
['label' => 'Home', 'icon' => 'fa fa-home', 'url' => ['/site/index']],
['label' => 'Change Password', 'icon' => 'fa fa-lock', 'url' => ['/profile/change-password']],
['label' => 'Home', 'icon' => 'home', 'url' => ['/site/index']],
['label' => 'Change Password', 'icon' => 'lock', 'url' => ['/profile/change-password']],
],
]
) ?>
Expand Down
4 changes: 2 additions & 2 deletions backend/views/site/login.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<div class="login-box">
<div class="login-logo">
<a href="#"><b>YarCode</b>App</a>
<a href="#"><?= Yii::$app->name ?></a>
</div>

<div class="login-box-body">
Expand All @@ -33,7 +33,7 @@
<?= $form
->field($model, 'accountName', $fieldOptions1)
->label(false)
->textInput(['placeholder' => $model->getAttributeLabel('username')]) ?>
->textInput(['placeholder' => $model->getAttributeLabel('accountName')]) ?>

<?= $form
->field($model, 'password', $fieldOptions2)
Expand Down
1 change: 1 addition & 0 deletions common/config/main.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?php
return [
'name' => 'YarCode',
'aliases' => [
'@bower' => '@vendor/bower-asset',
'@npm' => '@vendor/npm-asset',
Expand Down

0 comments on commit 27fa2ee

Please sign in to comment.