imhven
/
abp
mirror of https://github.com/abpframework/abp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/volosoft/abp

Browse Source
pull/441/head
Alper Ebicoglu 7 years ago
parent 9fe4ec004e cec3f9daaa
commit 469d474715
7 changed files with 79 additions and 12816 deletions
Show Stats Download Patch File Download Diff File

2
modules/blogging/src/Volo.Blogging.EntityFrameworkCore/Volo/Blogging/Posts/EfCorePostRepository.cs
Unescape View File

@ -20,7 +20,7 @@ namespace Volo.Blogging.Posts
public List<Post> GetPostsByBlogId(Guid id)
{
return DbSet.Where(p => p.BlogId == id).ToList();
return DbSet.Where(p => p.BlogId == id).OrderByDescending(p=>p.CreationTime).ToList();
}
public async Task<Post> GetPostByUrl(Guid blogId, string url)

6
modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/en.json
Unescape View File

@ -18,17 +18,19 @@
"Content": "Content",
"SeeAll": "See All",
"PopularTags": "Popular Tags",
"Read": "{0} Read",
"ReadWithCount": "{0} Read",
"LastPosts": "Last Posts",
"LeaveComment": "Leave Comment",
"TagsInThisArticle": "Tags in this article",
"Posts": "Posts",
"Edit": "Edit",
"BLOG": "BLOG",
"CommentDeletionWarningMessage": "Comment will be deleted.",
"PostDeletionWarningMessage": "Post will be deleted.",
"BlogDeletionWarningMessage": "Blog will be deleted.",
"AreYouSure": "Are you sure?",
"Comment": "{0} Comment",
"CommentWithCount": "{0} Comment",
"Comment": "Comment",
"ShareOnTwitter": "Share On Twitter",
"CoverImage": "Cover Image",
"CreateANewPost": "Create A New Post",

1
modules/blogging/src/Volo.Blogging.Web/Localization/Resources/Blogging/Web/tr.json
Unescape View File

@ -25,6 +25,7 @@
"TagsInThisArticle": "Makalenin Etiketleri",
"Posts": "Yazılar",
"Edit": "Düzenle",
"BLOG": "BLOG",
"CommentDeletionWarningMessage": "Yorum silinecek.",
"PostDeletionWarningMessage": "Yazı silinecek.",
"BlogDeletionWarningMessage": "Blog silinecek.",

2
modules/blogging/src/Volo.Blogging.Web/Pages/Blog/BloggingPage.cs
Unescape View File

@ -102,7 +102,7 @@ namespace Volo.Blogging.Pages.Blog
}
if (diffInSeconds >= 60)
{
return L["MinutesAgo", diffInSeconds];
return L["MinutesAgo", diffInSeconds / 60];
}
if (diffInSeconds >= 1)
{

23
modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Detail.cshtml
Unescape View File

@ -27,29 +27,12 @@
<div class="row">
<div class="col">
<h1 class="my-0 display-inline-block">
@Model.Blog.ShortName
@Model.Blog.Name
<small class="text-muted">
@L["Blog"]
@L["BLOG"]
</small>
</h1>
</div>
<div class="article-owner">
<div class="article-infos">
<div class="user-card">
<a>
<strong> @(Model.Post.Writer == null ? "" : Model.Post.Writer.UserName)</strong>, @ConvertDatetimeToTimeAgo(Model.Post.CreationTime)
</a>
<span class="seperator">|</span>
<a>
<i class="fa fa-eye"></i> @L["ReadWithCount", @Model.Post.ReadCount]
</a>
<span class="seperator">|</span>
<a>
<i class="fa fa-comment"></i> @L["CommentWithCount", @Model.CommentCount]
</a>
</div>
</div>
</div>
<div class="col-sm-4 text-right">
<br />
<a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName">
@ -172,7 +155,7 @@
}
</div>
<a class="btn-rounded float-right btn btn-primary"
<a class="btn btn-blue float-right"
href="@Model.GetTwitterShareUrl(Model.Post.Title, HttpContext.Request.GetEncodedUrl(), "@" + (Model.Blog.Twitter??""))" target="_blank">
<i class="fa fa-twitter"></i>
@L["ShareOnTwitter"]

133
modules/blogging/src/Volo.Blogging.Web/Pages/Blog/Posts/Index.cshtml
Unescape View File

@ -124,7 +124,7 @@
</a>
<span class="vs-seperator">|</span>
<a>
<i class="fa fa-comment"></i> @L["CommentWithCount", @post.CommentCount]
<i class="fa fa-comment"></i> @L["CommentWithCount", post.CommentCount]
</a>
</div>
</div>
@ -176,81 +176,86 @@
<div class="pb-5">
<div class="row">
<div class="col-md-8 box-articles">
<div class="vs-blog-title">
<h2>@L["LastPosts"]</h2>
</div>
<div class="list-group">
@for (var index = 3; index < Model.Posts.Count; index++)
{
var post = Model.Posts[index];
var oddPost = index % 2 == 1;
@if (Model.Posts.Count > 3)
{
<div class="col-md-8 box-articles">
<div class="vs-blog-title">
<h2>@L["LastPosts"]</h2>
</div>
<div class="list-group">
@for (var index = 3; index < Model.Posts.Count; index++)
{
var post = Model.Posts[index];
var oddPost = index % 2 == 1;
<div class="list-group-item">
<div class="row @(oddPost?"align-middle":"")">
<div class="col-md-4 order-md-@(oddPost?"last":"first")">
<div class="img-container">
<a asp-page="./Detail" asp-route-postUrl="@post.Url" asp-route-blogShortName="@Model.BlogShortName">
<img src="@post.CoverImage" class="box-article-img">
</a>
<div class="list-group-item">
<div class="row @(oddPost ? "align-middle" : "")">
<div class="col-md-4 order-md-@(oddPost ? "last" : "first")">
<div class="img-container">
<a asp-page="./Detail" asp-route-postUrl="@post.Url" asp-route-blogShortName="@Model.BlogShortName">
<img src="@post.CoverImage" class="box-article-img">
</a>
</div>
</div>
</div>
<div class="col order-md-@(oddPost?"first":"last")">
<p class="tags">
@foreach (var tag in post.Tags)
{
<a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
}
</p>
<h3>
<a asp-page="./Detail" asp-route-postUrl="@post.Url" asp-route-blogShortName="@Model.BlogShortName">@post.Title</a>
</h3>
<p>
@(GetShortContent(post.Content))
</p>
<div class="article-owner">
<div class="article-infos">
<div class="user-card">
<a>
<img gravatar-email="@post.Writer.Email" default-image="Identicon" class="article-avatar" />
</a>
<a>
<strong>@post.Writer.UserName</strong>, @ConvertDatetimeToTimeAgo(post.CreationTime)
</a>
<span class="vs-seperator">|</span>
<a>
<i class="fa fa-eye"></i> @post.ReadCount
</a>
<span class="vs-seperator">|</span>
<a>
<i class="fa fa-comment"></i> @post.CommentCount
</a>
<div class="col order-md-@(oddPost ? "first" : "last")">
<p class="tags">
@foreach (var tag in post.Tags)
{
<a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@tag.Name" class="tag">@tag.Name</a>
}
</p>
<h3>
<a asp-page="./Detail" asp-route-postUrl="@post.Url" asp-route-blogShortName="@Model.BlogShortName">@post.Title</a>
</h3>
<p>
@(GetShortContent(post.Content))
</p>
<div class="article-owner">
<div class="article-infos">
<div class="user-card">
<a>
<img gravatar-email="@post.Writer.Email" default-image="Identicon" class="article-avatar" />
</a>
<a>
<strong>@post.Writer.UserName</strong>, @ConvertDatetimeToTimeAgo(post.CreationTime)
</a>
<span class="vs-seperator">|</span>
<a>
<i class="fa fa-eye"></i> @post.ReadCount
</a>
<span class="vs-seperator">|</span>
<a>
<i class="fa fa-comment"></i> @post.CommentCount
</a>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
}
</div>
</div>
<div class="col-md-4">
<div class="vs-blog-title">
<h2>@L["PopularTags"]</h2>
}
</div>
</div>
<div class="list-group small-list popular-tags">
@foreach (var popularTag in Model.PopularTags)
{
<div class="list-group-item">
<a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@popularTag.Name">@popularTag.Name <span>(@popularTag.UsageCount @L["Posts"])</span></a>
</div>
}
}
@if (Model.PopularTags.Count > 0)
{
<div class="col-md-4">
<div class="vs-blog-title">
<h2>@L["PopularTags"]</h2>
</div>
<div class="list-group small-list popular-tags">
@foreach (var popularTag in Model.PopularTags)
{
<div class="list-group-item">
<a asp-page="/Blog/Posts/Index" asp-route-blogShortName="@Model.BlogShortName" asp-route-tagName="@popularTag.Name">@popularTag.Name <span>(@popularTag.UsageCount @L["Posts"])</span></a>
</div>
}
</div>
</div>
</div>
}
</div>
</div>
</div>

12728
modules/docs/app/Volo.DocsTestApp/Logs/logs.txt
View File

File diff suppressed because it is too large Load Diff
Write Preview
Loading…
Cancel
Save