manuelcillero/pagetop
manuelcillero/pagetop
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Corrige API del grid

Browse source
This commit is contained in:
Manuel Cillero 2022-03-31 21:05:54 +02:00
parent 48fa9e9db9
commit cc579add5f
3 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pagetop/src/base/component/grid/column.rs
View file

@ -37,7 +37,7 @@ impl PageComponent for Column {
fn default_render(&self, assets: &mut PageAssets) -> Markup { fn default_render(&self, assets: &mut PageAssets) -> Markup {
html! { html! {
div id=[self.id()] class=[self.classes("col")] { div id=[self.id()] class=[self.classes("col")] {
(self.render_components(assets)) (self.components().render(assets))
} }
} }
} }
@ -84,6 +84,10 @@ impl Column {
// Column GETTERS. // Column GETTERS.
pub fn components(&self) -> &PageContainer {
&self.components
}
pub fn id(&self) -> &Option<String> { pub fn id(&self) -> &Option<String> {
self.id.option() self.id.option()
} }
@ -95,12 +99,6 @@ impl Column {
pub fn template(&self) -> &str { pub fn template(&self) -> &str {
self.template.as_str() self.template.as_str()
} }
// Column EXTRAS.
pub fn render_components(&self, assets: &mut PageAssets) -> Markup {
html! { (self.components.render(assets)) }
}
} }
fn always() -> bool { fn always() -> bool {

12
pagetop/src/base/component/grid/row.rs
View file

@ -37,7 +37,7 @@ impl PageComponent for Row {
fn default_render(&self, assets: &mut PageAssets) -> Markup { fn default_render(&self, assets: &mut PageAssets) -> Markup {
html! { html! {
div id=[self.id()] class=[self.classes("row")] { div id=[self.id()] class=[self.classes("row")] {
(self.render_columns(assets)) (self.columns().render(assets))
} }
} }
} }
@ -84,6 +84,10 @@ impl Row {
// Row GETTERS. // Row GETTERS.
pub fn columns(&self) -> &PageContainer {
&self.columns
}
pub fn id(&self) -> &Option<String> { pub fn id(&self) -> &Option<String> {
self.id.option() self.id.option()
} }
@ -95,12 +99,6 @@ impl Row {
pub fn template(&self) -> &str { pub fn template(&self) -> &str {
self.template.as_str() self.template.as_str()
} }
// Row EXTRAS.
pub fn render_columns(&self, assets: &mut PageAssets) -> Markup {
html! { (self.columns.render(assets)) }
}
} }
fn always() -> bool { fn always() -> bool {

4
pagetop/src/base/theme/bulmix/mod.rs
View file

@ -42,7 +42,7 @@ impl ThemeTrait for BulmixTheme {
let row = component.downcast_ref::<grid::Row>().unwrap(); let row = component.downcast_ref::<grid::Row>().unwrap();
Some(html! { Some(html! {
div id=[row.id()] class=[row.classes("columns")] { div id=[row.id()] class=[row.classes("columns")] {
(row.render_columns(assets)) (row.columns().render(assets))
} }
}) })
}, },
@ -50,7 +50,7 @@ impl ThemeTrait for BulmixTheme {
let col = component.downcast_ref::<grid::Column>().unwrap(); let col = component.downcast_ref::<grid::Column>().unwrap();
Some(html! { Some(html! {
div id=[col.id()] class=[col.classes("column")] { div id=[col.id()] class=[col.classes("column")] {
(col.render_components(assets)) (col.components().render(assets))
} }
}) })
}, },