diff --git a/CHDataManagement/Generator/Page Generators/FeedPageGenerator.swift b/CHDataManagement/Generator/Page Generators/FeedPageGenerator.swift index 2d6b69e..0360d74 100644 --- a/CHDataManagement/Generator/Page Generators/FeedPageGenerator.swift +++ b/CHDataManagement/Generator/Page Generators/FeedPageGenerator.swift @@ -68,7 +68,7 @@ final class FeedPageGenerator { header: pageHeader, additionalFooter: footer) { content in if let pageTitle { - content += "

\(pageTitle)

" + content += "

\(pageTitle)

\n" } for post in posts { content += FeedEntry(data: post).content diff --git a/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayer.swift b/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayer.swift index 433deea..f19857d 100644 --- a/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayer.swift +++ b/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayer.swift @@ -122,7 +122,13 @@ struct AudioPlayer: HtmlProducer { var content: String { """ -
\(name)\(album) • \(artist)
+
+ +
+ \(name) + \(album) • \(artist) +
+
""" } } diff --git a/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayerContent.swift b/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayerContent.swift index 7ff3347..dd50c83 100644 --- a/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayerContent.swift +++ b/CHDataManagement/Page Elements/ContentElements/AudioPlayer/AudioPlayerContent.swift @@ -18,14 +18,14 @@ struct AudioPlayerScript: HtmlProducer { } func populate(_ result: inout String) { - result += "" + result += "\n" } private var animatePlaylist: String { diff --git a/CHDataManagement/Page Elements/FeedEntry.swift b/CHDataManagement/Page Elements/FeedEntry.swift index c6d1ea1..3e94e09 100644 --- a/CHDataManagement/Page Elements/FeedEntry.swift +++ b/CHDataManagement/Page Elements/FeedEntry.swift @@ -1,6 +1,6 @@ import Foundation -struct FeedEntry { +struct FeedEntry: HtmlProducer { private let data: FeedEntryData @@ -12,8 +12,8 @@ struct FeedEntry { data.link != nil ? " linked-card" : "" } - var content: String { - var result = "
" + func populate(_ result: inout String) { + result += "
" switch data.media { case .images(let images): ImageGallery(id: data.entryId, images: images).populate(&result) @@ -41,7 +41,6 @@ struct FeedEntry { if let url = data.link { result += "" } - result += "
" // Closes card-content, card, article - return result + result += "\n" // Closes card-content, card, article } } diff --git a/CHDataManagement/Page Elements/GenericPage.swift b/CHDataManagement/Page Elements/GenericPage.swift index ca96a82..130cbc2 100644 --- a/CHDataManagement/Page Elements/GenericPage.swift +++ b/CHDataManagement/Page Elements/GenericPage.swift @@ -19,8 +19,9 @@ struct GenericPage { var content: String { var result = "" header.populate(&result) // Opens
+ result += "\n" insertedContent(&result) - result += "
" // Close
+ result += "
\n" // Close
result += additionalFooter result += "" // Close return result