Skip to content

Commit 10e2cdf

Browse files
farzindevfarzindev
committed
Layout improvement
1 parent d5e77b6 commit 10e2cdf

File tree

5 files changed

+80
-84
lines changed

5 files changed

+80
-84
lines changed

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

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,34 @@
44
ViewData["Title"] = "Themes";
55
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Packages.cshtml";
66
}
7-
<div class="bf-settings">
87

9-
<!-- Toolbar -->
10-
<div class="bf-toolbar d-flex">
11-
<label class="custom-control custom-checkbox my-auto mr-3">
12-
<input class="custom-control-input item-checkbox" type="checkbox" id="selectAll" name="selectAll">
13-
<span class="item-control custom-control-indicator"></span>
14-
</label>
15-
<div id="postActionButtons" class="btn-group mr-3">
16-
<a asp-controller="Packages" asp-action="Widgets" class="btn btn-outline-secondary btn-sm btn-rounded" style="padding: 0 20px">
17-
<i class="fa fa-arrow-left"></i> &nbsp; Back
18-
</a>
19-
</div>
20-
<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>
8+
<!-- Toolbar -->
9+
<div class="bf-toolbar d-flex">
10+
<label class="custom-control custom-checkbox my-auto mr-3">
11+
<input class="custom-control-input item-checkbox" type="checkbox" id="selectAll" name="selectAll">
12+
<span class="item-control custom-control-indicator"></span>
13+
</label>
14+
<div id="postActionButtons" class="btn-group mr-3">
15+
<a asp-controller="Packages" asp-action="Widgets" class="btn btn-outline-secondary btn-sm btn-rounded" style="padding: 0 20px">
16+
<i class="fa fa-arrow-left"></i> &nbsp; Back
17+
</a>
2118
</div>
22-
<!--/Toolbar -->
23-
24-
@if (Model.Packages.Any())
25-
{
26-
<div class="bf-posts-toolbar">
27-
<form class="bf-posts-search float-right" action="~/admin" method="get">
28-
<input class="form-control form-control-sm" type="search" name="search" placeholder="Search..." autocomplete="off" />
29-
<button class="item-submit" type="submit"><i class="fa fa-search"></i></button>
30-
</form>
31-
</div>
32-
}
33-
else
34-
{
35-
<div class="bf-posts-empty">
36-
No themes found!
37-
</div>
38-
}
19+
<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>
3920
</div>
21+
<!--/Toolbar -->
22+
23+
@if (Model.Packages.Any())
24+
{
25+
<div class="bf-posts-toolbar">
26+
<form class="bf-posts-search float-right" action="~/admin" method="get">
27+
<input class="form-control form-control-sm" type="search" name="search" placeholder="Search..." autocomplete="off" />
28+
<button class="item-submit" type="submit"><i class="fa fa-search"></i></button>
29+
</form>
30+
</div>
31+
}
32+
else
33+
{
34+
<div class="bf-list-empty">
35+
No themes found!
36+
</div>
37+
}

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

Lines changed: 45 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -5,56 +5,54 @@
55
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Packages.cshtml";
66
}
77

8-
<div class="bf-settings">
98

10-
<!-- Toolbar -->
11-
<div class="bf-toolbar d-flex">
12-
<label class="custom-control custom-checkbox my-auto mr-3">
13-
<input class="custom-control-input item-checkbox" type="checkbox" id="selectAll" name="selectAll">
14-
<span class="item-control custom-control-indicator"></span>
15-
</label>
16-
<a asp-controller="Packages" asp-action="Widgets" class="btn btn-outline-secondary btn-sm btn-rounded" style="padding: 0 20px; margin-right: 20px">
17-
<i class="fa fa-arrow-left"></i> &nbsp; Back
18-
</a>
19-
<div id="postActionButtons" class="btn-group mr-3">
20-
<button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return packagesController.enable()" title="Enable"><i class="fa fa-check"></i></button>
21-
<button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return packagesController.disable()" title="Disable"><i class="fa fa-minus"></i></button>
22-
</div>
23-
<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>
9+
<!-- Toolbar -->
10+
<div class="bf-toolbar d-flex">
11+
<label class="custom-control custom-checkbox my-auto mr-3">
12+
<input class="custom-control-input item-checkbox" type="checkbox" id="selectAll" name="selectAll">
13+
<span class="item-control custom-control-indicator"></span>
14+
</label>
15+
<a asp-controller="Packages" asp-action="Widgets" class="btn btn-outline-secondary btn-sm btn-rounded" style="padding: 0 20px; margin-right: 20px">
16+
<i class="fa fa-arrow-left"></i> &nbsp; Back
17+
</a>
18+
<div id="postActionButtons" class="btn-group mr-3">
19+
<button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return packagesController.enable()" title="Enable"><i class="fa fa-check"></i></button>
20+
<button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return packagesController.disable()" title="Disable"><i class="fa fa-minus"></i></button>
2421
</div>
25-
<!--/Toolbar -->
26-
27-
@if (Model.Packages.Any())
28-
{
29-
<ul class="bf-users-list d-block" aria-label="widgets">
30-
@foreach (var item in Model.Packages)
31-
{
32-
var publishedClass = item.Enabled ? "item-status-published" : "item-status-draft";
33-
<li class="post-list-item d-flex">
34-
<label class="item-select custom-control custom-checkbox mr-3 my-auto">
35-
<input type="checkbox" value="@item.Title" class="item-checkbox custom-control-input">
36-
<span class="item-control custom-control-indicator"></span>
37-
</label>
38-
@if (item.HasSettings)
39-
{
40-
<a class="item-link" href="~/admin/packages/widgets/@item.Title">@item.Description</a>
41-
}
42-
else
43-
{
44-
<div class="bf-posts-empty" style="margin-top: 13px">@item.Description</div>
45-
}
46-
<span class="item-status @publishedClass ml-auto my-auto" data-original-title="" title=""><i class="fa fa-circle"></i></span>
47-
</li>
48-
}
49-
</ul>
50-
}
51-
else
52-
{
53-
<div class="bf-posts-empty">
54-
No widgets found!
55-
</div>
56-
}
22+
<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>
5723
</div>
24+
<!--/Toolbar -->
25+
26+
@if (Model.Packages.Any())
27+
{
28+
<ul class="" aria-label="widgets">
29+
@foreach (var item in Model.Packages)
30+
{
31+
var publishedClass = item.Enabled ? "item-status-published" : "item-status-draft";
32+
<li class="d-flex">
33+
<label class="item-select custom-control custom-checkbox mr-3 my-auto">
34+
<input type="checkbox" value="@item.Title" class="item-checkbox custom-control-input">
35+
<span class="item-control custom-control-indicator"></span>
36+
</label>
37+
@if (item.HasSettings)
38+
{
39+
<a class="item-link" href="~/admin/packages/widgets/@item.Title">@item.Description</a>
40+
}
41+
else
42+
{
43+
<div class="bf-posts-empty" style="margin-top: 13px">@item.Description</div>
44+
}
45+
<span class="item-status @publishedClass ml-auto my-auto" data-original-title="" title=""><i class="fa fa-circle"></i></span>
46+
</li>
47+
}
48+
</ul>
49+
}
50+
else
51+
{
52+
<div class="bf-list-empty">
53+
No widgets found!
54+
</div>
55+
}
5856

5957
@section Scripts{
6058
<script src="~/admin/js/app/packagesController.js"></script>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
var postCover = string.IsNullOrEmpty(Model.BlogPost.Image) ? Model.Profile.Image : Model.BlogPost.Image;
66
if (string.IsNullOrEmpty(postCover)) { postCover = BlogSettings.PostCover; }
77
}
8-
<div class="bf-content">
8+
<div class="bf-body">
99
<div id="post-edit" class="bf-editor">
1010

1111
<form id="frmEditor" class="bf-editor-form">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Layout.cshtml";
44
}
55
<div class="bf-header d-flex d-lg-none">Settings / <span></span> <i class="fa fa-chevron-down"></i></div>
6-
<div class="bf-body">
6+
<div class="bf-main">
77
<div class="bf-sidebar d-lg-block">
88
<div class="bf-settings-sidebar">
99
<ul class="bf-settings-sidebar-nav">
@@ -16,10 +16,10 @@
1616
</ul>
1717
</div>
1818
</div>
19-
<div class="bf-content">
19+
<div class="bf-body">
2020
@RenderBody()
2121
</div>
2222
</div>
2323
@section Scripts{
2424
@RenderSection("Scripts", false)
25-
}
25+
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
}
3535
}
3636
<div class="bf-header d-flex d-lg-none">Posts <i class="fa fa-sliders"></i></div>
37-
<div class="bf-body">
37+
<div class="bf-main">
3838
<div class="bf-sidebar d-lg-block">
3939

4040
<form class="bf-posts-search" action="~/admin/posts" method="get">
@@ -101,10 +101,10 @@
101101
</form>
102102

103103
</div>
104-
<div class="bf-content bf-page-posts">
104+
<div class="bf-page-posts">
105105
@RenderBody()
106106
</div>
107107
</div>
108108
@section Scripts{
109109
@RenderSection("Scripts", false)
110-
}
110+
}

0 commit comments

Comments
 (0)