Skip to content

Commit 2c4c5e0

Browse files
farzindevfarzindev
committed
JS improvement overall
1 parent 4d1ca03 commit 2c4c5e0

File tree

6 files changed

+126
-156
lines changed

6 files changed

+126
-156
lines changed

‎Blogifier.Web/Views/Blogifier/Admin/Packages/Widgets.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
@if (Model.Packages.Any())
2626
{
27-
<ul class="bf-list" aria-label="widgets">
27+
<ul class="bf-list bf-packages-list" aria-label="widgets">
2828
@foreach (var item in Model.Packages)
2929
{
3030
var publishedClass = item.Enabled ? "published" : "draft";

‎Blogifier.Web/Views/Blogifier/Admin/Posts/Index.cshtml‎

Lines changed: 59 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
user = "0";
1616
}
1717
var postListStyle = "grid";
18-
if(Model.CustomFields.ContainsKey(Constants.PostListStyle))
18+
if (Model.CustomFields.ContainsKey(Constants.PostListStyle))
1919
{
2020
postListStyle = Model.CustomFields["PostListStyle"];
2121
}
@@ -31,7 +31,7 @@
3131
}
3232

3333
var qs = "";
34-
if(user != "0")
34+
if (user != "0")
3535
{
3636
qs += $"&user={user}";
3737
}
@@ -55,39 +55,37 @@
5555
<div class="bf-toolbar d-flex">
5656
<label class="custom-control custom-checkbox my-auto mr-3" data-tooltip title="Select All"><input class="custom-control-input item-checkbox" type="checkbox" name="selectAll"><span class="item-control custom-control-indicator"></span></label>
5757
<div id="postActionButtons" class="btn-group mr-3">
58-
<button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return postsController.removePost()" title="Delete"><i class="fa fa-trash"></i></button>
59-
<button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return postsController.unpublish()" title="Unpublish"><i class="fa fa-archive"></i></button>
60-
<button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return postsController.publish()" title="Publish"><i class="fa fa-check"></i></button>
58+
<button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return postsController.removePost()" title="Delete"><i class="fa fa-trash"></i></button>
59+
<button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return postsController.unpublish()" title="Unpublish"><i class="fa fa-archive"></i></button>
60+
<button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return postsController.publish()" title="Publish"><i class="fa fa-check"></i></button>
6161
</div>
6262
<div class="loading loading-sm mr-3"><div class="loading-dot-1"></div><div class="loading-dot-2"></div><div class="loading-dot-3"></div></div>
6363
<div class="dropdown dropdown-custom ml-auto mr-3 d-none d-lg-block">
64-
<button class="btn btn-sm btn-outline-secondary btn-rounded dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
65-
<span class="dropdown-value">@postListSize</span> Posts
66-
</button>
67-
<div class="dropdown-menu dropdown-menu-wide" aria-labelledby="dropdownMenuButton">
68-
<button class="dropdown-item" type="button" onclick="postsController.selectListSize('10')">10</button>
69-
<button class="dropdown-item" type="button" onclick="postsController.selectListSize('20')">20</button>
70-
<button class="dropdown-item" type="button" onclick="postsController.selectListSize('30')">30</button>
71-
<button class="dropdown-item" type="button" onclick="postsController.selectListSize('40')">40</button>
72-
<button class="dropdown-item" type="button" onclick="postsController.selectListSize('50')">50</button>
73-
</div>
64+
<button class="btn btn-sm btn-outline-secondary btn-rounded dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
65+
<span class="dropdown-value">@postListSize</span> Posts
66+
</button>
67+
<div class="dropdown-menu dropdown-menu-wide" aria-labelledby="dropdownMenuButton">
68+
<button class="dropdown-item" type="button" onclick="postsController.selectListSize('10')">10</button>
69+
<button class="dropdown-item" type="button" onclick="postsController.selectListSize('20')">20</button>
70+
<button class="dropdown-item" type="button" onclick="postsController.selectListSize('30')">30</button>
71+
<button class="dropdown-item" type="button" onclick="postsController.selectListSize('40')">40</button>
72+
<button class="dropdown-item" type="button" onclick="postsController.selectListSize('50')">50</button>
73+
</div>
7474
</div>
7575
<div class="btn-group ml-auto ml-lg-0">
76-
<button id="post-list-btn" type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded @listBtnStyle" data-tooltip onclick="postsController.togglePostView('list')" title="List style"><i class="fa fa-list"></i></button>
77-
<button id="post-grid-btn" type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded @gridBtnStyle" data-tooltip onclick="postsController.togglePostView('grid')" title="Grid style"><i class="fa fa-th"></i></button>
76+
<button id="post-list-btn" type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded @listBtnStyle" data-tooltip onclick="postsController.togglePostView('list')" title="List style"><i class="fa fa-list"></i></button>
77+
<button id="post-grid-btn" type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded @gridBtnStyle" data-tooltip onclick="postsController.togglePostView('grid')" title="Grid style"><i class="fa fa-th"></i></button>
7878
</div>
7979
</div>
8080
<!--/Toolbar -->
81-
8281
<!-- Search -->
8382
@if (!string.IsNullOrEmpty(searchTerm))
8483
{
85-
<div class="bf-post-search">
86-
<a href="~/@returnUrl"><i class="fa fa-chevron-left"></i><span>Search Result: @searchTerm</span></a>
87-
</div>
84+
<div class="bf-post-search">
85+
<a href="~/@returnUrl"><i class="fa fa-chevron-left"></i><span>Search Result: @searchTerm</span></a>
86+
</div>
8887
}
8988
<!--/Search -->
90-
9189
<!-- List -->
9290
<ul class="bf-list bf-posts-list @listStyle" aria-label="posts">
9391
@foreach (var item in Model.BlogPosts)
@@ -100,40 +98,50 @@
10098
<a class="bf-list-item-link" href="~/admin/posts/editor/@item.BlogPostId?user=@user">@item.Title</a>
10199
<span class="bf-list-item-status bf-list-item-status-@postStatus ml-auto" data-tooltip title="@postStatus"><i class="fa fa-circle"></i></span>
102100
<span class="bf-list-item-date ml-3 d-none d-lg-block">@publishedLbl</span>
103-
@if (Model.Profile.IsAdmin) {
104-
<button class="btn-unstyled bf-list-item-favorite ml-3" data-tooltip title="featured" onclick="postsController.featured('@item.BlogPostId', this)"> @if (item.IsFeatured) { <i class="fa fa-star"></i> } else { <i class="fa fa-star-o"></i> } </button>
101+
@if (Model.Profile.IsAdmin)
102+
{
103+
<button class="btn-unstyled bf-list-item-favorite ml-3" data-tooltip title="featured" onclick="postsController.featured('@item.BlogPostId', this)">
104+
@if (item.IsFeatured)
105+
{ <i class="fa fa-star"></i> }
106+
else
107+
{ <i class="fa fa-star-o"></i> }
108+
</button>
105109
}
106110
<a class="bf-list-item-show ml-3" href="~/@ApplicationSettings.BlogRoute@item.Slug" target="_blank" data-tooltip title="View"><i class="fa fa-external-link-square"></i></a>
107111
</li>
108112
}
109113
</ul>
110114
<!--/List -->
111-
112115
<!-- Grid -->
113116
<div class="bf-posts-grid @gridStyle" aria-label="posts">
114-
@foreach (var item in Model.BlogPosts)
115-
{
116-
var publishedLbl = item.Published == DateTime.MinValue ? item.LastUpdated.ToString("MMM dd, yyyy") : item.Published.ToString("MMM dd, yyyy");
117-
var postStatus = item.Published == DateTime.MinValue ? "draft" : "published";
118-
if (curPost == 0) { curPost = item.BlogPostId; }
119-
<div class="post-grid-col">
120-
<div class="post-grid-item">
121-
<a class="item-link" href="~/admin/posts/editor/@item.BlogPostId?user=@user" style="background-image:url(@item.Image);"><div class="item-title mt-auto">@item.Title</div></a>
122-
<div class="item-info d-flex">
123-
<label class="item-select custom-control custom-checkbox mr-3 my-auto" data-tooltip title="Select"><input type="checkbox" id="@item.BlogPostId" class="item-checkbox custom-control-input"><span class="item-control custom-control-indicator"></span></label>
124-
<span class="item-date my-auto">@publishedLbl</span>
125-
<span class="item-status item-status-@postStatus my-auto ml-auto" data-tooltip title="@postStatus"><i class="fa fa-circle"></i></span>
126-
@if (Model.Profile.IsAdmin) {
127-
<button class="btn-unstyled item-favorite my-auto ml-3" data-tooltip title="featured" onclick="postsController.featured('@item.BlogPostId', this)"> @if (item.IsFeatured) { <i class="fa fa-star"></i> } else { <i class="fa fa-star-o"></i> } </button>
128-
}
129-
<a class="item-show my-auto ml-3" href="~/@ApplicationSettings.BlogRoute@item.Slug" target="_blank" data-tooltip title="View"><i class="fa fa-external-link-square"></i></a>
117+
@foreach (var item in Model.BlogPosts)
118+
{
119+
var publishedLbl = item.Published == DateTime.MinValue ? item.LastUpdated.ToString("MMM dd, yyyy") : item.Published.ToString("MMM dd, yyyy");
120+
var postStatus = item.Published == DateTime.MinValue ? "draft" : "published";
121+
if (curPost == 0) { curPost = item.BlogPostId; }
122+
<div class="post-grid-col">
123+
<div class="post-grid-item">
124+
<a class="item-link" href="~/admin/posts/editor/@item.BlogPostId?user=@user" style="background-image:url(@item.Image);"><div class="item-title mt-auto">@item.Title</div></a>
125+
<div class="item-info d-flex">
126+
<label class="item-select custom-control custom-checkbox mr-3 my-auto" data-tooltip title="Select"><input type="checkbox" id="@item.BlogPostId" class="item-checkbox custom-control-input"><span class="item-control custom-control-indicator"></span></label>
127+
<span class="item-date my-auto">@publishedLbl</span>
128+
<span class="item-status item-status-@postStatus my-auto ml-auto" data-tooltip title="@postStatus"><i class="fa fa-circle"></i></span>
129+
@if (Model.Profile.IsAdmin)
130+
{
131+
<button class="btn-unstyled item-favorite my-auto ml-3" data-tooltip title="featured" onclick="postsController.featured('@item.BlogPostId', this)">
132+
@if (item.IsFeatured)
133+
{ <i class="fa fa-star"></i> }
134+
else
135+
{ <i class="fa fa-star-o"></i> }
136+
</button>
137+
}
138+
<a class="item-show my-auto ml-3" href="~/@ApplicationSettings.BlogRoute@item.Slug" target="_blank" data-tooltip title="View"><i class="fa fa-external-link-square"></i></a>
139+
</div>
140+
</div>
130141
</div>
131-
</div>
132-
</div>
133-
}
142+
}
134143
</div>
135144
<!--/Grid -->
136-
137145
<!-- Empty -->
138146
@if (Model.BlogPosts.Count() == 0)
139147
{
@@ -142,7 +150,6 @@
142150
</div>
143151
}
144152
<!--/Empty -->
145-
146153
<!-- Pagination -->
147154
@if (pgr.ShowNewer || pgr.ShowOlder)
148155
{
@@ -162,10 +169,10 @@
162169

163170
@Html.Partial($"~/{ApplicationSettings.BlogAdminFolder}/_Shared/_FileManager.cshtml")
164171
@section Scripts{
165-
<script src="~/admin/js/app/postsController.js"></script>
166-
<script>
167-
var submitFilter = function () {
168-
$('#frmPostFilter').submit();
169-
}
170-
</script>
172+
<script src="~/admin/js/app/postsController.js"></script>
173+
<script>
174+
var submitFilter = function () {
175+
$('#frmPostFilter').submit();
176+
}
177+
</script>
171178
}

‎Blogifier.Web/Views/Blogifier/Admin/Settings/Users.cshtml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -11,40 +11,40 @@
1111
var cntTo = pgr.CurrentPage * pgr.ItemsPerPage < pgr.Total ? pgr.CurrentPage * pgr.ItemsPerPage : pgr.Total;
1212
}
1313
<div class="bf-settings">
14-
<div class="bf-toolbar d-flex">
15-
<label class="custom-control custom-checkbox my-auto mr-3"><input class="custom-control-input item-checkbox" type="checkbox" name="selectAll"><span class="item-control custom-control-indicator"></span></label>
16-
<button type="button" class="btn btn-primary btn-rounded btn-sm mr-3" data-toggle="modal" data-target="#createUserModal">Create User</button>
17-
<button type="button" id="userActionButtons" class="btn btn-outline-secondary btn-rounded btn-sm btn-icon mr-3" disabled="disabled" data-tooltip onclick="return usersController.removeUser()" title="Delete"><i class="fa fa-trash"></i></button>
18-
<div class="loading loading-sm"><div class="loading-dot-1"></div><div class="loading-dot-2"></div><div class="loading-dot-3"></div></div>
19-
</div>
20-
<ul class="bf-list d-block" aria-label="posts">
21-
@foreach (var blog in Model.Blogs)
22-
{
23-
<li class="bf-list-item d-flex align-items-center">
24-
@if (!blog.IsAdmin)
25-
{
26-
<label class="bf-list-item-select custom-control custom-checkbox mr-3"><input type="checkbox" id="@blog.ProfileId" class="item-checkbox custom-control-input"><span class="item-control custom-control-indicator"></span></label>
27-
}
28-
<span class="bf-list-item-name">@blog.AuthorName</span>
29-
<span class="bf-list-item-text ml-auto mr-3">@blog.PostCount Posts</span>
30-
<a class="bf-list-item-show" href="@blog.Url" target="_blank" role="button"><i class="fa fa-external-link-square"></i></a>
31-
</li>
32-
}
33-
</ul>
34-
@if (pgr.ShowNewer || pgr.ShowOlder)
35-
{
36-
<ul class="bf-posts-pagination">
37-
@if (pgr.ShowOlder)
38-
{
39-
<li class="item"><a class="item-link" href="~/admin/settings/application?page=@pgr.Older"><i class="fa fa-chevron-left"></i></a></li>
40-
}
41-
@if (pgr.ShowNewer)
42-
{
43-
<li class="item"><a class="item-link" href="~/admin/settings/application?page=@pgr.Newer"><i class="fa fa-chevron-right"></i></a></li>
44-
}
45-
<li class="item"><a class="item-count">@cntFrom-@cntTo out of @pgr.Total</a></li>
46-
</ul>
47-
}
14+
<div class="bf-toolbar d-flex">
15+
<label class="custom-control custom-checkbox my-auto mr-3"><input class="custom-control-input item-checkbox" type="checkbox" name="selectAll"><span class="item-control custom-control-indicator"></span></label>
16+
<button type="button" class="btn btn-primary btn-rounded btn-sm mr-3" data-toggle="modal" data-target="#createUserModal">Create User</button>
17+
<button type="button" id="userActionButtons" class="btn btn-outline-secondary btn-rounded btn-sm btn-icon mr-3" disabled="disabled" data-tooltip onclick="return usersController.removeUser()" title="Delete"><i class="fa fa-trash"></i></button>
18+
<div class="loading loading-sm"><div class="loading-dot-1"></div><div class="loading-dot-2"></div><div class="loading-dot-3"></div></div>
19+
</div>
20+
<ul class="bf-list bf-users d-block" aria-label="posts">
21+
@foreach (var blog in Model.Blogs)
22+
{
23+
<li class="bf-list-item d-flex align-items-center">
24+
@if (!blog.IsAdmin)
25+
{
26+
<label class="bf-list-item-select custom-control custom-checkbox mr-3"><input type="checkbox" id="@blog.ProfileId" class="item-checkbox custom-control-input"><span class="item-control custom-control-indicator"></span></label>
27+
}
28+
<span class="bf-list-item-name">@blog.AuthorName</span>
29+
<span class="bf-list-item-text ml-auto mr-3">@blog.PostCount Posts</span>
30+
<a class="bf-list-item-show" href="@blog.Url" target="_blank" role="button"><i class="fa fa-external-link-square"></i></a>
31+
</li>
32+
}
33+
</ul>
34+
@if (pgr.ShowNewer || pgr.ShowOlder)
35+
{
36+
<ul class="bf-posts-pagination">
37+
@if (pgr.ShowOlder)
38+
{
39+
<li class="item"><a class="item-link" href="~/admin/settings/application?page=@pgr.Older"><i class="fa fa-chevron-left"></i></a></li>
40+
}
41+
@if (pgr.ShowNewer)
42+
{
43+
<li class="item"><a class="item-link" href="~/admin/settings/application?page=@pgr.Newer"><i class="fa fa-chevron-right"></i></a></li>
44+
}
45+
<li class="item"><a class="item-count">@cntFrom-@cntTo out of @pgr.Total</a></li>
46+
</ul>
47+
}
4848
</div>
4949

5050
<!-- Create User Modal -->
@@ -82,15 +82,15 @@
8282
<div class="form-group">
8383
<div class="checkbox">
8484
<label class="custom-control custom-checkbox my-auto mr-3">
85-
<input class="custom-control-input" type="checkbox" asp-for="RegisterModel.IsAdmin" >
86-
<span class="custom-control-indicator"></span>
87-
<span class="custom-control-description"> @Html.DisplayNameFor(m => m.RegisterModel.IsAdmin)</span>
85+
<input class="custom-control-input" type="checkbox" asp-for="RegisterModel.IsAdmin">
86+
<span class="custom-control-indicator"></span>
87+
<span class="custom-control-description"> @Html.DisplayNameFor(m => m.RegisterModel.IsAdmin)</span>
8888
</label>
8989
</div>
9090
</div>
9191
<div class="form-group">
9292
<label class="custom-control custom-checkbox my-auto mr-3">
93-
<input class="custom-control-input" type="checkbox" asp-for="RegisterModel.SendEmailNotification" >
93+
<input class="custom-control-input" type="checkbox" asp-for="RegisterModel.SendEmailNotification">
9494
<span class="custom-control-indicator"></span>
9595
<span class="custom-control-description">@Html.DisplayNameFor(m => m.RegisterModel.SendEmailNotification)</span>
9696
</label>

‎Blogifier.Web/Views/Blogifier/Admin/_Layout/_Packages.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@{
33
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Layout.cshtml";
44
}
5-
<div class="bf-header d-flex d-lg-none">Settings / <span></span> <i class="fa fa-chevron-down"></i></div>
5+
<div class="bf-header d-flex d-lg-none">@ViewData["Title"] <i class="fa fa-chevron-down"></i></div>
66
<div class="bf-main">
77
<div class="bf-sidebar d-lg-block">
88
<div class="bf-settings-sidebar">

0 commit comments

Comments
 (0)