Skip to content

Commit 07e6105

Browse files
farzindevfarzindev
committed
packages improvemetn
1 parent f759b91 commit 07e6105

File tree

5 files changed

+134
-61
lines changed

5 files changed

+134
-61
lines changed

‎Blogifier.Core/Common/ApplicationSettings.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ public class ApplicationSettings
1010

1111
// default value is "blog/" for blogifier to use "site.com/blog"
1212
// if empty string, blog takes over the application
13-
// so instead of "site.com/blog" blogifier will be using "site.com"
13+
// so instead of "site.com/blog" blogifier will be using "site.com"
1414
public static string BlogRoute { get; set; } = "blog/";
1515

1616
public static bool EnableLogging { get; set; }
@@ -24,7 +24,7 @@ public class ApplicationSettings
2424

2525
public static string ProfileAvatar { get; set; } = "/embedded/lib/img/avatar.jpg";
2626

27-
public static string PkgSettingsLayout { get; set; } = "~/Views/Blogifier/Admin/_Layout/_Packages.cshtml";
27+
public static string PkgSettingsLayout { get; set; } = "~/Views/Blogifier/Admin/_Layout/_PackagesSettings.cshtml";
2828

2929
#endregion
3030

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

Lines changed: 71 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -16,52 +16,6 @@
1616
<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>
1717
</div>
1818
<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>
19-
20-
<!-- Package Info -->
21-
<button type="button" class="btn btn-sm btn-primary btn-rounded ml-auto" data-toggle="modal" data-target="#packageInfo">About</button>
22-
<div class="modal fade" id="packageInfo" tabindex="-1" role="dialog" aria-labelledby="packageInfoLabel" aria-hidden="true">
23-
<div class="modal-dialog" role="document">
24-
<div class="modal-content">
25-
<div class="modal-header">
26-
<h5 class="modal-title" id="packageInfoLabel">Package Info</h5>
27-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fa fa-times"></i></button>
28-
</div>
29-
<div class="bf-package-info">
30-
<div class="bf-package-info-cover">
31-
<img src="/embedded/lib/img/cover.png" alt="Package Title" />
32-
</div>
33-
<div class="bf-package-info-body">
34-
<div class="bf-package-info-header">
35-
<img class="bf-package-info-logo" src="/embedded/lib/img/cover.png" alt="Package Title" />
36-
<h4 class="bf-package-info-title">Package Title</h4>
37-
<div class="bf-package-info-rating"><i class="fa fa-star active"></i><i class="fa fa-star active"></i><i class="fa fa-star active"></i><i class="fa fa-star active"></i><i class="fa fa-star"></i></div>
38-
</div>
39-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Voluptatibus deleniti voluptas, magni voluptatum aut reprehenderit fugiat cumque in, molestias laudantium inventore, saepe hic incidunt repellat eius. Quisquam, eum saepe deserunt.</p>
40-
<hr class="my-4" />
41-
<table class="table bf-package-info-table">
42-
<tr>
43-
<td>Version</td>
44-
<td>4.13.0</td>
45-
</tr>
46-
<tr>
47-
<td>Updated</td>
48-
<td>November 20, 2017</td>
49-
</tr>
50-
<tr>
51-
<td>Installs</td>
52-
<td>48894</td>
53-
</tr>
54-
<tr>
55-
<td>Developer</td>
56-
<td><a class="mr-3" href="#" target="_blank">Ruslan Tur</a></td>
57-
</tr>
58-
</table>
59-
</div>
60-
</div>
61-
</div>
62-
</div>
63-
</div>
64-
<!--/Package Info -->
6519
</div>
6620
<!--/Toolbar -->
6721

@@ -85,6 +39,7 @@
8539
<div class="bf-list-item-name">@item.Description</div>
8640
}
8741
<span class="bf-list-item-status bf-list-item-status-@publishedClass ml-auto" data-tooltip title="@publishedClass"><i class="fa fa-circle"></i></span>
42+
<button type="button" class="btn-unstyled ml-2" data-toggle="modal" data-target="#packageInfo" data-title="@item.Title" data-desc="@item.Description" data-version="1.0" data-logo="/embedded/lib/img/cover.png" data-cover="/embedded/lib/img/cover.png" data-date="November 20, 2017" data-installs="48894" data-developer="Ruslan Tur"><i class="fa fa-info-circle"></i></button>
8843
</li>
8944
}
9045
</ul>
@@ -96,6 +51,76 @@ else
9651
</div>
9752
}
9853

54+
55+
<!-- Package Info -->
56+
<div class="modal fade" id="packageInfo" tabindex="-1" role="dialog" aria-labelledby="packageInfoLabel" aria-hidden="true">
57+
<div class="modal-dialog" role="document">
58+
<div class="modal-content">
59+
<div class="modal-header">
60+
<h5 class="modal-title" id="packageInfoLabel">Package Info</h5>
61+
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fa fa-times"></i></button>
62+
</div>
63+
<div class="bf-package-info">
64+
<div class="bf-package-info-cover">
65+
<img src="" alt="Package Title" />
66+
</div>
67+
<div class="bf-package-info-body">
68+
<div class="bf-package-info-header">
69+
<img class="bf-package-info-logo" src="" alt="Package Title" />
70+
<h4 class="bf-package-info-title">Package Title</h4>
71+
<div class="bf-package-info-rating"><i class="fa fa-star active"></i><i class="fa fa-star active"></i><i class="fa fa-star active"></i><i class="fa fa-star active"></i><i class="fa fa-star"></i></div>
72+
</div>
73+
<p class="bf-package-info-desc"></p>
74+
<hr class="my-4" />
75+
<table class="table bf-package-info-table">
76+
<tr>
77+
<td>Version</td>
78+
<td class="bf-package-info-version"></td>
79+
</tr>
80+
<tr>
81+
<td>Updated</td>
82+
<td class="bf-package-info-date"></td>
83+
</tr>
84+
<tr>
85+
<td>Installs</td>
86+
<td class="bf-package-info-installs"></td>
87+
</tr>
88+
<tr>
89+
<td>Developer</td>
90+
<td class="bf-package-info-developer"></td>
91+
</tr>
92+
</table>
93+
</div>
94+
</div>
95+
</div>
96+
</div>
97+
</div>
98+
<!--/Package Info -->
99+
100+
99101
@section Scripts{
100102
<script src="~/admin/js/app/packagesController.js"></script>
103+
<script>
104+
$('#packageInfo').on('show.bs.modal', function (event) {
105+
var button = $(event.relatedTarget)
106+
var modalPackage_Title = button.data('title')
107+
var modalPackage_Desc = button.data('desc')
108+
var modalPackage_Logo = button.data('logo')
109+
var modalPackage_Cover = button.data('cover')
110+
var modalPackage_Version = button.data('version')
111+
var modalPackage_Date = button.data('date')
112+
var modalPackage_Installs = button.data('installs')
113+
var modalPackage_Developer = button.data('developer')
114+
115+
var modal = $(this)
116+
modal.find('.bf-package-info .bf-package-info-title').text(modalPackage_Title)
117+
modal.find('.bf-package-info .bf-package-info-desc').text(modalPackage_Desc)
118+
modal.find('.bf-package-info .bf-package-info-logo').attr("src", modalPackage_Logo)
119+
modal.find('.bf-package-info .bf-package-info-cover img').attr("src", modalPackage_Cover)
120+
modal.find('.bf-package-info .bf-package-info-version').text(modalPackage_Version)
121+
modal.find('.bf-package-info .bf-package-info-date').text(modalPackage_Date)
122+
modal.find('.bf-package-info .bf-package-info-installs').text(modalPackage_Installs)
123+
modal.find('.bf-package-info .bf-package-info-developer').text(modalPackage_Developer)
124+
});
125+
</script>
101126
}

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
@using Blogifier.Core.Common
2+
@{
3+
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Layout.cshtml";
4+
}
5+
<div class="bf-header d-flex d-lg-none">@ViewData["Title"] <i class="fa fa-chevron-down"></i></div>
6+
<div class="bf-main">
7+
<div class="bf-sidebar d-lg-flex flex-column">
8+
<div class="p-3">
9+
<div class="py-3">
10+
<a asp-controller="Packages" asp-action="Widgets"><i class="fa fa-chevron-left mr-2"></i>Back</a>
11+
</div>
12+
<div class="btn-group d-flex">
13+
<button type="button" class="btn btn-outline-secondary btn-sm btn-rounded w-100">Disable</button>
14+
@*<button type="button" class="btn btn-outline-secondary btn-sm btn-rounded w-100">Enable</button>*@
15+
<button type="button" class="btn btn-outline-secondary btn-sm btn-rounded w-100" disabled>Delete</button>
16+
</div>
17+
</div>
18+
<div class="p-3 mt-auto">
19+
<div class="bf-package-info-header">
20+
<img class="bf-package-info-logo" src="/embedded/lib/img/cover.png" alt="Package Title" />
21+
<h4 class="bf-package-info-title">Package Title</h4>
22+
<div class="bf-package-info-rating"><i class="fa fa-star active"></i><i class="fa fa-star active"></i><i class="fa fa-star active"></i><i class="fa fa-star active"></i><i class="fa fa-star"></i></div>
23+
</div>
24+
<p class="small">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Voluptatibus deleniti voluptas, magni voluptatum aut reprehenderit fugiat cumque in, molestias laudantium inventore, saepe hic incidunt repellat eius. Quisquam, eum saepe deserunt.</p>
25+
<hr class="my-4" />
26+
<table class="table bf-package-info-table">
27+
<tr>
28+
<td>Version</td>
29+
<td>4.13.0</td>
30+
</tr>
31+
<tr>
32+
<td>Updated</td>
33+
<td>November 20, 2017</td>
34+
</tr>
35+
<tr>
36+
<td>Installs</td>
37+
<td>48894</td>
38+
</tr>
39+
<tr>
40+
<td>Developer</td>
41+
<td><a class="mr-3" href="#" target="_blank">Ruslan Tur</a></td>
42+
</tr>
43+
</table>
44+
</div>
45+
</div>
46+
<div class="bf-body">
47+
@RenderBody()
48+
</div>
49+
</div>
50+
@section Scripts{
51+
@RenderSection("Scripts", false)
52+
}

‎Blogifier.Web/wwwroot/admin/js/app/app.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function toggleActionBtns() {
3030
}
3131
}
3232

33-
 // Toastr Options --------
33+
// Toastr Options --------
3434
toastr.options.positionClass = 'toast-bottom-right';
3535
toastr.options.backgroundpositionClass = 'toast-bottom-right';
3636

‎Packages/Widgets/Newsletter/Views/Shared/Components/Newsletter/Settings.cshtml‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
11
@model Blogifier.Core.Data.Models.AdminSettingsModel
22
@using Blogifier.Core.Common
33
@{
4+
ViewData["Title"] = "Newsletter";
45
Layout = ApplicationSettings.PkgSettingsLayout;
56
var emails = (List<string>)ComponentHelper.GetValue(Model.Settings, "Emails");
67
}
78

89
<!-- Toolbar -->
9-
<div class="bf-toolbar d-flex">
10-
<label class="custom-control custom-checkbox my-auto mr-3"><input class="custom-control-input item-checkbox" type="checkbox" id="selectAll" name="selectAll"><span class="item-control custom-control-indicator"></span></label>
11-
<div id="postActionButtons" class="btn-group mr-3">
12-
<a asp-controller="Packages" asp-action="Widgets" class="btn btn-outline-secondary btn-sm btn-rounded" style="padding: 0 20px">
13-
<i class="fa fa-arrow-left"></i> &nbsp; Back
14-
</a>
15-
</div>
10+
<div class="bf-toolbar d-flex align-items-center">
11+
<label class="custom-control custom-checkbox custom-control-single mr-3"><input class="custom-control-input item-checkbox" type="checkbox" id="selectAll" name="selectAll"><span class="item-control custom-control-indicator"></span></label>
1612
<div id="postActionButtons" class="btn-group mr-3">
1713
<button type="button" class="btn btn-outline-secondary btn-icon btn-sm btn-rounded" disabled="disabled" data-tooltip onclick="return newsletter.remove()" title="Remove"><i class="fa fa-trash"></i></button>
1814
</div>
@@ -22,17 +18,17 @@
2218

2319
@if (emails != null && emails.Any())
2420
{
25-
<ul class="bf-users-list d-block" aria-label="newsletter">
21+
<ul class="bf-list d-block" aria-label="newsletter">
2622
@foreach (var item in emails)
2723
{
28-
<li class="post-list-item d-flex">
29-
<label class="item-select custom-control custom-checkbox mr-3 my-auto">
24+
<li class="bf-list-item d-flex align-items-center">
25+
<label class="bf-list-item-select custom-control custom-checkbox mr-3 my-auto">
3026
<input type="checkbox" value="@item" class="item-checkbox custom-control-input">
3127
<span class="item-control custom-control-indicator"></span>
3228
</label>
33-
<div class="bf-posts-empty" style="margin-top: 13px">@item</div>
29+
<div class="bf-list-item-name">@item</div>
3430
</li>
35-
}
31+
}
3632
</ul>
3733
}
3834
else

0 commit comments

Comments
 (0)