Skip to content

Commit 82274f8

Browse files
hikalkanhikalkan
committed
Resolved #16: sweet alert localization problem.
1 parent 7a957b6 commit 82274f8

File tree

8 files changed

+305
-301
lines changed

8 files changed

+305
-301
lines changed

‎src/AbpCompanyName.AbpProjectName.WebMpa/App_Start/BundleConfig.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ public static void RegisterBundles(BundleCollection bundles)
5252
"~/Abp/Framework/scripts/abp.js",
5353
"~/Abp/Framework/scripts/libs/abp.jquery.js",
5454
"~/Abp/Framework/scripts/libs/abp.toastr.js",
55-
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
55+
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
56+
"~/Abp/Framework/scripts/libs/abp.sweet-alert.js",
5657
"~/Abp/Framework/scripts/libs/abp.spin.js"
5758
)
5859
);

‎src/AbpCompanyName.AbpProjectName.WebMpa/Views/Shared/_Layout.cshtml

Lines changed: 58 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,58 @@
1-
@using System.Threading
2-
@using System.Web.Optimization
3-
<!DOCTYPE html>
4-
<html lang="en">
5-
<head>
6-
<meta charset="utf-8">
7-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
9-
<meta name="description" content="">
10-
<meta name="author" content="">
11-
12-
<link rel="shortcut icon" href="~/favicon.ico">
13-
14-
<title>AbpProjectName</title>
15-
16-
@Styles.Render("~/Bundles/vendor/css")
17-
@Styles.Render("~/Bundles/css")
18-
19-
<!-- View specific styles -->
20-
@RenderSection("styles", required: false)
21-
22-
<script type="text/javascript">
23-
//This is used to get the application's root path from javascript. It's useful if you're running application in a virtual directory under IIS.
24-
var abp = abp || {}; abp.appPath = '@ApplicationPath';
25-
</script>
26-
27-
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
28-
<!--[if lt IE 9]>
29-
<script src="@Url.Content("~/Scripts/others/html5shiv.js")"></script>
30-
<script src="@Url.Content("~/Scripts/others/respond.min.js")"></script>
31-
<![endif]-->
32-
33-
@Scripts.Render("~/Bundles/vendor/js/top")
34-
35-
</head>
36-
<body>
37-
@Html.Partial("_TopBar")
38-
39-
<div class="container">
40-
@RenderBody()
41-
</div>
42-
43-
@Scripts.Render("~/Bundles/vendor/js/bottom")
44-
@Scripts.Render("~/Bundles/js")
45-
46-
<script>
47-
//Localizing momentjs
48-
moment.locale('@Thread.CurrentThread.CurrentUICulture.Name');
49-
</script>
50-
51-
<!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
52-
<script src="~/api/AbpServiceProxies/GetAll"></script>
53-
<script src="~/AbpScripts/GetScripts" type="text/javascript"></script>
54-
55-
<script src="~/Abp/Framework/scripts/libs/abp.sweet-alert.js"></script>
56-
57-
<!-- View specific scripts -->
58-
@RenderSection("scripts", required: false)
59-
</body>
60-
</html>
1+
@using System.Threading
2+
@using System.Web.Optimization
3+
<!DOCTYPE html>
4+
<html lang="en">
5+
<head>
6+
<meta charset="utf-8">
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
9+
<meta name="description" content="">
10+
<meta name="author" content="">
11+
12+
<link rel="shortcut icon" href="~/favicon.ico">
13+
14+
<title>AbpProjectName</title>
15+
16+
@Styles.Render("~/Bundles/vendor/css")
17+
@Styles.Render("~/Bundles/css")
18+
19+
<!-- View specific styles -->
20+
@RenderSection("styles", required: false)
21+
22+
<script type="text/javascript">
23+
//This is used to get the application's root path from javascript. It's useful if you're running application in a virtual directory under IIS.
24+
var abp = abp || {}; abp.appPath = '@ApplicationPath';
25+
</script>
26+
27+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
28+
<!--[if lt IE 9]>
29+
<script src="@Url.Content("~/Scripts/others/html5shiv.js")"></script>
30+
<script src="@Url.Content("~/Scripts/others/respond.min.js")"></script>
31+
<![endif]-->
32+
33+
@Scripts.Render("~/Bundles/vendor/js/top")
34+
35+
</head>
36+
<body>
37+
@Html.Partial("_TopBar")
38+
39+
<div class="container">
40+
@RenderBody()
41+
</div>
42+
43+
@Scripts.Render("~/Bundles/vendor/js/bottom")
44+
@Scripts.Render("~/Bundles/js")
45+
46+
<script>
47+
//Localizing momentjs
48+
moment.locale('@Thread.CurrentThread.CurrentUICulture.Name');
49+
</script>
50+
51+
<!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
52+
<script src="~/api/AbpServiceProxies/GetAll"></script>
53+
<script src="~/AbpScripts/GetScripts" type="text/javascript"></script>
54+
55+
<!-- View specific scripts -->
56+
@RenderSection("scripts", required: false)
57+
</body>
58+
</html>

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/App/Main/views/layout/layout.cshtml

Lines changed: 54 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,55 @@
1-
@using System.Threading
2-
@using System.Web.Optimization
3-
<!DOCTYPE html>
4-
<html lang="en">
5-
<head>
6-
<meta charset="utf-8">
7-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
9-
<meta name="description" content="">
10-
<meta name="author" content="">
11-
12-
<title>AbpProjectName</title>
13-
14-
<link rel="shortcut icon" href="~/favicon.ico">
15-
16-
@Styles.Render("~/Bundles/App/vendor/css")
17-
@Styles.Render("~/Bundles/App/Main/css")
18-
19-
<script type="text/javascript">
20-
//This is used to get the application's root path from javascript. It's useful if you're running application in a virtual directory under IIS.
21-
var abp = abp || {}; abp.appPath = '@ApplicationPath';
22-
</script>
23-
24-
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
25-
<!--[if lt IE 9]>
26-
<script src="@Url.Content("~/Scripts/others/html5shiv.js")"></script>
27-
<script src="@Url.Content("~/Scripts/others/respond.min.js")"></script>
28-
<![endif]-->
29-
@Scripts.Render("~/Bundles/App/vendor/js")
30-
31-
<script>
32-
//Localizing momentjs
33-
moment.locale('@Thread.CurrentThread.CurrentUICulture.Name');
34-
</script>
35-
36-
<!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
37-
<script src="~/api/AbpServiceProxies/GetAll?type=angular"></script>
38-
<script src="~/AbpScripts/GetScripts" type="text/javascript"></script>
39-
40-
@Scripts.Render("~/Bundles/App/Main/js")
41-
42-
<script src="~/Abp/Framework/scripts/libs/abp.sweet-alert.js"></script>
43-
</head>
44-
<body>
45-
<div ng-app="app">
46-
<div ng-controller="app.views.layout as vm">
47-
<div ng-include="'/App/Main/views/layout/header.cshtml'"></div>
48-
<div class="container">
49-
<div class="angular-animation-container row">
50-
<div ui-view class="shuffle-animation col-xs-12"></div>
51-
</div>
52-
</div>
53-
</div>
54-
</div>
55-
</body>
1+
@using System.Threading
2+
@using System.Web.Optimization
3+
<!DOCTYPE html>
4+
<html lang="en">
5+
<head>
6+
<meta charset="utf-8">
7+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
9+
<meta name="description" content="">
10+
<meta name="author" content="">
11+
12+
<title>AbpProjectName</title>
13+
14+
<link rel="shortcut icon" href="~/favicon.ico">
15+
16+
@Styles.Render("~/Bundles/App/vendor/css")
17+
@Styles.Render("~/Bundles/App/Main/css")
18+
19+
<script type="text/javascript">
20+
//This is used to get the application's root path from javascript. It's useful if you're running application in a virtual directory under IIS.
21+
var abp = abp || {}; abp.appPath = '@ApplicationPath';
22+
</script>
23+
24+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
25+
<!--[if lt IE 9]>
26+
<script src="@Url.Content("~/Scripts/others/html5shiv.js")"></script>
27+
<script src="@Url.Content("~/Scripts/others/respond.min.js")"></script>
28+
<![endif]-->
29+
@Scripts.Render("~/Bundles/App/vendor/js")
30+
31+
<script>
32+
//Localizing momentjs
33+
moment.locale('@Thread.CurrentThread.CurrentUICulture.Name');
34+
</script>
35+
36+
<!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
37+
<script src="~/api/AbpServiceProxies/GetAll?type=angular"></script>
38+
<script src="~/AbpScripts/GetScripts" type="text/javascript"></script>
39+
40+
@Scripts.Render("~/Bundles/App/Main/js")
41+
42+
</head>
43+
<body>
44+
<div ng-app="app">
45+
<div ng-controller="app.views.layout as vm">
46+
<div ng-include="'/App/Main/views/layout/header.cshtml'"></div>
47+
<div class="container">
48+
<div class="angular-animation-container row">
49+
<div ui-view class="shuffle-animation col-xs-12"></div>
50+
</div>
51+
</div>
52+
</div>
53+
</div>
54+
</body>
5655
</html>

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/App_Start/BundleConfig.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,9 @@ public static void RegisterBundles(BundleCollection bundles)
5353
"~/Abp/Framework/scripts/abp.js",
5454
"~/Abp/Framework/scripts/libs/abp.jquery.js",
5555
"~/Abp/Framework/scripts/libs/abp.toastr.js",
56-
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
57-
"~/Abp/Framework/scripts/libs/abp.spin.js",
56+
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
57+
"~/Abp/Framework/scripts/libs/abp.spin.js",
58+
"~/Abp/Framework/scripts/libs/abp.sweet-alert.js",
5859
"~/Abp/Framework/scripts/libs/angularjs/abp.ng.js"
5960
)
6061
);

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Views/Shared/_Layout.cshtml

Lines changed: 68 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,69 @@
1-
@*
2-
IMPORTANT NOTES FROM ASP.NET BOILERPLATE:
3-
4-
This _Layout.cshtml is not used actually. It's left here if you want to add some classic style (MPA)
5-
pages to your application.
6-
7-
See App/Main/views/layout/layout.cshtml for Angular application's layout page.
8-
*@
9-
10-
<!DOCTYPE html>
11-
<html lang="en">
12-
<head>
13-
<meta charset="utf-8">
14-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
15-
<meta name="viewport" content="width=device-width, initial-scale=1">
16-
<meta name="description" content="">
17-
<meta name="author" content="">
18-
19-
<title>AbpProjectName</title>
20-
21-
<link rel="shortcut icon" href="~/favicon.ico">
22-
23-
<link href="~/Content/themes/base/all.css" rel="stylesheet" />
24-
<link href="~/Content/bootstrap-cosmo.min.css" rel="stylesheet">
25-
<link href="~/Content/toastr.min.css" rel="stylesheet" />
26-
<link href="~/Content/flags/famfamfam-flags.css" rel="stylesheet" />
27-
28-
<script type="text/javascript">
29-
//This is used to get the application's root path from javascript. It's useful if you're running application in a virtual directory under IIS.
30-
var abp = abp || {}; abp.appPath = '@ApplicationPath';
31-
</script>
32-
33-
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
34-
<!--[if lt IE 9]>
35-
<script src="@Url.Content("~/Scripts/others/html5shiv.js")"></script>
36-
<script src="@Url.Content("~/Scripts/others/respond.min.js")"></script>
37-
<![endif]-->
38-
39-
<script src="~/Abp/Framework/scripts/utils/ie10fix.js"></script>
40-
41-
<script src="~/Scripts/modernizr-2.8.3.js"></script>
42-
43-
<script src="~/Scripts/json2.min.js"></script>
44-
<script src="~/Scripts/jquery-2.1.4.min.js"></script>
45-
<script src="~/Scripts/jquery-ui-1.11.4.min.js"></script>
46-
<script src="~/Scripts/jquery.blockUI.js"></script>
47-
<script src="~/Scripts/toastr.min.js"></script>
48-
<script src="~/Scripts/others/spinjs/spin.js"></script>
49-
<script src="~/Scripts/others/spinjs/jquery.spin.js"></script>
50-
51-
<script src="~/Scripts/bootstrap.min.js"></script>
52-
53-
<script src="~/Abp/Framework/scripts/abp.js"></script>
54-
<script src="~/Abp/Framework/scripts/libs/abp.jquery.js"></script>
55-
<script src="~/Abp/Framework/scripts/libs/abp.toastr.js"></script>
56-
<script src="~/Abp/Framework/scripts/libs/abp.blockUI.js"></script>
57-
<script src="~/Abp/Framework/scripts/libs/abp.spin.js"></script>
58-
59-
<!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
60-
<script src="~/api/AbpServiceProxies/GetAll"></script>
61-
<script src="~/AbpScripts/GetScripts" type="text/javascript"></script>
62-
</head>
63-
<body>
64-
@RenderBody()
65-
</body>
1+
@*
2+
IMPORTANT NOTES FROM ASP.NET BOILERPLATE:
3+
4+
This _Layout.cshtml is not used actually. It's left here if you want to add some classic style (MPA)
5+
pages to your application.
6+
7+
See App/Main/views/layout/layout.cshtml for Angular application's layout page.
8+
*@
9+
10+
<!DOCTYPE html>
11+
<html lang="en">
12+
<head>
13+
<meta charset="utf-8">
14+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
15+
<meta name="viewport" content="width=device-width, initial-scale=1">
16+
<meta name="description" content="">
17+
<meta name="author" content="">
18+
19+
<title>AbpProjectName</title>
20+
21+
<link rel="shortcut icon" href="~/favicon.ico">
22+
23+
<link href="~/Content/themes/base/all.css" rel="stylesheet" />
24+
<link href="~/Content/bootstrap-cosmo.min.css" rel="stylesheet">
25+
<link href="~/Content/toastr.min.css" rel="stylesheet" />
26+
<link href="~/Content/flags/famfamfam-flags.css" rel="stylesheet" />
27+
<link href="~/Scripts/sweetalert/sweet-alert.css" rel="stylesheet" />
28+
29+
<script type="text/javascript">
30+
//This is used to get the application's root path from javascript. It's useful if you're running application in a virtual directory under IIS.
31+
var abp = abp || {}; abp.appPath = '@ApplicationPath';
32+
</script>
33+
34+
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
35+
<!--[if lt IE 9]>
36+
<script src="@Url.Content("~/Scripts/others/html5shiv.js")"></script>
37+
<script src="@Url.Content("~/Scripts/others/respond.min.js")"></script>
38+
<![endif]-->
39+
40+
<script src="~/Abp/Framework/scripts/utils/ie10fix.js"></script>
41+
42+
<script src="~/Scripts/modernizr-2.8.3.js"></script>
43+
44+
<script src="~/Scripts/json2.min.js"></script>
45+
<script src="~/Scripts/jquery-2.1.4.min.js"></script>
46+
<script src="~/Scripts/jquery-ui-1.11.4.min.js"></script>
47+
<script src="~/Scripts/jquery.blockUI.js"></script>
48+
<script src="~/Scripts/toastr.min.js"></script>
49+
<script src="~/Scripts/others/spinjs/spin.js"></script>
50+
<script src="~/Scripts/others/spinjs/jquery.spin.js"></script>
51+
<script src="~/Scripts/sweetalert/sweet-alert.min.js"></script>
52+
53+
<script src="~/Scripts/bootstrap.min.js"></script>
54+
55+
<script src="~/Abp/Framework/scripts/abp.js"></script>
56+
<script src="~/Abp/Framework/scripts/libs/abp.jquery.js"></script>
57+
<script src="~/Abp/Framework/scripts/libs/abp.toastr.js"></script>
58+
<script src="~/Abp/Framework/scripts/libs/abp.blockUI.js"></script>
59+
<script src="~/Abp/Framework/scripts/libs/abp.spin.js"></script>
60+
<script src="~/Abp/Framework/scripts/libs/abp.sweet-alert.js"></script>
61+
62+
<!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
63+
<script src="~/api/AbpServiceProxies/GetAll"></script>
64+
<script src="~/AbpScripts/GetScripts" type="text/javascript"></script>
65+
</head>
66+
<body>
67+
@RenderBody()
68+
</body>
6669
</html>

0 commit comments

Comments
 (0)