diff --git a/src/controllers/RbacController.php b/src/controllers/RbacController.php index 5910928..b33012f 100644 --- a/src/controllers/RbacController.php +++ b/src/controllers/RbacController.php @@ -134,7 +134,7 @@ private function renderRoles() foreach ($_gs as $groupName => $g) { $groupMmd = implode("\n", $g); - if ($groupName != '__NONE__') { + if ($groupName !== '__NONE__') { $rolesMmd .= $this->renderAsSubgraph($groupName, $groupMmd); } else { $rolesMmd .= $groupMmd; @@ -148,7 +148,9 @@ private function renderRoles() private function renderAssignments($item) { - if (in_array($item->name, $this->module->rbacDiagramExcludeRoles)) return; + if (in_array($item->name, $this->module->rbacDiagramExcludeRoles, true)) { + return; + } $assignmentsMmd = ''; foreach ($this->_manager->getChildren($item->name) as $child) { diff --git a/src/views/config/_controller.php b/src/views/config/_controller.php index 5b13379..041b8ee 100644 --- a/src/views/config/_controller.php +++ b/src/views/config/_controller.php @@ -29,7 +29,6 @@
'; } ?> @@ -38,6 +37,8 @@
- Unable to detect controllers for + {moduleName}', [ + 'moduleName' => $model['name'] + ])?>
diff --git a/src/views/config/view.php b/src/views/config/view.php index f503d52..302d4ab 100644 --- a/src/views/config/view.php +++ b/src/views/config/view.php @@ -1,5 +1,13 @@ params['breadcrumbs'][] = ['label' => Yii::t('backend-module', 'Dashboard')]; $this->title = Yii::t('backend-module', 'Dashboard'); ?> @@ -25,7 +32,7 @@
- + @@ -54,7 +61,7 @@
- + @@ -76,7 +83,7 @@
- + @@ -99,7 +106,7 @@
- + @@ -120,7 +127,7 @@
- + @@ -142,7 +149,7 @@
- + @@ -164,7 +171,7 @@
- + diff --git a/src/views/layouts/_sidebar.php b/src/views/layouts/_sidebar.php index 9c6034a..41ed883 100644 --- a/src/views/layouts/_sidebar.php +++ b/src/views/layouts/_sidebar.php @@ -17,13 +17,12 @@ ['class' => 'sidebar-menu tree', 'data-widget' => 'tree'], 'encodeLabels' => false, 'items' => ArrayHelper::merge( - ['items' => ['label' => 'Backend navigation', 'options' => ['class' => 'header']]], + ['items' => ['label' => Yii::t('backend-module', 'Backend navigation') , 'options' => ['class' => 'header']]], $menuItems ), ] diff --git a/src/views/layouts/box.php b/src/views/layouts/box.php index 8bd607e..1ec8ec8 100644 --- a/src/views/layouts/box.php +++ b/src/views/layouts/box.php @@ -6,6 +6,8 @@ * * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. + * + * @var string $content */ ?> @@ -13,9 +15,7 @@
- -
diff --git a/src/views/layouts/main.php b/src/views/layouts/main.php index 9f2b429..1626b87 100644 --- a/src/views/layouts/main.php +++ b/src/views/layouts/main.php @@ -130,7 +130,7 @@
- @@ -186,12 +186,12 @@ @@ -259,12 +259,11 @@ class="btn btn-default btn-flat" data-method="post">Sign out blocks['extra-content'] ?> - + render('_control-sidebar') ?> diff --git a/src/widgets/views/modal.twig b/src/widgets/views/modal.twig index 6bcfe45..01b5965 100644 --- a/src/widgets/views/modal.twig +++ b/src/widgets/views/modal.twig @@ -15,7 +15,7 @@ {{ Html.a( FA.icon(FA._ARROW_CIRCLE_LEFT), - Url.to(['/backend']), + Url.to(['/backend/default/index']), { 'target': app.params['backend.iframe.name'], 'class': 'btn btn-xs btn-default btn-primary',