From d551b17d4e55f0d7fd0029b69ae40e0006878345 Mon Sep 17 00:00:00 2001 From: Mark Downie Date: Sat, 8 Aug 2020 20:01:59 -0400 Subject: [PATCH 1/4] Only show comments if they are enabled at the site config layer. --- .../Views/Shared/_CommentBlockPartial.cshtml | 2 +- .../Views/Shared/_CommentPartial.cshtml | 39 ++++++++++--------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/source/DasBlog.Web.UI/Views/Shared/_CommentBlockPartial.cshtml b/source/DasBlog.Web.UI/Views/Shared/_CommentBlockPartial.cshtml index c9c706cb..ce8f68f6 100644 --- a/source/DasBlog.Web.UI/Views/Shared/_CommentBlockPartial.cshtml +++ b/source/DasBlog.Web.UI/Views/Shared/_CommentBlockPartial.cshtml @@ -3,7 +3,7 @@ @model ListCommentsViewModel @inject IDasBlogSettings dasBlogSettings -@if (Model != null && Model.Comments != null) +@if (dasBlogSettings.SiteConfiguration.EnableComments && Model?.Comments != null) {

Comment Section

diff --git a/source/DasBlog.Web.UI/Views/Shared/_CommentPartial.cshtml b/source/DasBlog.Web.UI/Views/Shared/_CommentPartial.cshtml index 4640cbb2..3bcd5101 100644 --- a/source/DasBlog.Web.UI/Views/Shared/_CommentPartial.cshtml +++ b/source/DasBlog.Web.UI/Views/Shared/_CommentPartial.cshtml @@ -13,28 +13,31 @@ } } -
-
-
- +@if (dasBlogSettings.SiteConfiguration.EnableComments) +{ +
+
+
+ -
-
- () +
+
+ () +
-
-
-
- +
+
+ +
-
-
-
- - - +
+
+ + + +
-
\ No newline at end of file +} \ No newline at end of file From 0c6197aa2ad3a8014914298cd819366bdb913587 Mon Sep 17 00:00:00 2001 From: Mark Downie Date: Sat, 8 Aug 2020 22:26:26 -0400 Subject: [PATCH 2/4] Supporting summary views in all default themes --- .../Themes/darkly/_BlogItemSummary.cshtml | 42 +++++-------------- .../Themes/darkly/_BlogPageSummary.cshtml | 12 ++++-- .../Themes/dasblog/_BlogItemSummary.cshtml | 42 +++++-------------- .../Themes/dasblog/_BlogPageSummary.cshtml | 13 ++++-- .../Themes/fulcrum/_BlogItemSummary.cshtml | 5 +-- .../Themes/journal/_BlogItemSummary.cshtml | 42 +++++-------------- .../Themes/journal/_BlogPageSummary.cshtml | 11 +++-- .../Themes/median/_BlogItemSummary.cshtml | 4 +- 8 files changed, 63 insertions(+), 108 deletions(-) diff --git a/source/DasBlog.Web.UI/Themes/darkly/_BlogItemSummary.cshtml b/source/DasBlog.Web.UI/Themes/darkly/_BlogItemSummary.cshtml index 5f3781e0..6fe781e6 100644 --- a/source/DasBlog.Web.UI/Themes/darkly/_BlogItemSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/darkly/_BlogItemSummary.cshtml @@ -1,37 +1,17 @@ @model PostViewModel -@{ - ViewData["Title"] = @Model.Title; -} -
-
-
-

- -
-
+
+
+
+ +

+ +

+ +

-
-
- -
-
-
-
- Categories: -
-
- Share on Twitter or Facebook -
-
- - - -
-
- + Continue reading...
+ Thumbnail [200x250]
- -
diff --git a/source/DasBlog.Web.UI/Themes/darkly/_BlogPageSummary.cshtml b/source/DasBlog.Web.UI/Themes/darkly/_BlogPageSummary.cshtml index 84efacee..a8f7873c 100644 --- a/source/DasBlog.Web.UI/Themes/darkly/_BlogPageSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/darkly/_BlogPageSummary.cshtml @@ -1,7 +1,13 @@ +@using DasBlog.Web.Models.BlogViewModels; @model ListPostsViewModel -
-
- +
+
+

+

+ +
+ +
\ No newline at end of file diff --git a/source/DasBlog.Web.UI/Themes/dasblog/_BlogItemSummary.cshtml b/source/DasBlog.Web.UI/Themes/dasblog/_BlogItemSummary.cshtml index 5f3781e0..6fe781e6 100644 --- a/source/DasBlog.Web.UI/Themes/dasblog/_BlogItemSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/dasblog/_BlogItemSummary.cshtml @@ -1,37 +1,17 @@ @model PostViewModel -@{ - ViewData["Title"] = @Model.Title; -} -
-
-
-

- -
-
+
+
+
+ +

+ +

+ +

-
-
- -
-
-
-
- Categories: -
-
- Share on Twitter or Facebook -
-
- - - -
-
- + Continue reading...
+ Thumbnail [200x250]
- -
diff --git a/source/DasBlog.Web.UI/Themes/dasblog/_BlogPageSummary.cshtml b/source/DasBlog.Web.UI/Themes/dasblog/_BlogPageSummary.cshtml index 273dd01e..fefa700a 100644 --- a/source/DasBlog.Web.UI/Themes/dasblog/_BlogPageSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/dasblog/_BlogPageSummary.cshtml @@ -1,8 +1,13 @@ +@using DasBlog.Web.Models.BlogViewModels; @model ListPostsViewModel -
-
- +
+
+

+

- +
+ +
+
diff --git a/source/DasBlog.Web.UI/Themes/fulcrum/_BlogItemSummary.cshtml b/source/DasBlog.Web.UI/Themes/fulcrum/_BlogItemSummary.cshtml index 9331b850..6fe781e6 100644 --- a/source/DasBlog.Web.UI/Themes/fulcrum/_BlogItemSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/fulcrum/_BlogItemSummary.cshtml @@ -8,11 +8,10 @@ -

+

- Continue reading + Continue reading...
Thumbnail [200x250]
- diff --git a/source/DasBlog.Web.UI/Themes/journal/_BlogItemSummary.cshtml b/source/DasBlog.Web.UI/Themes/journal/_BlogItemSummary.cshtml index 5f3781e0..6fe781e6 100644 --- a/source/DasBlog.Web.UI/Themes/journal/_BlogItemSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/journal/_BlogItemSummary.cshtml @@ -1,37 +1,17 @@ @model PostViewModel -@{ - ViewData["Title"] = @Model.Title; -} -
-
-
-

- -
-
+
+
+
+ +

+ +

+ +

-
-
- -
-
-
-
- Categories: -
-
- Share on Twitter or Facebook -
-
- - - -
-
- + Continue reading...
+ Thumbnail [200x250]
- -
diff --git a/source/DasBlog.Web.UI/Themes/journal/_BlogPageSummary.cshtml b/source/DasBlog.Web.UI/Themes/journal/_BlogPageSummary.cshtml index 635bc48a..fefa700a 100644 --- a/source/DasBlog.Web.UI/Themes/journal/_BlogPageSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/journal/_BlogPageSummary.cshtml @@ -1,8 +1,13 @@ @using DasBlog.Web.Models.BlogViewModels; @model ListPostsViewModel -
-
- +
+
+

+

+ +
+ +
diff --git a/source/DasBlog.Web.UI/Themes/median/_BlogItemSummary.cshtml b/source/DasBlog.Web.UI/Themes/median/_BlogItemSummary.cshtml index 93d12bad..f3fb3662 100644 --- a/source/DasBlog.Web.UI/Themes/median/_BlogItemSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/median/_BlogItemSummary.cshtml @@ -8,11 +8,11 @@

- +

- Continue Reading + Continue reading...

From 3b2dc6b439e5aa13e9d9eaa846dcac8731742f9c Mon Sep 17 00:00:00 2001 From: Mark Downie Date: Sat, 8 Aug 2020 22:51:13 -0400 Subject: [PATCH 3/4] Removed text formatting color --- source/DasBlog.Web.UI/Themes/darkly/_BlogItemSummary.cshtml | 2 +- source/DasBlog.Web.UI/Themes/dasblog/_BlogItemSummary.cshtml | 2 +- source/DasBlog.Web.UI/Themes/fulcrum/_BlogItemSummary.cshtml | 2 +- source/DasBlog.Web.UI/Themes/median/_BlogItemSummary.cshtml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/DasBlog.Web.UI/Themes/darkly/_BlogItemSummary.cshtml b/source/DasBlog.Web.UI/Themes/darkly/_BlogItemSummary.cshtml index 6fe781e6..48b3e033 100644 --- a/source/DasBlog.Web.UI/Themes/darkly/_BlogItemSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/darkly/_BlogItemSummary.cshtml @@ -5,7 +5,7 @@

- +

diff --git a/source/DasBlog.Web.UI/Themes/dasblog/_BlogItemSummary.cshtml b/source/DasBlog.Web.UI/Themes/dasblog/_BlogItemSummary.cshtml index 6fe781e6..84fe3131 100644 --- a/source/DasBlog.Web.UI/Themes/dasblog/_BlogItemSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/dasblog/_BlogItemSummary.cshtml @@ -5,7 +5,7 @@

- +

diff --git a/source/DasBlog.Web.UI/Themes/fulcrum/_BlogItemSummary.cshtml b/source/DasBlog.Web.UI/Themes/fulcrum/_BlogItemSummary.cshtml index 6fe781e6..48b3e033 100644 --- a/source/DasBlog.Web.UI/Themes/fulcrum/_BlogItemSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/fulcrum/_BlogItemSummary.cshtml @@ -5,7 +5,7 @@

- +

diff --git a/source/DasBlog.Web.UI/Themes/median/_BlogItemSummary.cshtml b/source/DasBlog.Web.UI/Themes/median/_BlogItemSummary.cshtml index f3fb3662..5ad4e98c 100644 --- a/source/DasBlog.Web.UI/Themes/median/_BlogItemSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/median/_BlogItemSummary.cshtml @@ -2,7 +2,7 @@

- +

From c17775a9f31fa30c350663809ac1c1830311ba37 Mon Sep 17 00:00:00 2001 From: Mark Downie Date: Sat, 8 Aug 2020 23:16:07 -0400 Subject: [PATCH 4/4] Ensured theme colors and alignments are more consistent. --- source/DasBlog.Web.UI/Themes/darkly/_BlogPageSummary.cshtml | 2 +- source/DasBlog.Web.UI/Themes/dasblog/_BlogPageSummary.cshtml | 2 +- source/DasBlog.Web.UI/Themes/fulcrum/_BlogPageSummary.cshtml | 2 +- source/DasBlog.Web.UI/Themes/fulcrum/custom.css | 4 ++++ source/DasBlog.Web.UI/Themes/journal/_BlogPageSummary.cshtml | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/source/DasBlog.Web.UI/Themes/darkly/_BlogPageSummary.cshtml b/source/DasBlog.Web.UI/Themes/darkly/_BlogPageSummary.cshtml index a8f7873c..4fe6fe27 100644 --- a/source/DasBlog.Web.UI/Themes/darkly/_BlogPageSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/darkly/_BlogPageSummary.cshtml @@ -1,7 +1,7 @@ @using DasBlog.Web.Models.BlogViewModels; @model ListPostsViewModel -

+

diff --git a/source/DasBlog.Web.UI/Themes/dasblog/_BlogPageSummary.cshtml b/source/DasBlog.Web.UI/Themes/dasblog/_BlogPageSummary.cshtml index fefa700a..fc2a8d1b 100644 --- a/source/DasBlog.Web.UI/Themes/dasblog/_BlogPageSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/dasblog/_BlogPageSummary.cshtml @@ -1,7 +1,7 @@ @using DasBlog.Web.Models.BlogViewModels; @model ListPostsViewModel -
+

diff --git a/source/DasBlog.Web.UI/Themes/fulcrum/_BlogPageSummary.cshtml b/source/DasBlog.Web.UI/Themes/fulcrum/_BlogPageSummary.cshtml index fefa700a..098bd1f1 100644 --- a/source/DasBlog.Web.UI/Themes/fulcrum/_BlogPageSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/fulcrum/_BlogPageSummary.cshtml @@ -1,7 +1,7 @@ @using DasBlog.Web.Models.BlogViewModels; @model ListPostsViewModel -
+

diff --git a/source/DasBlog.Web.UI/Themes/fulcrum/custom.css b/source/DasBlog.Web.UI/Themes/fulcrum/custom.css index 0c6c8673..bef806b9 100644 --- a/source/DasBlog.Web.UI/Themes/fulcrum/custom.css +++ b/source/DasBlog.Web.UI/Themes/fulcrum/custom.css @@ -3,6 +3,10 @@ a { color: forestgreen} +.bg-primary { + background-color: forestgreen !important +} + .blog-header { line-height: 1; border-bottom: 1px solid #e5e5e5; diff --git a/source/DasBlog.Web.UI/Themes/journal/_BlogPageSummary.cshtml b/source/DasBlog.Web.UI/Themes/journal/_BlogPageSummary.cshtml index fefa700a..230db171 100644 --- a/source/DasBlog.Web.UI/Themes/journal/_BlogPageSummary.cshtml +++ b/source/DasBlog.Web.UI/Themes/journal/_BlogPageSummary.cshtml @@ -1,7 +1,7 @@ @using DasBlog.Web.Models.BlogViewModels; @model ListPostsViewModel -
+