Skip to content

Commit 004c1f0

Browse files
fix user menu dropdown and fullscreen shortcut
1 parent d912d7e commit 004c1f0

3 files changed

Lines changed: 19 additions & 22 deletions

File tree

sources/src/main/resources/web/templates/dynamical/static/js/dynamical.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ zk.afterMount(function () {
44
var skin = $("meta[name=skin]");
55
$("body").attr("class", skin[0].content + " layout-fixed sidebar-expand-lg sidebar-mini bg-body-tertiary sidebar-open");
66

7-
console.log("starting template");
8-
97
setTimeout(function () {
108
zWatch.fireDown("onSize", '');
119
}, 500)

sources/src/main/resources/web/templates/dynamical/views/index.zul

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,20 +29,21 @@
2929
<?meta name="build" content="${applicationInfo.build}"?>
3030
<?meta name="skin" content="${appTemplate.skin.id}"?>
3131

32-
<?link href="${contextPath}/static/css/adminlte.min.css?v=5.1.0" rel="stylesheet" type="text/css"?>
33-
<?link href="${contextPath}/static/css/skins/dynamical-${appTemplate.skin.id}.css?v=5.1.0" rel="stylesheet" type="text/css"?>
34-
<?link href="${contextPath}/static/css/dynamical.css?v=5.1.0" rel="stylesheet" type="text/css"?>
35-
<?link href="${contextPath}/static/css/dynamical-mobile.css?v=5.1.0" rel="stylesheet" type="text/css"?>
32+
<?link href="${contextPath}/static/css/adminlte.min.css?v=5.1.3" rel="stylesheet" type="text/css"?>
33+
<?link href="${contextPath}/static/css/skins/dynamical-${appTemplate.skin.id}.css?v=5.1.3" rel="stylesheet" type="text/css"?>
34+
<?link href="${contextPath}/static/css/dynamical.css?v=5.1.3" rel="stylesheet" type="text/css"?>
35+
<?link href="${contextPath}/static/css/dynamical-mobile.css?v=5.1.3" rel="stylesheet" type="text/css"?>
3636
<?link href="${contextPath}/static/fonts/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css"?>
3737

3838
<?link rel="shortcut icon" href="${contextPath}/static/favicon.ico"?>
3939
<?link rel="apple-touch-icon" sizes="180x180" href="${contextPath}/static/apple-touch-icon.png"?>
4040
<?link rel="icon" type="image/png" sizes="32x32" href="${contextPath}/static/favicon-32x32.png"?>
4141
<?link rel="icon" type="image/png" sizes="16x16" href="${contextPath}/static/favicon-16x16.png"?>
4242

43-
<?script src="${contextPath}/static/js/bootstrap.min.js?v=5.1.0"?>
44-
<?script src="${contextPath}/static/js/adminlte.min.js?v=5.1.0"?>
45-
<?script src="${contextPath}/static/js/dynamical.js?v=5.1.0"?>
43+
<?script src="${contextPath}/static/js/popper.min.js?v=5.1.3"?>
44+
<?script src="${contextPath}/static/js/bootstrap.min.js?v=5.1.3"?>
45+
<?script src="${contextPath}/static/js/adminlte.min.js?v=5.1.3"?>
46+
<?script src="${contextPath}/static/js/dynamical.js?v=5.1.3"?>
4647

4748

4849
<zk>

sources/src/main/resources/zk/dynamical/index-main.zul

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,36 +37,34 @@
3737

3838

3939
<li class="nav-item">
40-
<a class="nav-link" data-widget="fullscreen" href="#" role="button">
41-
<i class="fas fa-expand-arrows-alt"/>
40+
<a class="nav-link" data-lte-toggle="fullscreen" href="#">
41+
<i class="fas fa-expand-arrows-alt" data-lte-icon="maximize"/>
42+
<i class="fas fa-compress-arrows-alt" data-lte-icon="minimize" style="display: none"/>
4243
</a>
4344
</li>
4445

4546
<z:zk if="${userInfo.enabled}">
46-
47-
48-
<li class="nav-item dropdown user user-menu">
49-
<a href="#" class="nav-link dropdown-toggle" role="button" data-toggle="dropdown"
50-
aria-haspopup="true" aria-expanded="false">
51-
<img src="${userInfo.image}" class="user-image"/>
52-
<span class="hidden-xs">${userInfo.fullName}</span>
47+
<li class="nav-item dropdown user-menu">
48+
<a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown">
49+
<img src="${userInfo.image}" class="user-image shadow"/>
50+
<span class="d-none d-md-inline">${userInfo.fullName}</span>
5351
</a>
54-
<ul class="dropdown-menu dropdown-menu-lg dropdown-menu-right">
52+
<ul class="dropdown-menu dropdown-menu-lg dropdown-menu-end">
5553
<!-- User image -->
5654
<li class="user-header">
57-
<img src="${userInfo.image}" alt="User" class="img-circle"/>
55+
<img src="${userInfo.image}" alt="User" class="rounded-circle shadow"/>
5856
<p>${userInfo.fullName}
5957
<small>
6058
${labels.memberSince}
61-
${usuarioInfo.date}
59+
${userInfo.date}
6260
</small>
6361
</p>
6462
</li>
6563

6664
<!-- Menu Footer-->
6765
<li class="user-footer">
6866
<div class="pull-left">
69-
<z:a zclass="btn btn-success btn-flat" label=" ${labels.profile}"
67+
<z:a zclass="btn btn-primary btn-flat" label=" ${labels.profile}"
7068
iconSclass="fa fa-user"
7169
onClick='navManager.navigateTo(userInfo.profilePath)'/>
7270

0 commit comments

Comments
 (0)