Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a few bugs #639

Merged
merged 3 commits into from
Jun 28, 2022
Merged

Fix a few bugs #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ef57f8
This resolves a general null reference issue. If folks have used cust…
poppastring Jun 27, 2022
be88371
Fixed the "median" theme
poppastring Jun 27, 2022
6a19238
Bit more defensive as these values may not be in the config file.
poppastring Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/DasBlog.Web.Repositories/BlogManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,10 @@ private string GetFromEmail()
{
if (string.IsNullOrWhiteSpace(dasBlogSettings.SiteConfiguration.SmtpFromEmail))
{
return dasBlogSettings.SiteConfiguration.SmtpUserName;
return dasBlogSettings.SiteConfiguration.SmtpUserName?.Trim();
}

return dasBlogSettings.SiteConfiguration.SmtpFromEmail.Trim();
return dasBlogSettings.SiteConfiguration.SmtpFromEmail?.Trim();
}
public bool SendTestEmail()
{
Expand Down
5 changes: 3 additions & 2 deletions source/DasBlog.Web.UI/Themes/median/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

<div class="container-fluid" id="wrapper">
<div class="row">
<nav class="sidebar col-xs-12 col-sm-4 col-lg-3 col-xl-2">
<nav class="sidebar col-xs-12 col-sm-4 col-lg-3 col-xl-2 bg-faded sidebar-style-1">

<a href="#menu-toggle" class="btn btn-default" id="menu-toggle"><em class="fa fa-bars"></em></a>
<ul class="nav nav-pills flex-column sidebar-nav">
Expand All @@ -37,7 +37,8 @@
<a dasblog-unauthorized class="logout-button" asp-controller="account" asp-action="login"><em class="fa fa-power-off"></em>Signin</a>
<a dasblog-authorized class="logout-button" asp-controller="account" asp-action="logout"><em class="fa fa-power-off"></em>Signout</a>
</nav>
<main class="col-xs-12 col-sm-8 col-lg-9 col-xl-10 pt-3 pl-4 ml-auto">

<main class="col-xs-12 col-sm-8 offset-sm-4 col-lg-9 offset-lg-3 col-xl-10 offset-xl-2 pt-3 pl-4">
<header class="page-header row justify-center">
<div class="col-md-6 col-lg-8">
<h1 class="site-title"> <site-title-link css="fa fa-rocket" /> </h1>
Expand Down
2 changes: 1 addition & 1 deletion source/DasBlog.Web.UI/Views/Shared/_BlogItems.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@model ListPostsViewModel


@if (Model.Posts.Count > 0)
@if (Model?.Posts?.Count > 0)
{
foreach (var post in Model.Posts)
{
Expand Down
2 changes: 1 addition & 1 deletion source/DasBlog.Web.UI/Views/Shared/_BlogItemsSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@model ListPostsViewModel


@if (Model.Posts.Count > 0)
@if (Model?.Posts?.Count > 0)
{
int order = 0;

Expand Down