Skip to content

Commit 83df3a1

Browse files
rxturrxtur
committed
Widgets package info updates
1 parent eac9bfd commit 83df3a1

File tree

5 files changed

+53
-29
lines changed

5 files changed

+53
-29
lines changed

‎Blogifier.Core/Services/Packages/PackageService.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@ List<PackageListItem> Widgets()
7575
var attributes = info.GetAttributes();
7676
if(attributes != null)
7777
{
78-
item.Author = attributes.Author;
79-
item.Cover = attributes.Cover;
78+
item.Author = string.IsNullOrEmpty(attributes.Author) ? "Unknown" : attributes.Author;
79+
item.Cover = string.IsNullOrEmpty(attributes.Cover) ? BlogSettings.Cover : attributes.Cover;
8080
item.Description = attributes.Description;
81-
item.Icon = attributes.Icon;
81+
item.Icon = string.IsNullOrEmpty(attributes.Icon) ? BlogSettings.Logo : attributes.Icon;
8282
item.ProjectUrl = attributes.ProjectUrl;
8383
item.Tags = attributes.Tags;
8484
item.Title = attributes.Title;

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

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@model Blogifier.Core.Data.Models.AdminPackagesModel
22
@using Blogifier.Core.Common
3+
@using Newtonsoft.Json
34
@{
45
ViewData["Title"] = "Widgets";
56
Layout = $"~/{ApplicationSettings.BlogAdminFolder}/_Layout/_Packages.cshtml";
@@ -81,10 +82,10 @@ else
8182
<td>Updated</td>
8283
<td class="bf-package-info-date"></td>
8384
</tr>
84-
<tr>
85+
@*<tr>
8586
<td>Installs</td>
8687
<td class="bf-package-info-installs"></td>
87-
</tr>
88+
</tr>*@
8889
<tr>
8990
<td>Developer</td>
9091
<td class="bf-package-info-developer"></td>
@@ -101,26 +102,6 @@ else
101102
@section Scripts{
102103
<script src="~/admin/js/app/packagesController.js"></script>
103104
<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-
});
105+
packagesController.packages = eval(@Html.Raw(JsonConvert.SerializeObject(Model.Packages, Formatting.Indented)))
125106
</script>
126107
}

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,23 @@ function bytesToSize(bytes) {
6060
return Math.round(bytes / Math.pow(1024, i), 2) + ' ' + sizes[i];
6161
};
6262

63+
function getMonthName(i) {
64+
var m = new Array();
65+
m[0] = "January";
66+
m[1] = "February";
67+
m[2] = "March";
68+
m[3] = "April";
69+
m[4] = "May";
70+
m[5] = "June";
71+
m[6] = "July";
72+
m[7] = "August";
73+
m[8] = "September";
74+
m[9] = "October";
75+
m[10] = "November";
76+
m[11] = "December";
77+
return m[i];
78+
}
79+
6380
// setup page
6481
$(".bf-setup-form #AuthorName").keyup(function() {
6582
var authorUrl = $(this).val();

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
var packagesController = function (dataService) {
22
var obj = {};
3+
var packages = [];
34

45
function enable() {
56
$('.loading').fadeIn();
@@ -30,6 +31,32 @@ var packagesController = function (dataService) {
3031

3132
return {
3233
enable: enable,
33-
disable: disable
34+
disable: disable,
35+
packages: packages
3436
}
3537
}(DataService);
38+
39+
$('#packageInfo').on('show.bs.modal', function (event) {
40+
41+
var button = $(event.relatedTarget)
42+
var modalPackage_Title = button.data('title')
43+
44+
var items = packagesController.packages;
45+
46+
for (i = 0; i < items.length; i++) {
47+
var item = items[i];
48+
var date = new Date(item.LastUpdated);
49+
50+
if (item && item.Title == modalPackage_Title) {
51+
var modal = $(this);
52+
modal.find('.bf-package-info .bf-package-info-title').text(item.Title);
53+
modal.find('.bf-package-info .bf-package-info-desc').text(item.Description);
54+
modal.find('.bf-package-info .bf-package-info-logo').attr("src", item.Icon);
55+
modal.find('.bf-package-info .bf-package-info-cover img').attr("src", item.Cover);
56+
modal.find('.bf-package-info .bf-package-info-version').text(item.Version);
57+
modal.find('.bf-package-info .bf-package-info-date').text(getMonthName(date.getMonth()) + " " + date.getDate() + ", " + date.getFullYear());
58+
//modal.find('.bf-package-info .bf-package-info-installs').text(modalPackage_Installs)
59+
modal.find('.bf-package-info .bf-package-info-developer').text(item.Author);
60+
}
61+
}
62+
});

‎Packages/Widgets/Newsletter/PackageInfo.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ public PackageListItem GetAttributes()
1313
Icon = "https://avatars0.githubusercontent.com/u/19671571?v=4&amp;s=180",
1414
Author = "Blogifier",
1515
ProjectUrl = "https://github.com/blogifierdotnet/Blogifier",
16-
Tags = "widget,newsletter,email",
17-
LastUpdated = System.IO.File.GetLastWriteTime(Assembly.GetExecutingAssembly().Location)
16+
Tags = "widget,newsletter,email"
1817
};
1918
}
2019
}

0 commit comments

Comments
 (0)