Skip to content

Commit 62ef49a

Browse files
gpeipmangpeipman
committed
moved to bootstrap4
1 parent 5356ef1 commit 62ef49a

Some content is hidden

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

42 files changed

+25608
-10162
lines changed

‎DotNetPaging/DotNetPaging.AspNetCore/TagHelpers/PagerTagHelper.cs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,20 +78,19 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
7878

7979
private void AddPageLink(TagHelperOutput output, string url, string text)
8080
{
81-
output.Content.AppendHtml("<li><a href=\"");
81+
output.Content.AppendHtml("<li class=\"page-item\" ><a href=\"");
8282
output.Content.AppendHtml(url);
83-
output.Content.AppendHtml("\">");
83+
output.Content.AppendHtml("\" class=\"page-link\">");
8484
output.Content.AppendHtml(text);
8585
output.Content.AppendHtml("</a>");
8686
output.Content.AppendHtml("</li>");
8787
}
8888

8989
private void AddCurrentPageLink(TagHelperOutput output, int page)
9090
{
91-
output.Content.AppendHtml("<li class=\"active\">");
92-
output.Content.AppendHtml("<span>");
91+
output.Content.AppendHtml("<li class=\"page-item active\"><a class=\"page-link\">");
9392
output.Content.AppendHtml(page.ToString());
94-
output.Content.AppendHtml("</span>");
93+
output.Content.AppendHtml(" <span class=\"sr-only\">(current)</span>");
9594
output.Content.AppendHtml("</li>");
9695
}
9796
}

‎DotNetPaging/DotNetPaging.AspNetCore/Views/Shared/Components/Pager/Default.cshtml‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
@model PagedResultBase
22
@{
3-
var urlTemplate = Model.LinkTemplate;
3+
var urlTemplate = Url.Action(ViewContext.RouteData.Values["action"].ToString(), new { page = "{0}" });
44
var request = ViewContext.HttpContext.Request;
55
foreach (var key in request.Query.Keys)
66
{
7-
if (key == "page")
7+
if (key.ToString() == "page")
88
{
99
continue;
1010
}
1111

12-
urlTemplate += "&" + key + "=" + request.Query[key];
12+
urlTemplate += "&" + key + "=" + request.Query[key.ToString()];
1313
}
1414

1515
var startIndex = Math.Max(Model.CurrentPage - 5, 1);
@@ -21,21 +21,22 @@
2121
@if (Model.PageCount > 1)
2222
{
2323
<ul class="pagination">
24-
<li><a href="@urlTemplate.Replace("%7B0%7D", "1")">&laquo;</a></li>
24+
<li class="page-item"><a href="@urlTemplate.Replace("%7B0%7D", "1")" class="page-link">&laquo;</a></li>
2525
@for (var i = startIndex; i <= finishIndex; i++)
2626
{
27-
@if (i == Model.CurrentPage)
27+
if (i == Model.CurrentPage)
2828
{
2929

30-
<li class="active"><span>@i</span></li>
30+
<li class="page-item active"><a class="page-link">@i <span class="sr-only">(current)</span></a></li>
3131
}
3232
else
3333
{
3434

35-
<li><a href="@urlTemplate.Replace("%7B0%7D", i.ToString())">@i</a></li>
35+
<li class="page-item"><a href="@urlTemplate.Replace("%7B0%7D", i.ToString())" class="page-link">@i</a></li>
3636
}
3737
}
38-
<li><a href="@urlTemplate.Replace("%7B0%7D", Model.PageCount.ToString())">&raquo;</a></li>
39-
</ul>}
38+
<li class="page-item"><a href="@urlTemplate.Replace("%7B0%7D", Model.PageCount.ToString())" class="page-link">&raquo;</a></li>
39+
</ul>
40+
}
4041
</div>
4142
</div>

‎DotNetPaging/DotNetPaging.AspNetCore/Views/Shared/_Layout.cshtml‎

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,29 @@
66
<title>@ViewData["Title"] - DotNetPaging</title>
77

88
<environment include="Development">
9-
<link rel="stylesheet" href="~/lib/bootstrap/dist/css/bootstrap.css" />
9+
<link rel="stylesheet" href="~/lib/bootstrap/bootstrap.css" />
1010
<link rel="stylesheet" href="~/css/site.css" />
1111
</environment>
1212
<environment exclude="Development">
13-
<link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/css/bootstrap.min.css"
14-
asp-fallback-href="~/lib/bootstrap/dist/css/bootstrap.min.css"
13+
<link rel="stylesheet" href="https://ajax.aspnetcdn.com/ajax/bootstrap/4.3.1/css/bootstrap.min.css"
14+
asp-fallback-href="~/lib/bootstrap/bootstrap.min.css"
1515
asp-fallback-test-class="sr-only" asp-fallback-test-property="position" asp-fallback-test-value="absolute" />
1616
<link rel="stylesheet" href="~/css/site.min.css" asp-append-version="true" />
1717
</environment>
1818
</head>
1919
<body>
20-
<nav class="navbar navbar-inverse navbar-fixed-top">
20+
<nav class="navbar navbar-expand-lg navbar-light bg-light">
2121
<div class="container">
2222
<div class="navbar-header">
23-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
24-
<span class="sr-only">Toggle navigation</span>
25-
<span class="icon-bar"></span>
26-
<span class="icon-bar"></span>
27-
<span class="icon-bar"></span>
28-
</button>
2923
<a asp-area="" asp-controller="Home" asp-action="Index" class="navbar-brand">DotNetPaging</a>
3024
</div>
31-
<div class="navbar-collapse collapse">
32-
<ul class="nav navbar-nav">
33-
<li><a asp-area="" asp-controller="Home" asp-action="Index">Home</a></li>
34-
<li><a asp-area="" asp-controller="Home" asp-action="Async">Async</a></li>
35-
<li><a asp-area="" asp-controller="Home" asp-action="AutoMapper">AutoMapper</a></li>
36-
<li><a asp-area="" asp-controller="Home" asp-action="TagHelper">TagHelper</a></li>
37-
</ul>
25+
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
26+
<div class="navbar-nav">
27+
<a asp-area="" asp-controller="Home" asp-action="Index" class="nav-item nav-link">Home</a>
28+
<a asp-area="" asp-controller="Home" asp-action="Async" class="nav-item nav-link">Async</a>
29+
<a asp-area="" asp-controller="Home" asp-action="AutoMapper" class="nav-item nav-link">AutoMapper</a>
30+
<a asp-area="" asp-controller="Home" asp-action="TagHelper" class="nav-item nav-link">TagHelper</a>
31+
</div>
3832
</div>
3933
</div>
4034
</nav>
@@ -59,7 +53,7 @@
5953
integrity="sha384-K+ctZQ+LL8q6tP7I94W+qzQsfRV2a+AfHIi9k8z8l9ggpc8X+Ytst4yBo/hH+8Fk">
6054
</script>
6155
<script src="https://ajax.aspnetcdn.com/ajax/bootstrap/3.3.7/bootstrap.min.js"
62-
asp-fallback-src="~/lib/bootstrap/dist/js/bootstrap.min.js"
56+
asp-fallback-src="~/lib/bootstrap/bootstrap.min.js"
6357
asp-fallback-test="window.jQuery && window.jQuery.fn && window.jQuery.fn.modal"
6458
crossorigin="anonymous"
6559
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa">

‎DotNetPaging/DotNetPaging.AspNetCore/wwwroot/lib/bootstrap/.bower.json‎

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎DotNetPaging/DotNetPaging.AspNetCore/wwwroot/lib/bootstrap/LICENSE‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)