Skip to content

Commit 85913d4

Browse files
author
Anton
authored
Merge 0a0b70d into db26895 
2 parents db26895 + 0a0b70d commit 85913d4

29 files changed

+660
-585
lines changed

‎application/layouts/partial/navbar.phtml‎

Lines changed: 74 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,76 @@
1-
<?php /** @var \Bluz\Layout\Layout $this */ ?>
1+
<?php
2+
/** @var \Bluz\Layout\Layout $this */ ?>
23
<nav class="navbar navbar-expand-md navbar-dark bg-dark sticky-top">
3-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#sidebar"
4-
aria-controls="sidebar" aria-expanded="false" aria-label="Toggle sidebar">
5-
<span class="navbar-toggler-icon"></span>
6-
</button>
7-
<a class="navbar-brand" href="/">
8-
<img src="/img/favicon-32x32.png" width="32" height="32" class="d-inline-block align-top" alt="">
9-
<?= __('Bluz') ?>
10-
</a>
11-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar"
12-
aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
13-
<span class="navbar-toggler-icon"></span>
14-
</button>
15-
<div class="collapse navbar-collapse" id="navbar">
16-
<ul role="menu" class="navbar-nav mr-auto">
17-
<li role="menuitem" class="nav-item <?= ($this->module('index') ? 'active' : '') ?>">
18-
<?= $this->ahref(
19-
'Home',
20-
['index', 'index'],
21-
['class' => 'nav-link']
22-
) ?>
23-
</li>
24-
<?php if (\Bluz\Proxy\Acl::isAllowed('dashboard', 'Dashboard')) : ?>
25-
<li role="menuitem" class="nav-item <?= ($this->module('dashboard') ? 'active' : '') ?>">
26-
<?= $this->ahref(
27-
'Dashboard',
28-
['dashboard', 'index', [], true],
29-
['class' => 'nav-link']
30-
) ?>
31-
</li>
32-
<?php endif; ?>
33-
<?php if ($this->hasModule('contact-us')) : ?>
34-
<li role="menuitem" class="nav-item <?= ($this->module('contact-us') ? 'active' : '') ?>">
35-
<?= $this->ahref(
36-
'Contact Us',
37-
['contact-us', 'index'],
38-
['class' => 'nav-link']
39-
) ?>
40-
</li>
41-
<?php endif; ?>
42-
<?php if ($this->hasModule('test')) : ?>
43-
<li role="menuitem" class="nav-item <?= ($this->module('test') ? 'active' : '') ?>">
44-
<?= $this->ahref(
45-
'Test',
46-
['test', 'index'],
47-
['class' => 'nav-link']
48-
) ?>
49-
</li>
50-
<?php endif; ?>
51-
</ul>
52-
<div id="loading" data-ajax-loading></div>
53-
<span class="navbar-text">
54-
<?php if ($identity = $this->user()) : ?>
55-
<?= __('Logged in as %s', $this->ahref($identity->login, ['users', 'profile'])) ?>
56-
(<?= $this->ahref(__('Sign Out'), ['users', 'signout']) ?>)
57-
<?php else: ?>
58-
<?= $this->ahref(__('Sign In'), ['users', 'signin'], ['data-ajax-dialog', 'data-ajax-method' => 'get']) ?>
59-
<?php endif; ?>
60-
</span>
61-
</div>
4+
<div class="container-fluid">
5+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#sidebar"
6+
aria-controls="sidebar" aria-expanded="false" aria-label="Toggle sidebar">
7+
<span class="navbar-toggler-icon"></span>
8+
</button>
9+
10+
<a class="navbar-brand" href="/">
11+
<img src="/img/favicon-32x32.png" width="32" height="32" class="d-inline-block align-top" alt="">
12+
<?= __('Bluz') ?>
13+
</a>
14+
15+
<div class="collapse navbar-collapse" id="navbar">
16+
<ul role="menu" class="navbar-nav mr-auto mb-2 mb-lg-0">
17+
<li role="menuitem" class="nav-item <?= ($this->module('index') ? 'active' : '') ?>">
18+
<?= $this->ahref(
19+
'Home',
20+
['index', 'index'],
21+
['class' => 'nav-link']
22+
) ?>
23+
</li>
24+
<?php
25+
if (\Bluz\Proxy\Acl::isAllowed('dashboard', 'Dashboard')) : ?>
26+
<li role="menuitem" class="nav-item <?= ($this->module('dashboard') ? 'active' : '') ?>">
27+
<?= $this->ahref(
28+
'Dashboard',
29+
['dashboard', 'index', [], true],
30+
['class' => 'nav-link']
31+
) ?>
32+
</li>
33+
<?php
34+
endif; ?>
35+
<?php
36+
if ($this->hasModule('contact-us')) : ?>
37+
<li role="menuitem" class="nav-item <?= ($this->module('contact-us') ? 'active' : '') ?>">
38+
<?= $this->ahref(
39+
'Contact Us',
40+
['contact-us', 'index'],
41+
['class' => 'nav-link']
42+
) ?>
43+
</li>
44+
<?php
45+
endif; ?>
46+
<?php
47+
if ($this->hasModule('test')) : ?>
48+
<li role="menuitem" class="nav-item <?= ($this->module('test') ? 'active' : '') ?>">
49+
<?= $this->ahref(
50+
'Test',
51+
['test', 'index'],
52+
['class' => 'nav-link']
53+
) ?>
54+
</li>
55+
<?php
56+
endif; ?>
57+
</ul>
58+
<div id="loading" data-ajax-loading></div>
59+
<span class="navbar-text">
60+
<?php
61+
if ($identity = $this->user()) : ?>
62+
<?= __('Logged in as %s', $this->ahref($identity->login, ['users', 'profile'])) ?>
63+
(<?= $this->ahref(__('Sign Out'), ['users', 'signout']) ?>)
64+
<?php
65+
else: ?>
66+
<?= $this->ahref(__('Sign In'), ['users', 'signin'], ['data-ajax-dialog', 'data-ajax-method' => 'get']) ?>
67+
<?php
68+
endif; ?>
69+
</span>
70+
</div>
71+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbar"
72+
aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
73+
<span class="navbar-toggler-icon"></span>
74+
</button>
75+
</div>
6276
</nav>

‎application/modules/acl/views/roles.phtml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<h4 class="modal-title">
88
<?= (strtoupper($method) === 'POST' ? __('Create role') : __('Edit role')) ?>
99
</h4>
10-
<button type="button" class="close" data-dismiss="modal" aria-label="<?=__('Close')?>">
11-
<span aria-hidden="true">&times;</span>
12-
</button>
10+
11+
<button type="button" class="btn-close" aria-label="Close" data-bs-dismiss="modal"></button>
12+
1313
</div>
1414
<div class="modal-body">
1515
<div class="form-group row">
@@ -22,7 +22,7 @@
2222
</div>
2323
<div class="modal-footer">
2424
<button type="submit" class="btn btn-primary"><?= __('Save') ?></button>
25-
<a href="#" class="btn btn-light" data-dismiss="modal"><?= __('Close') ?></a>
25+
<button type="button" class="btn btn-light" data-bs-dismiss="modal"><?= __('Close') ?></button>
2626
</div>
2727
</form>
2828
<?php

‎application/modules/acl/views/user.phtml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,25 @@
88
data-ajax novalidate>
99
<div class="modal-header">
1010
<h4 class="modal-title"><?= __('Choose roles for %s', $user->login) ?></h4>
11-
<button type="button" class="close" data-dismiss="modal" aria-label="<?=__('Close')?>">
12-
<span aria-hidden="true">&times;</span>
13-
</button>
11+
<button type="button" class="btn-close" aria-label="Close" data-bs-dismiss="modal"></button>
1412
</div>
1513
<div class="modal-body">
1614
<div>
1715
<?php foreach ($roles as $i => $role): ?>
18-
<div class="form-group input-group">
19-
<span class="input-group-prepend">
16+
<div class="input-group mb-1">
2017
<span class="input-group-text">
2118
<input id="i-<?= $i ?>" type="checkbox" name="roles[]" value="<?= $role->id ?>" <?= (!$user->hasRole(
2219
$role->id
2320
) ? '' : 'checked') ?>/>
2421
</span>
25-
</span>
2622
<label for="i-<?= $i ?>" class="form-control"><?= $role->name ?></label>
2723
</div>
2824
<?php endforeach; ?>
2925
</div>
3026
</div>
3127
<div class="modal-footer">
3228
<button type="submit" class="btn btn-primary"><?= __('Save') ?></button>
33-
<a href="#" class="btn btn-light" data-dismiss="modal"><?= __('Close') ?></a>
29+
30+
<button type="button" class="btn btn-light" data-bs-dismiss="modal"><?= __('Close') ?></button>
3431
</div>
3532
</form>

0 commit comments

Comments
 (0)