Skip to content

Commit 86012e8

Browse files
marioserrano09marioserrano09
authored
Merge pull request #5 from dynamiatools/5.1.x
v5.1.3
2 parents 06e65e6 + 004c1f0 commit 86012e8

6 files changed

Lines changed: 30 additions & 33 deletions

File tree

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ This template is based on https://adminlte.io/ free (MIT) admin template. Which
2626
<dependency>
2727
<groupId>tools.dynamia.themes</groupId>
2828
<artifactId>tools.dynamia.themes.dynamical</artifactId>
29-
<version>5.1.2</version>
29+
<version>5.1.3</version>
3030
</dependency>
3131
```
3232

3333
**Gradle**
3434
```groovy
35-
compile 'tools.dynamia.themes:tools.dynamia.themes.dynamical:5.1.2'
35+
compile 'tools.dynamia.themes:tools.dynamia.themes.dynamical:5.1.3'
3636
```
3737

3838
Edit Spring Boot properties ```application.properties```

‎sources/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
<groupId>tools.dynamia.themes</groupId>
2525
<artifactId>tools.dynamia.themes.dynamical</artifactId>
26-
<version>5.1.2</version>
26+
<version>5.1.3</version>
2727
<name>Themes - ZK Dynamical</name>
2828
<url>https://www.dynamia.tools/themes/dynamical</url>
2929
<description>Boostrap theme for DynamiaTools apps</description>
@@ -56,7 +56,7 @@
5656
</scm>
5757

5858
<properties>
59-
<dynamiatools.version>5.1.2</dynamiatools.version>
59+
<dynamiatools.version>5.1.3</dynamiatools.version>
6060
<java.version>17</java.version>
6161
<maven.compiler>3.13.0</maven.compiler>
6262
<source.encoding>UTF-8</source.encoding>

‎sources/src/main/java/tools/dynamia/themes/dynamical/DynamicalTemplate.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@
1818

1919
package tools.dynamia.themes.dynamical;
2020

21-
import org.springframework.beans.factory.annotation.Autowired;
2221
import org.zkoss.lang.Library;
2322
import org.zkoss.zul.Messagebox;
24-
import tools.dynamia.templates.ApplicationTemplateSkin;
23+
import tools.dynamia.commons.MapBuilder;
2524
import tools.dynamia.templates.ApplicationTemplate;
25+
import tools.dynamia.templates.ApplicationTemplateSkin;
2626
import tools.dynamia.templates.InstallApplicationTemplate;
27-
import tools.dynamia.commons.MapBuilder;
2827
import tools.dynamia.viewers.ViewTypeFactory;
2928
import tools.dynamia.zk.viewers.BootstrapConfigViewRender;
3029
import tools.dynamia.zk.viewers.BootstrapCrudViewRenderer;
@@ -48,19 +47,20 @@ public class DynamicalTemplate implements ApplicationTemplate {
4847

4948
private static final ApplicationTemplateSkin DEFAULT_APPLICATION_SKIN = newSkin("Blue", "Default blue skin", "#367fa9");
5049

51-
@Autowired
52-
private ViewTypeFactory viewTypeFactory;
50+
51+
private final ViewTypeFactory viewTypeFactory;
5352

5453

5554
private List<ApplicationTemplateSkin> applicationTemplateSkins = new ArrayList<>();
5655

5756
private Map<String, Object> properties;
5857

59-
public DynamicalTemplate() {
58+
public DynamicalTemplate(ViewTypeFactory viewTypeFactory) {
59+
this.viewTypeFactory = viewTypeFactory;
6060
createSkins();
6161

6262
properties = MapBuilder.put(AUTHOR, "Mario Serrano", DATE, "2017", COPYRIGHT, "Dynamia Soluciones IT 2017",
63-
VERSION, "4.1.0", ORIGINAL_AUTHOR, "Almsaeed Studio");
63+
VERSION, "5.1.3", ORIGINAL_AUTHOR, "Almsaeed Studio");
6464

6565
}
6666

‎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)