Skip to content

Commit 37168a9

Browse files
hikalkanhikalkan
committed
Refactored template.
1 parent 5e34224 commit 37168a9

File tree

7 files changed

+164
-163
lines changed

7 files changed

+164
-163
lines changed

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

Lines changed: 77 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,78 @@
1-
using System.Web.Optimization;
2-
3-
namespace AbpCompanyName.AbpProjectName.WebMpa
4-
{
5-
public static class BundleConfig
6-
{
7-
public static void RegisterBundles(BundleCollection bundles)
8-
{
9-
bundles.IgnoreList.Clear();
10-
11-
//VENDOR RESOURCES
12-
13-
//~/Bundles/vendor/css
14-
bundles.Add(
15-
new StyleBundle("~/Bundles/vendor/css")
16-
.Include(
17-
"~/Content/themes/base/all.css",
18-
"~/Content/bootstrap-cosmo.min.css",
19-
"~/Content/toastr.min.css",
20-
"~/Scripts/sweetalert/sweet-alert.css",
21-
"~/Content/flags/famfamfam-flags.css",
22-
"~/Content/font-awesome.min.css"
23-
)
24-
);
25-
26-
//~/Bundles/vendor/js/top (These scripts should be included in the head of the page)
27-
bundles.Add(
28-
new ScriptBundle("~/Bundles/vendor/js/top")
29-
.Include(
30-
"~/Abp/Framework/scripts/utils/ie10fix.js",
31-
"~/Scripts/modernizr-2.8.3.js"
32-
)
33-
);
34-
35-
//~/Bundles/vendor/bottom (Included in the bottom for fast page load)
36-
bundles.Add(
37-
new ScriptBundle("~/Bundles/vendor/js/bottom")
38-
.Include(
39-
"~/Scripts/json2.min.js",
40-
41-
"~/Scripts/jquery-2.1.4.min.js",
42-
"~/Scripts/jquery-ui-1.11.4.min.js",
43-
44-
"~/Scripts/bootstrap.min.js",
45-
46-
"~/Scripts/moment-with-locales.min.js",
47-
"~/Scripts/jquery.validate.min.js",
48-
"~/Scripts/jquery.blockUI.js",
49-
"~/Scripts/toastr.min.js",
50-
"~/Scripts/sweetalert/sweet-alert.min.js",
51-
"~/Scripts/others/spinjs/spin.js",
52-
"~/Scripts/others/spinjs/jquery.spin.js",
53-
54-
"~/Abp/Framework/scripts/abp.js",
55-
"~/Abp/Framework/scripts/libs/abp.jquery.js",
56-
"~/Abp/Framework/scripts/libs/abp.toastr.js",
57-
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
58-
"~/Abp/Framework/scripts/libs/abp.spin.js"
59-
)
60-
);
61-
62-
//APPLICATION RESOURCES
63-
64-
//~/Bundles/css
65-
bundles.Add(
66-
new StyleBundle("~/Bundles/css")
67-
.Include("~/css/main.css")
68-
);
69-
70-
//~/Bundles/js
71-
bundles.Add(
72-
new ScriptBundle("~/Bundles/js")
73-
.Include("~/js/main.js")
74-
);
75-
}
76-
}
1+
using System.Web.Optimization;
2+
3+
namespace AbpCompanyName.AbpProjectName.WebMpa
4+
{
5+
public static class BundleConfig
6+
{
7+
public static void RegisterBundles(BundleCollection bundles)
8+
{
9+
bundles.IgnoreList.Clear();
10+
11+
//VENDOR RESOURCES
12+
13+
//~/Bundles/vendor/css
14+
bundles.Add(
15+
new StyleBundle("~/Bundles/vendor/css")
16+
.Include(
17+
"~/Content/themes/base/all.css",
18+
"~/Content/bootstrap-cosmo.min.css",
19+
"~/Content/toastr.min.css",
20+
"~/Scripts/sweetalert/sweet-alert.css",
21+
"~/Content/flags/famfamfam-flags.css",
22+
"~/Content/font-awesome.min.css"
23+
)
24+
);
25+
26+
//~/Bundles/vendor/js/top (These scripts should be included in the head of the page)
27+
bundles.Add(
28+
new ScriptBundle("~/Bundles/vendor/js/top")
29+
.Include(
30+
"~/Abp/Framework/scripts/utils/ie10fix.js",
31+
"~/Scripts/modernizr-2.8.3.js"
32+
)
33+
);
34+
35+
//~/Bundles/vendor/bottom (Included in the bottom for fast page load)
36+
bundles.Add(
37+
new ScriptBundle("~/Bundles/vendor/js/bottom")
38+
.Include(
39+
"~/Scripts/json2.min.js",
40+
41+
"~/Scripts/jquery-2.1.4.min.js",
42+
"~/Scripts/jquery-ui-1.11.4.min.js",
43+
44+
"~/Scripts/bootstrap.min.js",
45+
46+
"~/Scripts/moment-with-locales.min.js",
47+
"~/Scripts/jquery.validate.min.js",
48+
"~/Scripts/jquery.blockUI.js",
49+
"~/Scripts/toastr.min.js",
50+
"~/Scripts/sweetalert/sweet-alert.min.js",
51+
"~/Scripts/others/spinjs/spin.js",
52+
"~/Scripts/others/spinjs/jquery.spin.js",
53+
54+
"~/Abp/Framework/scripts/abp.js",
55+
"~/Abp/Framework/scripts/libs/abp.jquery.js",
56+
"~/Abp/Framework/scripts/libs/abp.toastr.js",
57+
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
58+
"~/Abp/Framework/scripts/libs/abp.spin.js",
59+
"~/Abp/Framework/scripts/libs/abp.sweet-alert.js"
60+
)
61+
);
62+
63+
//APPLICATION RESOURCES
64+
65+
//~/Bundles/css
66+
bundles.Add(
67+
new StyleBundle("~/Bundles/css")
68+
.Include("~/css/main.css")
69+
);
70+
71+
//~/Bundles/js
72+
bundles.Add(
73+
new ScriptBundle("~/Bundles/js")
74+
.Include("~/js/main.js")
75+
);
76+
}
77+
}
7778
}

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

Lines changed: 55 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,56 @@
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"></script>
38-
<script src="~/api/AbpServiceProxies/GetAll?type=angular"></script>
39-
<script src="~/AbpScripts/GetScripts" type="text/javascript"></script>
40-
41-
@Scripts.Render("~/Bundles/App/Main/js")
42-
43-
<script src="~/Abp/Framework/scripts/libs/abp.sweet-alert.js"></script>
44-
</head>
45-
<body>
46-
<div ng-app="app">
47-
<div ng-controller="app.views.layout as vm">
48-
<div ng-include="'/App/Main/views/layout/header.cshtml'"></div>
49-
<div class="container">
50-
<div class="angular-animation-container row">
51-
<div ui-view class="shuffle-animation col-xs-12"></div>
52-
</div>
53-
</div>
54-
</div>
55-
</div>
56-
</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"></script>
38+
<script src="~/api/AbpServiceProxies/GetAll?type=angular"></script>
39+
<script src="~/AbpScripts/GetScripts" type="text/javascript"></script>
40+
41+
@Scripts.Render("~/Bundles/App/Main/js")
42+
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>
5756
</html>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static void RegisterBundles(BundleCollection bundles)
5757
"~/Abp/Framework/scripts/libs/abp.toastr.js",
5858
"~/Abp/Framework/scripts/libs/abp.blockUI.js",
5959
"~/Abp/Framework/scripts/libs/abp.spin.js",
60-
//"~/Abp/Framework/scripts/libs/abp.sweet-alert.js",
60+
"~/Abp/Framework/scripts/libs/abp.sweet-alert.js",
6161
"~/Abp/Framework/scripts/libs/angularjs/abp.ng.js"
6262
)
6363
);

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Views/Account/Login.cshtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
@using System.Globalization
1+
@using Abp.Web.Mvc.Extensions
22
@using Microsoft.Owin.Security
33
@model AbpCompanyName.AbpProjectName.WebSpaAngular.Models.Account.LoginFormViewModel
44
@section Styles
55
{
6-
<link href="~/Views/Account/Login.css" rel="stylesheet" />
6+
@Html.IncludeStyle("~/Views/Account/Login.css")
77
}
88
@section Scripts
99
{
10-
<script src="~/Views/Account/Login.js"></script>
10+
@Html.IncludeScript("~/Views/Account/Login.js")
1111
}
1212
<div class="container">
1313
<div id="LoginArea" class="row">

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Views/Account/Register.cshtml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
{
55
<link href="~/Views/Account/Login.css" rel="stylesheet" />
66
}
7-
@section Scripts
8-
{
9-
<script src="~/Views/Account/Login.js"></script>
10-
}
117
<div class="container">
128
<div id="LoginArea" class="row">
139
<div class="col-lg-12">

‎src/AbpCompanyName.AbpProjectName.WebSpaAngular/Views/Account/TenantSelection.cshtml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33
ViewBag.Title = "Select Tenant";
44
}
55
<h4>Tenant selection</h4>
6+
7+
<p>TODO: TENANT SELECTION</p>

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

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
@using Abp.Web.Mvc.Extensions
22
@*
33
IMPORTANT NOTES FROM ASP.NET BOILERPLATE:
4-
4+
55
This _Layout.cshtml is not used actually. It's left here if you want to add some classic style (MPA)
66
pages to your application.
7-
7+
88
See App/Main/views/layout/layout.cshtml for Angular application's layout page.
99
*@
1010

@@ -21,11 +21,12 @@
2121

2222
<link rel="shortcut icon" href="~/favicon.ico">
2323

24-
<link href="~/Content/themes/base/all.css" rel="stylesheet" />
25-
<link href="~/Content/bootstrap-cosmo.min.css" rel="stylesheet">
24+
@Html.IncludeStyle("~/Content/themes/base/all.css")
25+
@Html.IncludeStyle("~/Content/bootstrap-cosmo.min.css")
2626
@Html.IncludeStyle("~/Content/font-awesome.min.css")
27-
<link href="~/Content/toastr.min.css" rel="stylesheet" />
28-
<link href="~/Content/flags/famfamfam-flags.css" rel="stylesheet" />
27+
@Html.IncludeStyle("~/Content/toastr.min.css")
28+
@Html.IncludeStyle("~/Content/flags/famfamfam-flags.css")
29+
@Html.IncludeStyle("~/Scripts/sweetalert/sweet-alert.css")
2930

3031
@RenderSection("Styles", false)
3132

@@ -36,29 +37,31 @@
3637

3738
<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
3839
<!--[if lt IE 9]>
39-
<script src="@Url.Content("~/Scripts/others/html5shiv.js")"></script>
40-
<script src="@Url.Content("~/Scripts/others/respond.min.js")"></script>
40+
@Html.IncludeScript("~/Scripts/others/html5shiv.js")
41+
@Html.IncludeScript("~/Scripts/others/respond.min.js")
4142
<![endif]-->
4243

43-
<script src="~/Abp/Framework/scripts/utils/ie10fix.js"></script>
4444

45-
<script src="~/Scripts/modernizr-2.8.3.js"></script>
45+
@Html.IncludeScript("~/Abp/Framework/scripts/utils/ie10fix.js")
46+
@Html.IncludeScript("~/Scripts/modernizr-2.8.3.js")
4647

47-
<script src="~/Scripts/json2.min.js"></script>
48-
<script src="~/Scripts/jquery-2.1.4.min.js"></script>
49-
<script src="~/Scripts/jquery-ui-1.11.4.min.js"></script>
50-
<script src="~/Scripts/jquery.blockUI.js"></script>
51-
<script src="~/Scripts/toastr.min.js"></script>
52-
<script src="~/Scripts/others/spinjs/spin.js"></script>
53-
<script src="~/Scripts/others/spinjs/jquery.spin.js"></script>
48+
@Html.IncludeScript("~/Scripts/json2.min.js")
49+
@Html.IncludeScript("~/Scripts/jquery-2.1.4.min.js")
50+
@Html.IncludeScript("~/Scripts/jquery-ui-1.11.4.min.js")
51+
@Html.IncludeScript("~/Scripts/bootstrap.min.js")
5452

55-
<script src="~/Scripts/bootstrap.min.js"></script>
53+
@Html.IncludeScript("~/Scripts/jquery.blockUI.js")
54+
@Html.IncludeScript("~/Scripts/toastr.min.js")
55+
@Html.IncludeScript("~/Scripts/others/spinjs/spin.js")
56+
@Html.IncludeScript("~/Scripts/others/spinjs/jquery.spin.js")
57+
@Html.IncludeScript("~/Scripts/sweetalert/sweet-alert.min.js")
5658

57-
<script src="~/Abp/Framework/scripts/abp.js"></script>
58-
<script src="~/Abp/Framework/scripts/libs/abp.jquery.js"></script>
59-
<script src="~/Abp/Framework/scripts/libs/abp.toastr.js"></script>
60-
<script src="~/Abp/Framework/scripts/libs/abp.blockUI.js"></script>
61-
<script src="~/Abp/Framework/scripts/libs/abp.spin.js"></script>
59+
@Html.IncludeScript("~/Abp/Framework/scripts/abp.js")
60+
@Html.IncludeScript("~/Abp/Framework/scripts/libs/abp.jquery.js")
61+
@Html.IncludeScript("~/Abp/Framework/scripts/libs/abp.toastr.js")
62+
@Html.IncludeScript("~/Abp/Framework/scripts/libs/abp.blockUI.js")
63+
@Html.IncludeScript("~/Abp/Framework/scripts/libs/abp.spin.js")
64+
@Html.IncludeScript("~/Abp/Framework/scripts/libs/abp.sweet-alert.js")
6265

6366
<!-- Dynamic scripts of ABP system (They are created on runtime and can not be bundled) -->
6467
<script src="~/api/AbpServiceProxies/GetAll"></script>

0 commit comments

Comments
 (0)