diff --git a/components/groovy/com/jessebrault/site/StandardPage.groovy b/components/groovy/com/jessebrault/site/StandardPage.groovy index d1bcbb1..fcd1ae0 100644 --- a/components/groovy/com/jessebrault/site/StandardPage.groovy +++ b/components/groovy/com/jessebrault/site/StandardPage.groovy @@ -1,6 +1,9 @@ package com.jessebrault.site + import groowt.view.component.web.BaseWebViewComponent +import groowt.view.component.web.WebViewComponent +import org.jetbrains.annotations.Nullable import java.time.LocalDate import java.time.format.DateTimeFormatter @@ -8,12 +11,14 @@ import java.time.format.DateTimeFormatter class StandardPage extends BaseWebViewComponent { final String title + final Closure banner StandardPage(Map attr) { this.title = attr.title + this.banner = attr.banner ?: { '' } } - List getPageChildren() { + List getMainChildren() { this.children } diff --git a/components/groovy/com/jessebrault/site/biography/BiographyBanner.groovy b/components/groovy/com/jessebrault/site/biography/BiographyBanner.groovy new file mode 100644 index 0000000..bf15f3c --- /dev/null +++ b/components/groovy/com/jessebrault/site/biography/BiographyBanner.groovy @@ -0,0 +1,17 @@ +package com.jessebrault.site.biography + +import com.jessebrault.ssg.view.SkipTemplate +import groowt.view.View +import groowt.view.component.web.lib.DelegatingWebViewComponent + +@SkipTemplate +class BiographyBanner extends DelegatingWebViewComponent { + + private static final String biographyBannerSrc = BiographyBanner.getResource('BiographyBanner.txt').text + + @Override + protected View getDelegate() { + return { Writer w -> w << biographyBannerSrc } + } + +} diff --git a/components/resources/com/jessebrault/site/HeadTemplate.wvc b/components/resources/com/jessebrault/site/HeadTemplate.wvc index b4e5103..e90ddce 100644 --- a/components/resources/com/jessebrault/site/HeadTemplate.wvc +++ b/components/resources/com/jessebrault/site/HeadTemplate.wvc @@ -8,7 +8,7 @@ package com.jessebrault.site - + diff --git a/components/resources/com/jessebrault/site/HeaderTemplate.wvc b/components/resources/com/jessebrault/site/HeaderTemplate.wvc index de810dd..0a2aa1c 100644 --- a/components/resources/com/jessebrault/site/HeaderTemplate.wvc +++ b/components/resources/com/jessebrault/site/HeaderTemplate.wvc @@ -3,12 +3,12 @@ package com.jessebrault.site ---
-

$siteName

-

$siteTagLine

+

$siteName

+

$siteTagLine

diff --git a/components/resources/com/jessebrault/site/StandardPageTemplate.wvc b/components/resources/com/jessebrault/site/StandardPageTemplate.wvc index c3220e8..bc0f183 100644 --- a/components/resources/com/jessebrault/site/StandardPageTemplate.wvc +++ b/components/resources/com/jessebrault/site/StandardPageTemplate.wvc @@ -4,12 +4,15 @@ package com.jessebrault.site import com.jessebrault.site.icon.SpotifyIcon import com.jessebrault.site.icon.YoutubeIcon --- - + -
+
+
+ <% children -> children << banner() %> +
- <% children -> pageChildren.each { children << it } %> + <% children -> mainChildren.each { children << it } %>