diff --git a/pagetop/src/core/component/bundle.rs b/pagetop/src/core/component/bundle.rs index 8ceccbd0..5588feb4 100644 --- a/pagetop/src/core/component/bundle.rs +++ b/pagetop/src/core/component/bundle.rs @@ -114,7 +114,7 @@ impl ComponentsBundle { .filter(move |&c| c.read().unwrap().handle() == handle) } - // ComponentsBundle RENDER. + // ComponentsBundle PREPARE. pub fn prepare(&self, rcx: &mut RenderContext) -> Markup { let mut components = self.0.clone(); diff --git a/pagetop/src/core/component/context.rs b/pagetop/src/core/component/context.rs index f8ddc97f..f95da247 100644 --- a/pagetop/src/core/component/context.rs +++ b/pagetop/src/core/component/context.rs @@ -109,12 +109,12 @@ impl RenderContext { None } - /// Context RENDER. + /// Context PREPARE. - pub fn render(&mut self) -> Markup { + pub fn prepare(&mut self) -> Markup { html! { - (self.stylesheets.render()) - (self.javascripts.render()) + (self.stylesheets.prepare()) + (self.javascripts.prepare()) } } diff --git a/pagetop/src/core/theme/definition.rs b/pagetop/src/core/theme/definition.rs index c68bea0d..e2381370 100644 --- a/pagetop/src/core/theme/definition.rs +++ b/pagetop/src/core/theme/definition.rs @@ -51,11 +51,11 @@ pub trait ThemeTrait: ModuleTrait + Send + Sync { meta property=(property) content=(content) {} } - @if let Some(f) = page.favicon() { - (f.render()) + @if let Some(favicon) = page.favicon() { + (favicon.prepare()) } - (page.context().render()) + (page.context().prepare()) } } } diff --git a/pagetop/src/html/assets.rs b/pagetop/src/html/assets.rs index fb9b5722..6ca33c81 100644 --- a/pagetop/src/html/assets.rs +++ b/pagetop/src/html/assets.rs @@ -8,7 +8,7 @@ pub trait AssetsTrait { fn weight(&self) -> isize; - fn render(&self) -> Markup; + fn prepare(&self) -> Markup; } #[derive(Default)] @@ -39,12 +39,12 @@ impl Assets { self } - pub fn render(&mut self) -> Markup { + pub fn prepare(&mut self) -> Markup { let assets = &mut self.0; assets.sort_by_key(|a| a.weight()); html! { @for a in assets { - (a.render()) + (a.prepare()) } } } diff --git a/pagetop/src/html/assets/javascript.rs b/pagetop/src/html/assets/javascript.rs index 9a9393ce..be7a42f2 100644 --- a/pagetop/src/html/assets/javascript.rs +++ b/pagetop/src/html/assets/javascript.rs @@ -28,7 +28,7 @@ impl AssetsTrait for JavaScript { self.weight } - fn render(&self) -> Markup { + fn prepare(&self) -> Markup { html! { script type="text/javascript" src=(crate::concat_string!(self.source, self.prefix, self.version)) diff --git a/pagetop/src/html/assets/stylesheet.rs b/pagetop/src/html/assets/stylesheet.rs index 9282a2dd..339f44f6 100644 --- a/pagetop/src/html/assets/stylesheet.rs +++ b/pagetop/src/html/assets/stylesheet.rs @@ -27,7 +27,7 @@ impl AssetsTrait for StyleSheet { self.weight } - fn render(&self) -> Markup { + fn prepare(&self) -> Markup { html! { link rel="stylesheet" diff --git a/pagetop/src/html/favicon.rs b/pagetop/src/html/favicon.rs index ac669ef8..651b476b 100644 --- a/pagetop/src/html/favicon.rs +++ b/pagetop/src/html/favicon.rs @@ -80,9 +80,9 @@ impl Favicon { self } - // Favicon RENDER. + // Favicon PREPARE. - pub(crate) fn render(&self) -> Markup { + pub(crate) fn prepare(&self) -> Markup { html! { @for item in &self.0 { (item)