From 48fa9e9db9b4c3b5f564c828bb33891e30fd7842 Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Thu, 31 Mar 2022 00:50:53 +0200
Subject: [PATCH] Modifica el renderizado de contenedores internos

---
 pagetop/src/base/component/container.rs | 20 +++++++++-----------
 pagetop/src/base/component/form/form.rs | 14 +++++---------
 pagetop/src/base/component/menu.rs      | 14 ++++++--------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/pagetop/src/base/component/container.rs b/pagetop/src/base/component/container.rs
index 94003ae0..24172d00 100644
--- a/pagetop/src/base/component/container.rs
+++ b/pagetop/src/base/component/container.rs
@@ -39,34 +39,34 @@ impl PageComponent for Container {
             ContainerType::Header => html! {
                 header id=[self.id()] class=[self.classes("header")] {
                     div class="container" {
-                        (self.render_components(assets))
+                        (self.components().render(assets))
                     }
                 }
             },
             ContainerType::Footer => html! {
                 footer id=[self.id()] class=[self.classes("footer")] {
                     div class="container" {
-                        (self.render_components(assets))
+                        (self.components().render(assets))
                     }
                 }
             },
             ContainerType::Main => html! {
                 main id=[self.id()] class=[self.classes("main")] {
                     div class="container" {
-                        (self.render_components(assets))
+                        (self.components().render(assets))
                     }
                 }
             },
             ContainerType::Section => html! {
                 section id=[self.id()] class=[self.classes("section")] {
                     div class="container" {
-                        (self.render_components(assets))
+                        (self.components().render(assets))
                     }
                 }
             },
             _ => html! {
                 div id=[self.id()] class=[self.classes("container")] {
-                    (self.render_components(assets))
+                    (self.components().render(assets))
                 }
             }
         }
@@ -142,6 +142,10 @@ impl Container {
         &self.container
     }
 
+    pub fn components(&self) -> &PageContainer {
+        &self.components
+    }
+
     pub fn id(&self) -> &Option<String> {
         self.id.option()
     }
@@ -153,12 +157,6 @@ impl Container {
     pub fn template(&self) -> &str {
         self.template.as_str()
     }
-
-    // Container EXTRAS.
-
-    pub fn render_components(&self, assets: &mut PageAssets) -> Markup {
-        html! { (self.components.render(assets)) }
-    }
 }
 
 fn always() -> bool {
diff --git a/pagetop/src/base/component/form/form.rs b/pagetop/src/base/component/form/form.rs
index c4d8e206..2d88d141 100644
--- a/pagetop/src/base/component/form/form.rs
+++ b/pagetop/src/base/component/form/form.rs
@@ -51,9 +51,7 @@ impl PageComponent for Form {
                 method=[method]
                 accept-charset=[self.charset()]
             {
-                div {
-                    (self.render_elements(assets))
-                }
+                div { (self.elements().render(assets)) }
             }
         }
     }
@@ -127,6 +125,10 @@ impl Form {
         &self.method
     }
 
+    pub fn elements(&self) -> &PageContainer {
+        &self.elements
+    }
+
     pub fn id(&self) -> &Option<String> {
         self.id.option()
     }
@@ -138,12 +140,6 @@ impl Form {
     pub fn template(&self) -> &str {
         self.template.as_str()
     }
-
-    // Form EXTRAS.
-
-    pub fn render_elements(&self, assets: &mut PageAssets) -> Markup {
-        html! { (self.elements.render(assets)) }
-    }
 }
 
 fn always() -> bool {
diff --git a/pagetop/src/base/component/menu.rs b/pagetop/src/base/component/menu.rs
index 91881908..85b9007e 100644
--- a/pagetop/src/base/component/menu.rs
+++ b/pagetop/src/base/component/menu.rs
@@ -58,7 +58,7 @@ impl PageComponent for MenuItem {
                 li class="submenu" {
                     a href="#" { (label) }
                     ul {
-                        (menu.render_items(assets))
+                        (menu.items().render(assets))
                     }
                 }
             },
@@ -198,7 +198,7 @@ impl PageComponent for Menu {
         let id = assets.serial_id(self.name(), self.id());
         html! {
             ul id=(id) class=[self.classes("sm sm-clean")] {
-                (self.render_items(assets))
+                (self.items().render(assets))
             }
             script type="text/javascript" defer {
                 "jQuery(function(){jQuery('#" (id) "').smartmenus({"
@@ -251,6 +251,10 @@ impl Menu {
 
     // Menu GETTERS.
 
+    pub fn items(&self) -> &PageContainer {
+        &self.items
+    }
+
     pub fn id(&self) -> &Option<String> {
         self.id.option()
     }
@@ -262,12 +266,6 @@ impl Menu {
     pub fn template(&self) -> &str {
         self.template.as_str()
     }
-
-    // Menu EXTRAS.
-
-    pub fn render_items(&self, assets: &mut PageAssets) -> Markup {
-        html! { (self.items.render(assets)) }
-    }
 }
 
 fn always() -> bool {