diff --git a/pagetop-admin/src/summary.rs b/pagetop-admin/src/summary.rs index 1851b773..4058bd2b 100644 --- a/pagetop-admin/src/summary.rs +++ b/pagetop-admin/src/summary.rs @@ -6,7 +6,10 @@ pub async fn summary(request: server::HttpRequest) -> ResultPage ResultPage std::io::Result<()> { - pagetop_build::bundle_resources("./static", "mengamenu", None) + pagetop_build::bundle_resources("./static", "megamenu", None) } diff --git a/pagetop-megamenu/src/component.rs b/pagetop-megamenu/src/component.rs index 99c8eefb..96bc7f76 100644 --- a/pagetop-megamenu/src/component.rs +++ b/pagetop-megamenu/src/component.rs @@ -186,14 +186,14 @@ impl ComponentTrait for MegaMenu { fn default_render(&self, rcx: &mut RenderContext) -> Markup { rcx.alter(ContextOp::AddStyleSheet( - StyleSheet::located("/megamenu/css/menu.css").with_version("1.1.1"), - )) - .alter(ContextOp::AddStyleSheet( - StyleSheet::located("/megamenu/css/menu-clean.css").with_version("1.1.1"), - )) - .alter(ContextOp::AddJavaScript( - JavaScript::located("/megamenu/js/menu.min.js").with_version("1.1.1"), - )); + StyleSheet::located("/megamenu/css/menu.css").with_version("1.1.1"), + )) + .alter(ContextOp::AddStyleSheet( + StyleSheet::located("/megamenu/css/menu-clean.css").with_version("1.1.1"), + )) + .alter(ContextOp::AddJavaScript( + JavaScript::located("/megamenu/js/menu.min.js").with_version("1.1.1"), + )); pagetop_jquery::JQuery::add_jquery(rcx); let id = rcx.required_id::(self.id()); diff --git a/pagetop/src/base/module.rs b/pagetop/src/base/module.rs index b3ec2650..83a30b73 100644 --- a/pagetop/src/base/module.rs +++ b/pagetop/src/base/module.rs @@ -1,3 +1,5 @@ pub mod saturn; + pub mod menu; + pub mod homepage; diff --git a/pagetop/src/core/module.rs b/pagetop/src/core/module.rs index 53b54c84..24fe5016 100644 --- a/pagetop/src/core/module.rs +++ b/pagetop/src/core/module.rs @@ -1,5 +1,5 @@ -mod module; -pub use module::{BaseModule, ModuleStaticRef, ModuleTrait}; +mod definition; +pub use definition::{BaseModule, ModuleStaticRef, ModuleTrait}; mod theme; pub use theme::{ThemeStaticRef, ThemeTrait}; diff --git a/pagetop/src/core/module/all.rs b/pagetop/src/core/module/all.rs index 453d07ff..2e5ad048 100644 --- a/pagetop/src/core/module/all.rs +++ b/pagetop/src/core/module/all.rs @@ -95,7 +95,10 @@ fn add_to_enabled(list: &mut Vec, module: ModuleStaticRef) { if let Some(theme) = module.theme() { let mut registered_themes = THEMES.write().unwrap(); - if !registered_themes.iter().any(|t| t.handle() == theme.handle()) { + if !registered_themes + .iter() + .any(|t| t.handle() == theme.handle()) + { registered_themes.push(theme); trace::debug!("Enabling \"{}\" theme", theme.single_name()); } diff --git a/pagetop/src/core/module/module.rs b/pagetop/src/core/module/definition.rs similarity index 100% rename from pagetop/src/core/module/module.rs rename to pagetop/src/core/module/definition.rs