Skip to content

Commit 2c6b1b2

Browse files
s0uven1rsumit.gautam
s0uven1r
and
sumit.gautam
authored
missing pagination attributes for css classes are added. (simplcommerce#950)
Co-authored-by: sumit.gautam <sumit.gautam@ekbana.info>
1 parent 2e35f27 commit 2c6b1b2

File tree

6 files changed

+170
-139
lines changed

6 files changed

+170
-139
lines changed

‎src/Modules/SimplCommerce.Module.Catalog/Areas/Catalog/Views/Brand/BrandDetail.cshtml‎

Lines changed: 63 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -24,61 +24,62 @@
2424
<div id="collapse-category" class="collapse show" aria-labelledby="cardHeaderCategory" data-parent="#accordion-category">
2525
<div class="card-body">
2626
<ul class="list-unstyled checkbox-list">
27-
@foreach (var category in Model.FilterOption.Categories.Where(x => x.ParentId == null))
28-
{
29-
<li>
30-
<label class="checkbox">
31-
<input type="checkbox" value="@category.Slug" name="category" checked="@Model.CurrentSearchOption.GetCategories().Contains(category.Slug)">
32-
@category.Name
33-
<small>(@category.Count)</small>
34-
</label>
35-
@{ var children = Model.FilterOption.Categories.Where(x => x.ParentId == category.Id); }
36-
@if (children.Any())
37-
{
38-
<ul class="list-unstyled checkbox-list">
39-
@foreach (var child in children)
27+
@foreach (var category in Model.FilterOption.Categories.Where(x => x.ParentId == null))
4028
{
41-
<li>
42-
<label class="checkbox">
43-
<input type="checkbox" value="@child.Slug" name="category" checked="@Model.CurrentSearchOption.GetCategories().Contains(child.Slug)">
44-
@child.Name
45-
<small>(@child.Count)</small>
46-
</label>
47-
</li>
29+
<li>
30+
<label class="checkbox">
31+
<input type="checkbox" value="@category.Slug" name="category" checked="@Model.CurrentSearchOption.GetCategories().Contains(category.Slug)">
32+
@category.Name
33+
<small>(@category.Count)</small>
34+
</label>
35+
@{ var children = Model.FilterOption.Categories.Where(x => x.ParentId == category.Id); }
36+
@if (children.Any())
37+
{
38+
<ul class="list-unstyled checkbox-list">
39+
@foreach (var child in children)
40+
{
41+
<li>
42+
<label class="checkbox">
43+
<input type="checkbox" value="@child.Slug" name="category" checked="@Model.CurrentSearchOption.GetCategories().Contains(child.Slug)">
44+
@child.Name
45+
<small>(@child.Count)</small>
46+
</label>
47+
</li>
48+
}
49+
</ul>
50+
}
51+
</li>
4852
}
49-
</ul>
50-
}
51-
</li>
52-
}
5353
</ul>
5454
</div>
5555
</div>
5656
</div>
5757
</div>
58-
@if (Model.FilterOption.Price.MaxPrice != Model.FilterOption.Price.MinPrice) {
59-
<div id="accordion-price" class="mt-4">
60-
<div class="card">
61-
<div class="card-header" id="cardHeaderPrice">
62-
<h5 class="mb-0">
63-
<a data-toggle="collapse" href="#collapse-price" aria-expanded="true" aria-controls="collapse-price">
64-
@Localizer["Price"]
65-
<i class="fa fa-angle-down"></i>
66-
</a>
67-
</h5>
68-
</div>
69-
<div id="collapse-price" class="collapse show" aria-labelledby="cardHeaderPrice" data-parent="#accordion-price">
70-
<div class="card-body">
71-
<div id="priceSlider"></div>
72-
<div>
73-
<input type="hidden" id="originMinPrice" value="@Model.FilterOption.Price.MinPrice.ToString("F0")"/>
74-
<input type="hidden" id="originMaxPrice" value="@Model.FilterOption.Price.MaxPrice.ToString("F0")" />
75-
<span id="minPrice"></span>
76-
<span id="maxPrice"></span>
58+
@if (Model.FilterOption.Price.MaxPrice != Model.FilterOption.Price.MinPrice)
59+
{
60+
<div id="accordion-price" class="mt-4">
61+
<div class="card">
62+
<div class="card-header" id="cardHeaderPrice">
63+
<h5 class="mb-0">
64+
<a data-toggle="collapse" href="#collapse-price" aria-expanded="true" aria-controls="collapse-price">
65+
@Localizer["Price"]
66+
<i class="fa fa-angle-down"></i>
67+
</a>
68+
</h5>
69+
</div>
70+
<div id="collapse-price" class="collapse show" aria-labelledby="cardHeaderPrice" data-parent="#accordion-price">
71+
<div class="card-body">
72+
<div id="priceSlider"></div>
73+
<div>
74+
<input type="hidden" id="originMinPrice" value="@Model.FilterOption.Price.MinPrice.ToString("F0")" />
75+
<input type="hidden" id="originMaxPrice" value="@Model.FilterOption.Price.MaxPrice.ToString("F0")" />
76+
<span id="minPrice"></span>
77+
<span id="maxPrice"></span>
78+
</div>
7779
</div>
7880
</div>
7981
</div>
8082
</div>
81-
</div>
8283
}
8384
</form>
8485
</div>
@@ -102,18 +103,18 @@
102103
</div>
103104
</li>
104105
@*<li class="pagination-option">
105-
<label>Show :</label>
106-
<div class="btn-group">
107-
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
108-
20 <span class="caret"></span>
109-
</button>
110-
<ul class="dropdown-menu" role="menu">
111-
<li><a href="#">All</a></li>
112-
<li><a href="#">50</a></li>
113-
<li><a href="#">30</a></li>
114-
</ul>
115-
</div>
116-
</li>*@
106+
<label>Show :</label>
107+
<div class="btn-group">
108+
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
109+
20 <span class="caret"></span>
110+
</button>
111+
<ul class="dropdown-menu" role="menu">
112+
<li><a href="#">All</a></li>
113+
<li><a href="#">50</a></li>
114+
<li><a href="#">30</a></li>
115+
</ul>
116+
</div>
117+
</li>*@
117118
</ul>
118119
</div>
119120
</div>
@@ -132,7 +133,12 @@
132133
cs-paging-totalitems="@Model.TotalProduct"
133134
cs-pagenumber-param="page"
134135
asp-basehref="~/@Model.BrandSlug"
135-
asp-all-route-data="@Model.CurrentSearchOption.ToDictionary()"></cs-pager>
136+
asp-all-route-data="@Model.CurrentSearchOption.ToDictionary()"
137+
cs-pager-li-current-class="page-item active"
138+
cs-pager-li-other-class="page-item"
139+
cs-pager-li-non-active-class="page-item disabled"
140+
cs-pager-link-current-class="page-link"
141+
cs-pager-link-other-class="page-link"></cs-pager>
136142
</div>
137143
</div>
138144
</div>

‎src/Modules/SimplCommerce.Module.Catalog/Areas/Catalog/Views/Category/CategoryDetail.cshtml‎

Lines changed: 45 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -27,53 +27,53 @@
2727
<div class="col-md-3 product-list-filters">
2828
<h3>@Localizer["Filter by"]</h3>
2929
<form id="productFilter" name="productFilter" method="GET" action="~/@Model.CategorySlug">
30-
@if (Model.FilterOption.Categories.Where(x => x.ParentId == Model.CategoryId).Any())
30+
@if (Model.FilterOption.Categories.Where(x => x.ParentId == Model.CategoryId).Any())
3131
{
32-
<div id="accordion-category">
33-
<div class="card">
34-
<div class="card-header" id="cardHeaderCategory">
35-
<h5 class="mb-0">
36-
<a data-toggle="collapse" href="#collapse-category" aria-expanded="true" aria-controls="collapse-category">
37-
@Localizer["Category"]
38-
<i class="fa fa-angle-down"></i>
39-
</a>
40-
</h5>
41-
</div>
42-
<div id="collapse-category" class="collapse show" aria-labelledby="cardHeaderCategory" data-parent="#accordion-category">
43-
<div class="card-body">
44-
<ul class="list-unstyled checkbox-list">
45-
@foreach (var category in Model.FilterOption.Categories.Where(x => x.ParentId == Model.CategoryId))
46-
{
47-
<li>
48-
<label class="checkbox">
49-
<input type="checkbox" value="@category.Slug" name="category" checked="@Model.CurrentSearchOption.GetCategories().Contains(category.Slug)">
50-
@category.Name
51-
<small>(@category.Count)</small>
52-
</label>
53-
@{ var children = Model.FilterOption.Categories.Where(x => x.ParentId == category.Id); }
54-
@if (children.Any())
55-
{
56-
<ul class="list-unstyled checkbox-list">
57-
@foreach (var child in children)
58-
{
32+
<div id="accordion-category">
33+
<div class="card">
34+
<div class="card-header" id="cardHeaderCategory">
35+
<h5 class="mb-0">
36+
<a data-toggle="collapse" href="#collapse-category" aria-expanded="true" aria-controls="collapse-category">
37+
@Localizer["Category"]
38+
<i class="fa fa-angle-down"></i>
39+
</a>
40+
</h5>
41+
</div>
42+
<div id="collapse-category" class="collapse show" aria-labelledby="cardHeaderCategory" data-parent="#accordion-category">
43+
<div class="card-body">
44+
<ul class="list-unstyled checkbox-list">
45+
@foreach (var category in Model.FilterOption.Categories.Where(x => x.ParentId == Model.CategoryId))
46+
{
5947
<li>
6048
<label class="checkbox">
61-
<input type="checkbox" value="@child.Slug" name="category" checked="@Model.CurrentSearchOption.GetCategories().Contains(child.Slug)">
62-
@child.Name
63-
<small>(@child.Count)</small>
49+
<input type="checkbox" value="@category.Slug" name="category" checked="@Model.CurrentSearchOption.GetCategories().Contains(category.Slug)">
50+
@category.Name
51+
<small>(@category.Count)</small>
6452
</label>
53+
@{ var children = Model.FilterOption.Categories.Where(x => x.ParentId == category.Id); }
54+
@if (children.Any())
55+
{
56+
<ul class="list-unstyled checkbox-list">
57+
@foreach (var child in children)
58+
{
59+
<li>
60+
<label class="checkbox">
61+
<input type="checkbox" value="@child.Slug" name="category" checked="@Model.CurrentSearchOption.GetCategories().Contains(child.Slug)">
62+
@child.Name
63+
<small>(@child.Count)</small>
64+
</label>
65+
</li>
66+
}
67+
</ul>
68+
}
6569
</li>
66-
}
67-
</ul>
68-
}
69-
</li>
70-
}
71-
</ul>
70+
}
71+
</ul>
72+
</div>
7273
</div>
7374
</div>
7475
</div>
75-
</div>
76-
}
76+
}
7777
<div id="accordion-brand" class="mt-4">
7878
<div class="card">
7979
<div class="card-header" id="cardBrandHeader">
@@ -175,7 +175,12 @@
175175
cs-paging-totalitems="@Model.TotalProduct"
176176
cs-pagenumber-param="page"
177177
asp-basehref="~/@Model.CategorySlug"
178-
asp-all-route-data="@Model.CurrentSearchOption.ToDictionary()"></cs-pager>
178+
asp-all-route-data="@Model.CurrentSearchOption.ToDictionary()"
179+
cs-pager-li-current-class="page-item active"
180+
cs-pager-li-other-class="page-item"
181+
cs-pager-li-non-active-class="page-item disabled"
182+
cs-pager-link-current-class="page-link"
183+
cs-pager-link-other-class="page-link"></cs-pager>
179184
</div>
180185
</div>
181186
</div>

‎src/Modules/SimplCommerce.Module.News/Areas/News/Views/NewsCategory/NewsCategoryDetail.cshtml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@
3232
cs-paging-pagenumber="@Model.Page"
3333
cs-paging-totalitems="@Model.TotalItem"
3434
asp-basehref="~/@Model.CurrentNewsCategory.Slug"
35-
cs-pagenumber-param="page"></cs-pager>
35+
cs-pagenumber-param="page"
36+
cs-pager-li-current-class="page-item active"
37+
cs-pager-li-other-class="page-item"
38+
cs-pager-li-non-active-class="page-item disabled"
39+
cs-pager-link-current-class="page-link"
40+
cs-pager-link-other-class="page-link"></cs-pager>
3641
</div>
3742
</div>
3843

‎src/Modules/SimplCommerce.Module.News/Areas/News/Views/NewsItem/NewsHome.cshtml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@
3232
cs-paging-pagenumber="@Model.Page"
3333
cs-paging-totalitems="@Model.TotalItem"
3434
asp-basehref="~/news"
35-
cs-pagenumber-param="page"></cs-pager>
35+
cs-pagenumber-param="page"
36+
cs-pager-li-current-class="page-item active"
37+
cs-pager-li-other-class="page-item"
38+
cs-pager-li-non-active-class="page-item disabled"
39+
cs-pager-link-current-class="page-link"
40+
cs-pager-link-other-class="page-link"></cs-pager>
3641
</div>
3742
</div>
3843

‎src/Modules/SimplCommerce.Module.Search/Areas/Search/Views/Search/Index.cshtml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,12 @@
160160
cs-paging-totalitems="@Model.TotalProduct"
161161
cs-pagenumber-param="page"
162162
asp-basehref="~/search"
163-
asp-all-route-data="@Model.CurrentSearchOption.ToDictionary()"></cs-pager>
163+
asp-all-route-data="@Model.CurrentSearchOption.ToDictionary()"
164+
cs-pager-li-current-class="page-item active"
165+
cs-pager-li-other-class="page-item"
166+
cs-pager-li-non-active-class="page-item disabled"
167+
cs-pager-link-current-class="page-link"
168+
cs-pager-link-other-class="page-link"></cs-pager>
164169
</div>
165170
</div>
166171
</div>

0 commit comments

Comments
 (0)