Skip to content

Commit cc3573b

Browse files
committed
adminlte updated to the latest version(3.0.2)
1 parent 7125d26 commit cc3573b

File tree

1,682 files changed

+17699
-24553
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,682 files changed

+17699
-24553
lines changed

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Account/_Layout.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</script>
7878
<environment names="Development">
7979
<script src="~/libs/jquery/jquery.js" asp-append-version="true"></script>
80-
<script src="~/libs/bootstrap/js/bootstrap.bundle.js" asp-append-version="true"></script>
80+
<script src="~/libs/bootstrap/dist/js/bootstrap.bundle.js" asp-append-version="true"></script>
8181
<script src="~/libs/admin-lte/dist/js/adminlte.js" asp-append-version="true"></script>
8282
<script src="~/libs/jquery-validate/jquery.validate.js" asp-append-version="true"></script>
8383
<script src="~/libs/jquery-validate/jquery.validate.unobtrusive.js" asp-append-version="true"></script>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Layout/_Layout.cshtml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
<environment names="Development">
3232
<link href="~/libs/font-awesome/css/all.min.css" rel="stylesheet" asp-append-version="true" />
3333
<link href="~/libs/flag-icon/css/flag-icon.min.css" rel="stylesheet" asp-append-version="true" />
34-
<link href="~/libs/bootstrap-select/css/bootstrap-select.css" rel="stylesheet" asp-append-version="true" />
3534
<link href="~/libs/animate.css/animate.css" rel="stylesheet" asp-append-version="true" />
3635
<link href="~/libs/icheck-bootstrap/icheck-bootstrap.css" rel="stylesheet" asp-append-version="true" />
3736
<link href="~/libs/toastr/toastr.css" rel="stylesheet" asp-append-version="true" />
@@ -68,7 +67,7 @@
6867
</script>
6968
<environment names="Development">
7069
<script src="~/libs/jquery/jquery.js" asp-append-version="true"></script>
71-
<script src="~/libs/bootstrap/js/bootstrap.bundle.js" asp-append-version="true"></script>
70+
<script src="~/libs/bootstrap/dist/js/bootstrap.bundle.js" asp-append-version="true"></script>
7271
<script src="~/libs/admin-lte/dist/js/adminlte.js" asp-append-version="true"></script>
7372
<script src="~/libs/jquery-validate/jquery.validate.js" asp-append-version="true"></script>
7473
<script src="~/libs/jquery-validate/jquery.validate.unobtrusive.js" asp-append-version="true"></script>
@@ -77,7 +76,6 @@
7776
<script src="~/libs-ext/spin/jquery.spin.js" asp-append-version="true"></script>
7877
<script src="~/libs/sweetalert/sweetalert.min.js" asp-append-version="true"></script>
7978
<script src="~/libs/toastr/toastr.min.js" asp-append-version="true"></script>
80-
<script src="~/libs/bootstrap-select/js/bootstrap-select.js" asp-append-version="true"></script>
8179
<script src="~/libs/push.js/push.js" asp-append-version="true"></script>
8280
<script src="~/libs/moment/moment-with-locales.js" asp-append-version="true"></script>
8381
<script src="~/libs/abp-web-resources/Abp/Framework/scripts/abp.js" asp-append-version="true"></script>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bundleconfig.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
"inputFiles": [
4141
"wwwroot/libs/font-awesome/css/all.min.css",
4242
"wwwroot/libs/flag-icon/css/flag-icon.min.css",
43-
"wwwroot/libs/bootstrap-select/css/bootstrap-select.css",
4443
"wwwroot/libs/animate.css/animate.css",
4544
"wwwroot/libs/icheck-bootstrap/icheck-bootstrap.css",
4645
"wwwroot/libs/toastr/toastr.css",
@@ -65,7 +64,6 @@
6564
"wwwroot/libs-ext/spin/jquery.spin.js",
6665
"wwwroot/libs/sweetalert/sweetalert.min.js",
6766
"wwwroot/libs/toastr/toastr.min.js",
68-
"wwwroot/libs/bootstrap-select/js/bootstrap-select.js",
6967
"wwwroot/libs/push.js/push.js",
7068
"wwwroot/libs/moment/moment-with-locales.js",
7169
"wwwroot/libs/abp-web-resources/Abp/Framework/scripts/abp.js",

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/libman.json

Lines changed: 94 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,66 @@
22
"defaultProvider": "cdnjs",
33
"version": "1.0",
44
"libraries": [
5+
//core libs start
6+
{
7+
"library": "[email protected]",
8+
"destination": "wwwroot/libs/jquery",
9+
"files": [
10+
"jquery.js",
11+
"jquery.min.js",
12+
"jquery.min.map"
13+
]
14+
},
15+
//core libs end
16+
17+
//abp libs start
518
{
619
"library": "[email protected]",
720
"provider": "jsdelivr",
821
"destination": "wwwroot/libs/abp-web-resources"
922
},
1023
{
11-
"library": "[email protected]",
24+
"library": "[email protected]",
25+
"destination": "wwwroot/libs/block-ui"
26+
},
27+
{
28+
"library": "[email protected]",
29+
"destination": "wwwroot/libs/sweetalert"
30+
},
31+
{
32+
"library": "[email protected]",
33+
"destination": "wwwroot/libs/spin"
34+
},
35+
{
36+
"library": "[email protected]",
37+
"destination": "wwwroot/libs/toastr"
38+
},
39+
{
40+
"library": "[email protected]",
41+
"destination": "wwwroot/libs/moment"
42+
},
43+
{
44+
"library": "[email protected]",
45+
"destination": "wwwroot/libs/moment-timezone"
46+
},
47+
{
48+
"library": "[email protected]",
49+
"destination": "wwwroot/libs/signalr"
50+
},
51+
{
52+
"library": "@aspnet/[email protected]",
53+
"provider": "jsdelivr",
54+
"destination": "wwwroot/libs/signalr",
55+
"files": [
56+
"dist/browser/signalr.js",
57+
"dist/browser/signalr.js.map"
58+
]
59+
},
60+
//abp libs end
61+
62+
//admin-lte libs start
63+
{
64+
"library": "[email protected]",
1265
"provider": "jsdelivr",
1366
"destination": "wwwroot/libs/admin-lte",
1467
"files": [
@@ -34,29 +87,25 @@
3487
]
3588
},
3689
{
37-
"library": "[email protected]",
38-
"destination": "wwwroot/libs/bootstrap"
39-
},
40-
{
41-
"library": "[email protected]",
42-
"destination": "wwwroot/libs/jquery",
90+
"library": "[email protected]",
91+
"provider": "jsdelivr",
92+
"destination": "wwwroot/libs/bootstrap",
4393
"files": [
44-
"jquery.js",
45-
"jquery.min.js",
46-
"jquery.min.map"
94+
"dist/js/bootstrap.bundle.js",
95+
"dist/js/bootstrap.bundle.min.js",
96+
"dist/js/bootstrap.bundle.js.map",
97+
"dist/js/bootstrap.bundle.min.js.map"
4798
]
4899
},
49100
{
50-
"library": "[email protected]",
51-
"destination": "wwwroot/libs/jquery-validate"
52-
},
53-
{
54-
"library": "[email protected]",
55-
"destination": "wwwroot/libs/jquery-validate"
101+
"library": "@fortawesome/[email protected]",
102+
"provider": "jsdelivr",
103+
"destination": "wwwroot/libs/font-awesome"
56104
},
57105
{
58-
"library": "[email protected]",
59-
"destination": "wwwroot/libs/font-awesome"
106+
"library": "[email protected]",
107+
"provider": "jsdelivr",
108+
"destination": "wwwroot/libs/flag-icon"
60109
},
61110
{
62111
"library": "[email protected]",
@@ -68,29 +117,23 @@
68117
]
69118
},
70119
{
71-
"library": "[email protected]",
120+
"library": "[email protected]",
121+
"provider": "jsdelivr",
72122
"destination": "wwwroot/libs/datatables",
73123
"files": [
74-
"css/dataTables.bootstrap4.css",
75-
"css/dataTables.bootstrap4.min.css",
76-
"images/sort_asc.png",
77-
"images/sort_asc_disabled.png",
78-
"images/sort_both.png",
79-
"images/sort_desc.png",
80-
"images/sort_desc_disabled.png",
81124
"js/jquery.dataTables.js",
82-
"js/jquery.dataTables.min.js",
83-
"js/dataTables.bootstrap4.js",
84-
"js/dataTables.bootstrap4.min.js"
125+
"js/jquery.dataTables.min.js"
85126
]
86127
},
87128
{
88-
"library": "datatables.net-buttons@1.6.1",
129+
"library": "datatables.net-bs4@1.10.20",
89130
"provider": "jsdelivr",
90131
"destination": "wwwroot/libs/datatables",
91132
"files": [
92-
"js/dataTables.buttons.js",
93-
"js/dataTables.buttons.min.js"
133+
"css/dataTables.bootstrap4.css",
134+
"css/dataTables.bootstrap4.min.css",
135+
"js/dataTables.bootstrap4.js",
136+
"js/dataTables.bootstrap4.min.js"
94137
]
95138
},
96139
{
@@ -114,53 +157,25 @@
114157
]
115158
},
116159
{
117-
"library": "datatables.net-buttons-bs4@1.6.1",
160+
"library": "[email protected]",
118161
"provider": "jsdelivr",
119162
"destination": "wwwroot/libs/datatables",
120163
"files": [
121-
"css/buttons.bootstrap4.css",
122-
"css/buttons.bootstrap4.min.css",
123-
"js/buttons.bootstrap4.js",
124-
"js/buttons.bootstrap4.min.js"
164+
"js/dataTables.buttons.js",
165+
"js/dataTables.buttons.min.js"
125166
]
126167
},
127168
{
128-
"library": "[email protected]",
129-
"destination": "wwwroot/libs/block-ui"
130-
},
131-
{
132-
"library": "[email protected]",
133-
"destination": "wwwroot/libs/sweetalert"
134-
},
135-
{
136-
"library": "[email protected]",
137-
"destination": "wwwroot/libs/spin"
138-
},
139-
{
140-
"library": "[email protected]",
141-
"destination": "wwwroot/libs/toastr"
142-
},
143-
{
144-
"library": "[email protected]",
145-
"destination": "wwwroot/libs/moment"
146-
},
147-
{
148-
"library": "[email protected]",
149-
"destination": "wwwroot/libs/signalr"
150-
},
151-
{
152-
"library": "@aspnet/[email protected]",
169+
"library": "[email protected]",
153170
"provider": "jsdelivr",
154-
"destination": "wwwroot/libs/signalr",
171+
"destination": "wwwroot/libs/datatables",
155172
"files": [
156-
"dist/browser/signalr.js",
157-
"dist/browser/signalr.js.map"
173+
"css/buttons.bootstrap4.css",
174+
"css/buttons.bootstrap4.min.css",
175+
"js/buttons.bootstrap4.js",
176+
"js/buttons.bootstrap4.min.js"
158177
]
159178
},
160-
{
161-
"library": "[email protected]",
162-
"destination": "wwwroot/libs/flag-icon"
163-
},
164179
{
165180
"library": "[email protected]",
166181
"provider": "jsdelivr",
@@ -170,31 +185,25 @@
170185
"dist/Chart.js"
171186
]
172187
},
188+
//admin-lte libs end
189+
190+
//other libs start
173191
{
174-
"library": "[email protected]",
175-
"destination": "wwwroot/libs/animate.css"
176-
},
177-
{
178-
"library": "[email protected]",
179-
"destination": "wwwroot/libs/bootstrap-select",
180-
"files": [
181-
"css/bootstrap-select.css",
182-
"css/bootstrap-select.css.map",
183-
"js/bootstrap-select.js",
184-
"js/bootstrap-select.js.map"
185-
]
192+
"library": "[email protected]",
193+
"destination": "wwwroot/libs/jquery-validate"
186194
},
187195
{
188-
"library": "jquery-countto@1.2.0",
189-
"destination": "wwwroot/libs/jquery-countto"
196+
"library": "jquery-validation-unobtrusive@3.2.11",
197+
"destination": "wwwroot/libs/jquery-validate"
190198
},
191199
{
192-
"library": "[email protected]",
193-
"destination": "wwwroot/libs/moment-timezone"
200+
"library": "[email protected]",
201+
"destination": "wwwroot/libs/animate.css"
194202
},
195203
{
196204
"library": "[email protected]",
197205
"destination": "wwwroot/libs/push.js"
198206
}
207+
//other libs end
199208
]
200209
}

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/js/main.js

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,17 @@
22
//Notification handler
33
abp.event.on('abp.notifications.received', function (userNotification) {
44
abp.notifications.showUiNotifyForUserNotification(userNotification);
5+
6+
//Desktop notification
7+
Push.create("AbpProjectName", {
8+
body: userNotification.notification.data.message,
9+
icon: abp.appPath + 'img/logo.png',
10+
timeout: 6000,
11+
onClick: function () {
12+
window.focus();
13+
this.close();
14+
}
15+
});
516
});
617

718
//serializeFormToObject plugin for jQuery

0 commit comments

Comments
 (0)