diff --git a/console/migrations/m161229_140924_add_regexp_column_to_user_table.php b/console/migrations/m161229_140924_add_regexp_column_to_user_table.php new file mode 100644 index 0000000..7013447 --- /dev/null +++ b/console/migrations/m161229_140924_add_regexp_column_to_user_table.php @@ -0,0 +1,27 @@ +addColumn('user', 'regexp', $this->string(255)); + $this->addColumn('user', 'name', $this->string(255)); + } + + /** + * @inheritdoc + */ + public function down() + { + $this->dropColumn('user', 'regexp'); + $this->dropColumn('user', 'name'); + } +} diff --git a/frontend/controllers/CabinetController.php b/frontend/controllers/CabinetController.php index b7ab8e2..8fcbe26 100755 --- a/frontend/controllers/CabinetController.php +++ b/frontend/controllers/CabinetController.php @@ -64,11 +64,11 @@ } $table = IntellectualProperty::find() - ->where( - [ - 'user_id' => \Yii::$app->user->identity->id, - ] - ) +// ->where( +// [ +// 'user_id' => \Yii::$app->user->identity->id, +// ] +// ) ->all(); return $this->render( @@ -128,11 +128,11 @@ public function actionList() { $table = IntellectualProperty::find() - ->where( - [ - 'user_id' => \Yii::$app->user->identity->id, - ] - ) +// ->where( +// [ +// 'user_id' => \Yii::$app->user->identity->id, +// ] +// ) ->all(); return $this->render( 'list', diff --git a/frontend/views/layouts/cabinet.php b/frontend/views/layouts/cabinet.php index c05f9f1..ab9cb66 100755 --- a/frontend/views/layouts/cabinet.php +++ b/frontend/views/layouts/cabinet.php @@ -71,7 +71,7 @@ EOT; 23
- Дмитро (фізична особа) + user->identity->name?>
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index e146a37..7e737ba 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -46,6 +46,15 @@ ul.main_menu li a:hover {text-decoration: underline;} .login-wrapp { float: right; } +.btn-logout { + float: left; + display: block; + margin-top: 30px; + font-family: Ubuntu; + color: #02a1ee; + font-weight: 700; + +} .btn_login { margin-top: 23px; float: right; -- libgit2 0.21.4