Skip to content

Commit f329be7

Browse files
rxturrxtur
committed
Blog theme synced to core
1 parent a1ff34e commit f329be7

File tree

17 files changed

+223
-208
lines changed

17 files changed

+223
-208
lines changed

‎Blogifier.Core/Views/Blogifier/Themes/Standard/Author.cshtml‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,18 @@
66
var cf = Model.CustomFields;
77
Model.Pager.RouteValue = Model.Profile.Slug + "/";
88
}
9-
<header class="blog-cover author-info" style="background-image: url('@Model.CoverImg')">
9+
<header class="page-cover author-info" style="background-image: url('@Model.CoverImg')">
1010
<div class="container">
1111
<img class="author-avatar" src="@avatar" width="100" alt="@Model.Profile.Title" />
12-
<h2 class="author-title">@Model.Profile.Title</h2>
13-
<p class="author-description">@Model.Profile.Description</p>
14-
@*<ul class="author-social">
15-
@if (cf.ContainsKey("Google") && !string.IsNullOrEmpty(cf["Google"]))
16-
{
17-
<li><a href='@cf["Google"]' target="_blank" title="Google Plus"><i class="fa fa-google"></i></a></li>
18-
}
19-
@if (cf.ContainsKey("Twitter") && !string.IsNullOrEmpty(cf["Twitter"]))
20-
{
21-
<li><a href='@cf["Twitter"]' target="_blank" title="Twitter"><i class="fa fa-twitter"></i></a></li>
22-
}
23-
@if (cf.ContainsKey("Github") && !string.IsNullOrEmpty(cf["Github"]))
24-
{
25-
<li><a href='@cf["Github"]' target="_blank" title="GitHub"><i class="fa fa-github"></i></a></li>
26-
}
27-
@if (cf.ContainsKey("Instagram") && !string.IsNullOrEmpty(cf["Instagram"]))
28-
{
29-
<li><a href='@cf["Instagram"]' target="_blank" title="Instagram"><i class="fa fa-instagram"></i></a></li>
30-
}
31-
@if (cf.ContainsKey("Facebook") && !string.IsNullOrEmpty(cf["Facebook"]))
32-
{
33-
<li><a href='@cf["Facebook"]' target="_blank" title="Facebook"><i class="fa fa-facebook"></i></a></li>
34-
}
35-
</ul>*@
12+
<h2 class="page-cover-title">@BlogSettings.Title</h2>
13+
<p class="page-cover-desc">@BlogSettings.Description</p>
3614
</div>
3715
</header>
3816
<main class="page-author">
39-
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/Standard/_Shared/_Post.cshtml", Model.Posts)
40-
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/Standard/_Shared/_Pager.cshtml", Model.Pager)
17+
<div class="page-content">
18+
<div class="container">
19+
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/{BlogSettings.Theme}/_Shared/_Post.cshtml", Model.Posts)
20+
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/{BlogSettings.Theme}/_Shared/_Pager.cshtml", Model.Pager)
21+
</div>
22+
</div>
4123
</main>

‎Blogifier.Core/Views/Blogifier/Themes/Standard/Category.cshtml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,18 @@
1111
{
1212
avatar = Model.Profile.Avatar;
1313
}
14-
Model.Pager.RouteValue = Model.Profile.Slug + "/" + Model.Category.Slug + "/";
14+
Model.Pager.RouteValue = "category/" + Model.Category.Slug + "/";
1515
}
1616
}
1717
<main class="page-category">
1818
<header class="page-cover" style="background-image: url('@Model.CoverImg')">
19+
<h2 class="page-cover-title">@Model.Category.Title</h2>
20+
<p class="page-cover-desc">Category</p>
21+
</header>
22+
<div class="page-content">
1923
<div class="container">
20-
<h2 class="page-cover-title">@Model.Category.Title</h2>
21-
<p class="page-cover-desc">Category</p>
24+
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/{BlogSettings.Theme}/_Shared/_Post.cshtml", Model.Posts)
25+
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/{BlogSettings.Theme}/_Shared/_Pager.cshtml", Model.Pager)
2226
</div>
23-
</header>
24-
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/Standard/_Shared/_Post.cshtml", Model.Posts)
25-
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/Standard/_Shared/_Pager.cshtml", Model.Pager)
27+
</div>
2628
</main>

‎Blogifier.Core/Views/Blogifier/Themes/Standard/Index.cshtml‎

Lines changed: 44 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,50 @@
11
@using Blogifier.Core.Common
22
@using Blogifier.Core.Data.Models
3+
@using Blogifier.Core.Extensions
34
@model BlogPostsModel
45
@inject IComponentHelper helper
5-
<section class="blog-cover" style="background-image: url('@Model.CoverImg')">
6+
@{
7+
ViewData["bodyClass"] = "home";
8+
var logoImg = BlogSettings.Logo;
9+
var logoUrl = "http://blogifier.net";
10+
try
11+
{
12+
logoImg = Model.LogoImg;
13+
logoUrl = Model.LogoUrl;
14+
}
15+
catch { }
16+
}
17+
18+
<div class="page-cover" style="background-image: url('@Model.CoverImg')">
19+
<h1 class="page-cover-title"><a href="~/@logoUrl">@BlogSettings.Title</a></h1>
20+
<p class="page-cover-desc">@BlogSettings.Description</p>
21+
</div>
22+
23+
<div class="page-content">
624
<div class="container">
7-
<h1 class="cover-title">@BlogSettings.Title</h1>
8-
<p class="cover-desc">@BlogSettings.Description</p>
9-
</div>
10-
</section>
11-
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/Standard/_Shared/_Post.cshtml", Model.Posts)
12-
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/Standard/_Shared/_Pager.cshtml", Model.Pager)
25+
@await helper.InvokeAsync(Component, "PostList", new { listType = 1, contentType = 1, count = 2 })
1326

14-
<section class="container">
15-
@await helper.InvokeAsync(Component, "Newsletter")
16-
</section>
27+
@if (Model.Posts != null)
28+
{
29+
foreach (var item in Model.Posts)
30+
{
31+
if (!item.IsFeatured)
32+
{
33+
<article class="post">
34+
<div class="post-cover"><img src="@item.Image" alt="@item.Title"></div>
35+
<h2 class="post-title"><a href="~/@ApplicationSettings.BlogRoute@item.Slug">@item.Title</a></h2>
36+
<div class="post-meta">
37+
<a class="post-meta-author" href="~/@ApplicationSettings.BlogRoute@item.BlogSlug">@item.AuthorName</a>
38+
<time class="post-meta-time">/ @item.Published.ToFriendlyDateString()</time>
39+
</div>
40+
<div class="post-description">@Html.Raw(item.Content)</div>
41+
<a class="post-more btn btn-rounded btn-dark" href="~/@ApplicationSettings.BlogRoute@item.Slug">Read</a>
42+
</article>
43+
}
44+
}
45+
}
46+
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/{BlogSettings.Theme}/_Shared/_Pager.cshtml", Model.Pager)
47+
48+
@await helper.InvokeAsync(Component, "Newsletter")
49+
</div>
50+
</div>

‎Blogifier.Core/Views/Blogifier/Themes/Standard/Layout/_Layout.cshtml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
<!DOCTYPE html>
33
<html lang="en">
44
<head>
5-
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/Standard/_Shared/_Head.cshtml")
5+
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/{BlogSettings.Theme}/_Shared/_Head.cshtml")
6+
67
</head>
7-
<body>
8-
<!--[if lt IE 10]>
9-
<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
10-
<![endif]-->
11-
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/Standard/_Shared/_Header.cshtml")
12-
@RenderBody()
13-
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/Standard/_Shared/_Footer.cshtml")
8+
<body class="@ViewData["bodyClass"]">
9+
<!--[if lt IE 10]>
10+
<p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
11+
<![endif]-->
12+
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/{BlogSettings.Theme}/_Shared/_Header.cshtml")
13+
@RenderBody()
14+
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/{BlogSettings.Theme}/_Shared/_Footer.cshtml")
1415
</body>
1516
</html>

‎Blogifier.Core/Views/Blogifier/Themes/Standard/Search.cshtml‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@
22
@using Blogifier.Core.Common
33
@model BlogPostsModel
44
@{
5-
Model.Pager.RouteValue = $"search/{ViewBag.Term}/";
5+
var term = ViewBag.Term;
6+
var search = "search";
7+
Model.Pager.RouteValue = search + "/" + term + "/";
68
}
79
<main class="page-search">
810
<header class="page-cover" style="background-image: url('@Model.CoverImg')">
11+
<h2 class="page-cover-title">@term</h2>
12+
<p class="page-cover-desc">Search Results:</p>
13+
</header>
14+
<div class="page-content">
915
<div class="container">
10-
<h2 class="page-cover-title">@ViewBag.Term</h2>
11-
<p class="page-cover-desc">Search Results:</p>
16+
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/{BlogSettings.Theme}/_Shared/_Post.cshtml", Model.Posts)
17+
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/{BlogSettings.Theme}/_Shared/_Pager.cshtml", Model.Pager)
1218
</div>
13-
</header>
14-
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/Standard/_Shared/_Post.cshtml", Model.Posts)
15-
@Html.Partial($"~/{ApplicationSettings.BlogThemesFolder}/Standard/_Shared/_Pager.cshtml", Model.Pager)
19+
</div>
1620
</main>

‎Blogifier.Core/Views/Blogifier/Themes/Standard/Single.cshtml‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,32 @@
66
var avatar = string.IsNullOrEmpty(Model.BlogPost.Profile.Avatar) ? ApplicationSettings.ProfileAvatar : Model.BlogPost.Profile.Avatar;
77
}
88
<article class="post-single">
9-
<header class="page-cover post-header" style="background-image: url('@Model.CoverImg')">
10-
<section class="container">
11-
<h2 class="post-title">@Model.BlogPost.Title</h2>
12-
<div class="post-meta">
13-
<a href="~/@ApplicationSettings.BlogRoute@Model.BlogPost.Profile.Slug">
14-
<img class="post-meta-img" src="@avatar" alt="@Model.BlogPost.Profile.AuthorName" />
15-
<span class="post-meta-author">@Model.BlogPost.Profile.AuthorName</span>
16-
</a>
17-
<time class="post-meta-time">@string.Format("{0:MMM d, yyyy}", Model.BlogPost.Published)</time>
18-
<span class="post-meta-category">
19-
in
20-
@if (Model.BlogCategories.Count > 0)
21-
{
22-
@foreach (var cat in Model.BlogCategories)
9+
<div class="post-cover" style="background-image: url('@Model.CoverImg')"></div>
10+
<section class="container">
11+
<div class=" post-body">
12+
<header class="post-header">
13+
<h2 class="post-title">@Model.BlogPost.Title</h2>
14+
<div class="post-meta">
15+
<a href="~/@ApplicationSettings.BlogRoute@Model.BlogPost.Profile.Slug">
16+
<img class="post-meta-img" src="@avatar" alt="@Model.BlogPost.Profile.AuthorName" />
17+
<span class="post-meta-author">@Model.BlogPost.Profile.AuthorName</span>
18+
</a>
19+
<time class="post-meta-time">@string.Format("{0:MMM d, yyyy}", Model.BlogPost.Published)</time>
20+
<span class="post-meta-category">
21+
@if (Model.BlogCategories.Count > 0)
2322
{
24-
<a href="~/@ApplicationSettings.BlogRoute@Model.Profile.Slug/@cat.Value">@cat.Text</a>
23+
@foreach (var cat in Model.BlogCategories)
24+
{
25+
<a href="~/category/@cat.Value">@cat.Text</a>
26+
}
2527
}
26-
}
27-
</span>
28+
</span>
29+
</div>
30+
</header>
31+
<div class="post-content">
32+
@Html.Raw(Model.BlogPost.Content)
33+
@Html.Raw(customCode)
2834
</div>
29-
</section>
30-
</header>
31-
<div class="post-content container">
32-
@Html.Raw(Model.BlogPost.Content)
33-
@Html.Raw(customCode)
34-
</div>
35+
</div>
36+
</section>
3537
</article>

‎Blogifier.Core/Views/Blogifier/Themes/Standard/_Shared/_Footer.cshtml‎

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,42 @@
11
@using Blogifier.Core.Common
22
@{
33
var customFooter = "";
4+
var returnUrl = Url.Action("Index", "Admin");
45
try
56
{
67
var cf = Model.CustomFields;
78
customFooter = (cf.ContainsKey(Constants.FooterCode) && !string.IsNullOrEmpty(cf[Constants.FooterCode])) ? cf[Constants.FooterCode] : "";
89
}
910
catch { }
1011
}
12+
13+
<div class="modal fade blog-search" id="blog-search" tabindex="-1" role="dialog" aria-hidden="true">
14+
<div class="modal-dialog" role="document">
15+
<div class="modal-content">
16+
<div class="modal-body p-0">
17+
<form role="search" asp-controller="Blog" asp-action="Search" method="post">
18+
<input type="search" id="term" name="term" class="form-control form-control-lg" placeholder="Search..." autocomplete="off">
19+
</form>
20+
</div>
21+
</div>
22+
</div>
23+
</div>
24+
1125
<footer class="blog-footer">
12-
<div class="container">
13-
<p>Copyright © @DateTime.Now.Year @BlogSettings.Title.</p>
14-
<p>Powered by <a href="http://blogifier.net/" data-toggle="tooltip" target="_blank" title="Version - @ApplicationSettings.Version">Blogifier</a>. Designed by <a href="https://francis.bio/" target="_blank" rel="nofollow">Francis</a>.</p>
26+
<div class="container d-lg-flex text-center text-lg-left">
27+
<p>Copyright © @DateTime.Now.Year. Powered by <a href="http://blogifier.net/" data-toggle="tooltip" target="_blank" title="Version - @ApplicationSettings.Version">Blogifier</a>. Designed by <a href="https://francis.bio/" target="_blank" rel="nofollow">Francis</a>.</p>
28+
<div class="ml-auto">
29+
@if (User.Identity.IsAuthenticated)
30+
{
31+
<a href="~/admin">Admin</a>
32+
}
33+
else
34+
{
35+
<a href="~/account/login?ReturnUrl=@returnUrl">Login</a>
36+
}
37+
</div>
1538
</div>
1639
</footer>
17-
<form method="post" id="frmLogOut" asp-controller="Account" asp-action="Logout" asp-antiforgery="true"></form>
1840
<script src="~/embedded/blog/standard/js/jquery.min.js"></script>
1941
<script src="~/embedded/blog/standard/js/popper.min.js"></script>
2042
<script src="~/embedded/blog/standard/js/bootstrap.min.js"></script>

‎Blogifier.Core/Views/Blogifier/Themes/Standard/_Shared/_Head.cshtml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
@using Blogifier.Core.Common
2-
@{
2+
@{
33
var pageTitle = BlogSettings.Title;
44
var pageDescription = BlogSettings.Description;
55
var customHead = "";
@@ -17,10 +17,10 @@
1717
<title>@pageTitle</title>
1818
<meta name="description" content="@pageDescription">
1919
<meta name="viewport" content="width=device-width, initial-scale=1">
20-
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,700" rel="stylesheet">
20+
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,700|Merriweather:700" rel="stylesheet">
2121
<link href="~/embedded/blog/standard/css/bootstrap.min.css" rel="stylesheet">
2222
<link href="~/embedded/blog/standard/css/font-awesome.min.css" rel="stylesheet">
2323
<link href="~/embedded/blog/standard/css/prism.css" rel="stylesheet">
2424
<link href="~/embedded/blog/standard/css/styles.min.css" rel="stylesheet" asp-append-version="true">
2525
<link rel="shortcut icon" href="~/embedded/lib/img/favicon.ico">
26-
@Html.Raw(customHead)
26+
@Html.Raw(customHead)

‎Blogifier.Core/Views/Blogifier/Themes/Standard/_Shared/_Header.cshtml‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,20 @@
99
}
1010
catch { }
1111
}
12-
<header class="blog-header clearfix">
13-
<h1 class="blog-logo"><a href="~/@logoUrl"><img src="@logoImg" alt="@BlogSettings.Title" /></a></h1>
14-
<button class="blog-header-toggle"><i class="fa fa-navicon"></i></button>
15-
<section class="blog-header-modal">
16-
<button class="blog-header-toggle"><i class="fa fa-times"></i></button>
17-
<nav class="blog-nav">
18-
<ul>
19-
<li><a href="~/">Home</a></li>
20-
<li><a href="~/@ApplicationSettings.BlogRoute">Blogs</a></li>
21-
@if (User.Identity.IsAuthenticated)
22-
{
23-
<li><a href="~/admin">Admin</a></li>
24-
<li><a href="#" onclick="profileLogOut(); return false;">Logoff</a></li>
25-
}
26-
else
27-
{
28-
<li><a href="~/account/login?ReturnUrl=%2Fadmin">Login</a></li>
29-
}
30-
</ul>
31-
</nav>
32-
<form class="blog-search" role="search" asp-controller="Blog" asp-action="Search" method="post">
33-
<input type="search" id="term" name="term" placeholder="Search..." autocomplete="off">
34-
</form>
35-
</section>
12+
13+
<header class="blog-header d-flex flex-column">
14+
<div class="container d-flex">
15+
<a href="~/" class="blog-logo my-auto d-flex">
16+
<img src="@logoImg" alt="@BlogSettings.Title" class="my-auto" />
17+
@if(ViewData["bodyClass"] != null && ViewData["bodyClass"].ToString() != "home") {
18+
<span class="my-auto">@BlogSettings.Title</span>
19+
}
20+
</a>
21+
<ul class="blog-social nav ml-auto my-auto">
22+
<li class="blog-social-item"><a href="#" target="_blank" class="blog-social-link"><i class="blog-social-icon fa fa-twitter"></i></a></li>
23+
<li class="blog-social-item"><a href="#" target="_blank" class="blog-social-link"><i class="blog-social-icon fa fa-google-plus"></i></a></li>
24+
<li class="blog-social-item"><a href="#" target="_blank" class="blog-social-link"><i class="blog-social-icon fa fa-facebook-official"></i></a></li>
25+
</ul>
26+
<button class="blog-search-toggle btn-unstyled" type="button" data-toggle="modal" data-target="#blog-search"><i class="fa fa-search"></i></button>
27+
</div>
3628
</header>

‎Blogifier.Core/Views/Blogifier/Themes/Standard/_Shared/_Pager.cshtml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
@using Blogifier.Core.Common
2-
@using Blogifier.Core.Data.Models
3-
@using Blogifier.Core.Extensions
42
@model Pager
5-
63
@if (Model != null)
74
{
8-
<ul class="pagination justify-content-center">
9-
@if (Model.ShowOlder)
10-
{
11-
<li class="item item-prev"><a class="item-link" href="~/@ApplicationSettings.BlogRoute@Model.RouteValue?page=@Model.Older"><i class="item-icon fa fa-angle-left"></i></a></li>
12-
}
13-
@if (Model.ShowNewer)
14-
{
15-
<li class="item item-next"><a class="item-link" href="~/@ApplicationSettings.BlogRoute@Model.RouteValue?page=@Model.Newer"><i class="item-icon fa fa-angle-right"></i></a></li>
16-
}
17-
</ul>
18-
}
5+
@if (Model.ShowOlder || Model.ShowNewer)
6+
{
7+
<ul class="pagination justify-content-center">
8+
@if (Model.ShowOlder)
9+
{
10+
<li class="item item-prev"><a class="item-link" href="~/@ApplicationSettings.BlogRoute@Model.RouteValue?page=@Model.Older"><i class="item-icon fa fa-angle-left"></i></a></li>
11+
}
12+
@if (Model.ShowNewer)
13+
{
14+
<li class="item item-next"><a class="item-link" href="~/@ApplicationSettings.BlogRoute@Model.RouteValue?page=@Model.Newer"><i class="item-icon fa fa-angle-right"></i></a></li>
15+
}
16+
</ul>
17+
}
18+
}

0 commit comments

Comments
 (0)