diff --git a/pagetop/src/base/component/menu.rs b/pagetop/src/base/component/menu.rs index ef7668aa..22902ed2 100644 --- a/pagetop/src/base/component/menu.rs +++ b/pagetop/src/base/component/menu.rs @@ -208,13 +208,13 @@ impl ComponentTrait for Menu { fn default_render(&self, context: &mut InContext) -> Markup { context - .add_stylesheet(StyleSheet::source( + .add_stylesheet(StyleSheet::with_source( "/theme/menu/css/menu.css?ver=1.1.1" )) - .add_stylesheet(StyleSheet::source( + .add_stylesheet(StyleSheet::with_source( "/theme/menu/css/menu-clean.css?ver=1.1.1" )) - .add_javascript(JavaScript::source( + .add_javascript(JavaScript::with_source( "/theme/menu/js/menu.min.js?ver=1.1.1" )) .add_jquery(); diff --git a/pagetop/src/base/theme/aliner.rs b/pagetop/src/base/theme/aliner.rs index ae6c7475..e4180303 100644 --- a/pagetop/src/base/theme/aliner.rs +++ b/pagetop/src/base/theme/aliner.rs @@ -22,7 +22,7 @@ impl ThemeTrait for Aliner { .with_icon("/theme/favicon.png") ) .add_stylesheet( - StyleSheet::source( + StyleSheet::with_source( "/aliner/css/styles.css" ) .with_weight(-99) diff --git a/pagetop/src/base/theme/bootsier.rs b/pagetop/src/base/theme/bootsier.rs index 494bda17..ec294457 100644 --- a/pagetop/src/base/theme/bootsier.rs +++ b/pagetop/src/base/theme/bootsier.rs @@ -24,13 +24,13 @@ impl ThemeTrait for Bootsier { .with_icon("/theme/favicon.png") ) .add_stylesheet( - StyleSheet::source( + StyleSheet::with_source( "/bootsier/css/bootstrap.min.css?ver=5.1.3" ) .with_weight(-99) ) .add_javascript( - JavaScript::source( + JavaScript::with_source( "/bootsier/js/bootstrap.bundle.min.js?ver=5.1.3" ) .with_weight(-99) diff --git a/pagetop/src/base/theme/bulmix.rs b/pagetop/src/base/theme/bulmix.rs index f099d880..9dfde724 100644 --- a/pagetop/src/base/theme/bulmix.rs +++ b/pagetop/src/base/theme/bulmix.rs @@ -22,7 +22,7 @@ impl ThemeTrait for Bulmix { .with_icon("/theme/favicon.png") ) .add_stylesheet( - StyleSheet::source( + StyleSheet::with_source( "/bulmix/css/bulma.min.css?ver=0.9.3" ) .with_weight(-99) diff --git a/pagetop/src/core/component/context.rs b/pagetop/src/core/component/context.rs index 9b788557..6fcf7be8 100644 --- a/pagetop/src/core/component/context.rs +++ b/pagetop/src/core/component/context.rs @@ -101,7 +101,7 @@ pub struct JavaScript { mode : JSMode, } impl JavaScript { - pub fn source(s: &'static str) -> Self { + pub fn with_source(s: &'static str) -> Self { JavaScript { source: s, weight: 0, @@ -119,11 +119,7 @@ impl JavaScript { self } - pub fn weight(self) -> isize { - self.weight - } - - pub fn render(&self) -> Markup { + fn render(&self) -> Markup { html! { script type="text/javascript" src=(self.source) @@ -141,7 +137,7 @@ pub struct StyleSheet { weight: isize, } impl StyleSheet { - pub fn source(s: &'static str) -> Self { + pub fn with_source(s: &'static str) -> Self { StyleSheet { source: s, weight: 0, @@ -153,10 +149,6 @@ impl StyleSheet { self } - pub fn weight(self) -> isize { - self.weight - } - fn render(&self) -> Markup { html! { link rel="stylesheet" href=(self.source); @@ -234,7 +226,7 @@ impl InContext { pub fn add_jquery(&mut self) -> &mut Self { if !self.with_jquery { self.add_javascript( - JavaScript::source( + JavaScript::with_source( "/theme/js/jquery.min.js?ver=3.6.0" ) .with_weight(isize::MIN) diff --git a/pagetop/src/core/component/definition.rs b/pagetop/src/core/component/definition.rs index 96950798..4912214e 100644 --- a/pagetop/src/core/component/definition.rs +++ b/pagetop/src/core/component/definition.rs @@ -55,7 +55,7 @@ pub fn render_component(component: &mut dyn ComponentTrait, context: &mut InCont // Acciones de los módulos antes de renderizar el componente. run_hooks( BEFORE_RENDER_COMPONENT_HOOK, - |a| hook_ref::(&**a).run(component, context) + |hook| hook_ref::(&**hook).run(component, context) ); // Acciones del tema antes de renderizar el componente. diff --git a/pagetop/src/response/page/definition.rs b/pagetop/src/response/page/definition.rs index fb9f0fa8..ba210d2d 100644 --- a/pagetop/src/response/page/definition.rs +++ b/pagetop/src/response/page/definition.rs @@ -153,7 +153,7 @@ impl<'a> Page<'a> { // Acciones de los módulos antes de renderizar la página. run_hooks( BEFORE_RENDER_PAGE_HOOK, - |a| hook_ref::(&**a).run(self) + |hook| hook_ref::(&**hook).run(self) ); // Acciones del tema antes de renderizar la página.