🎨 Mejora uso de las regiones en contexto y página
This commit is contained in:
parent
6d6c0f874b
commit
31310c1c13
5 changed files with 142 additions and 121 deletions
|
|
@ -93,76 +93,74 @@ fn render_intro(page: &mut Page) -> Markup {
|
||||||
let intro_button_lnk: Option<&String> = page.param("intro_button_lnk");
|
let intro_button_lnk: Option<&String> = page.param("intro_button_lnk");
|
||||||
|
|
||||||
html! {
|
html! {
|
||||||
body id=[page.body_id().get()] class=[page.body_classes().get()] {
|
header class="intro-header" {
|
||||||
header class="intro-header" {
|
section class="intro-header__body" {
|
||||||
section class="intro-header__body" {
|
h1 class="intro-header__title" {
|
||||||
h1 class="intro-header__title" {
|
span { (title) }
|
||||||
span { (title) }
|
(intro)
|
||||||
(intro)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
aside class="intro-header__image" aria-hidden="true" {
|
}
|
||||||
div class="intro-header__monster" {
|
aside class="intro-header__image" aria-hidden="true" {
|
||||||
picture {
|
div class="intro-header__monster" {
|
||||||
source
|
picture {
|
||||||
type="image/avif"
|
source
|
||||||
src="/img/monster-pagetop_250.avif"
|
type="image/avif"
|
||||||
srcset="/img/monster-pagetop_500.avif 1.5x";
|
src="/img/monster-pagetop_250.avif"
|
||||||
source
|
srcset="/img/monster-pagetop_500.avif 1.5x";
|
||||||
type="image/webp"
|
source
|
||||||
src="/img/monster-pagetop_250.webp"
|
type="image/webp"
|
||||||
srcset="/img/monster-pagetop_500.webp 1.5x";
|
src="/img/monster-pagetop_250.webp"
|
||||||
img
|
srcset="/img/monster-pagetop_500.webp 1.5x";
|
||||||
src="/img/monster-pagetop_250.png"
|
img
|
||||||
srcset="/img/monster-pagetop_500.png 1.5x"
|
src="/img/monster-pagetop_250.png"
|
||||||
alt="Monster PageTop";
|
srcset="/img/monster-pagetop_500.png 1.5x"
|
||||||
}
|
alt="Monster PageTop";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
main class="intro-content" {
|
}
|
||||||
section class="intro-content__body" {
|
main class="intro-content" {
|
||||||
@if intro_button_lnk.is_some() {
|
section class="intro-content__body" {
|
||||||
div class="intro-button" {
|
@if intro_button_lnk.is_some() {
|
||||||
a
|
div class="intro-button" {
|
||||||
class="intro-button__link"
|
a
|
||||||
href=[intro_button_lnk]
|
class="intro-button__link"
|
||||||
target="_blank"
|
href=[intro_button_lnk]
|
||||||
rel="noreferrer"
|
target="_blank"
|
||||||
{
|
rel="noreferrer"
|
||||||
span {} span {} span {}
|
{
|
||||||
div class="intro-button__text" {
|
span {} span {} span {}
|
||||||
(intro_button_txt.using(page))
|
div class="intro-button__text" {
|
||||||
}
|
(intro_button_txt.using(page))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
div class="intro-text" { (page.render_region("content")) }
|
|
||||||
}
|
}
|
||||||
|
div class="intro-text" { (page.render_region("content")) }
|
||||||
}
|
}
|
||||||
footer class="intro-footer" {
|
}
|
||||||
section class="intro-footer__body" {
|
footer class="intro-footer" {
|
||||||
div class="intro-footer__logo" {
|
section class="intro-footer__body" {
|
||||||
svg
|
div class="intro-footer__logo" {
|
||||||
viewBox="0 0 1614 1614"
|
svg
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
viewBox="0 0 1614 1614"
|
||||||
role="img"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
aria-label=[L10n::l("pagetop_logo").lookup(page)]
|
role="img"
|
||||||
preserveAspectRatio="xMidYMid slice"
|
aria-label=[L10n::l("pagetop_logo").lookup(page)]
|
||||||
focusable="false"
|
preserveAspectRatio="xMidYMid slice"
|
||||||
{
|
focusable="false"
|
||||||
path fill="rgb(255,255,255)" d="M 1573,357 L 1415,357 C 1400,357 1388,369 1388,383 L 1388,410 1335,410 1335,357 C 1335,167 1181,13 992,13 L 621,13 C 432,13 278,167 278,357 L 278,410 225,410 225,383 C 225,369 213,357 198,357 L 40,357 C 25,357 13,369 13,383 L 13,648 C 13,662 25,674 40,674 L 198,674 C 213,674 225,662 225,648 L 225,621 278,621 278,1256 C 278,1446 432,1600 621,1600 L 992,1600 C 1181,1600 1335,1446 1335,1256 L 1335,621 1388,621 1388,648 C 1388,662 1400,674 1415,674 L 1573,674 C 1588,674 1600,662 1600,648 L 1600,383 C 1600,369 1588,357 1573,357 L 1573,357 1573,357 Z M 66,410 L 172,410 172,621 66,621 66,410 66,410 Z M 1282,357 L 1282,488 C 1247,485 1213,477 1181,464 L 1196,437 C 1203,425 1199,409 1186,401 1174,394 1158,398 1150,411 L 1133,440 C 1105,423 1079,401 1056,376 L 1075,361 C 1087,352 1089,335 1079,324 1070,313 1054,311 1042,320 L 1023,335 C 1000,301 981,263 967,221 L 1011,196 C 1023,189 1028,172 1021,160 1013,147 997,143 984,150 L 953,168 C 945,136 941,102 940,66 L 992,66 C 1152,66 1282,197 1282,357 L 1282,357 1282,357 Z M 621,66 L 674,66 674,225 648,225 C 633,225 621,237 621,251 621,266 633,278 648,278 L 674,278 674,357 648,357 C 633,357 621,369 621,383 621,398 633,410 648,410 L 674,410 674,489 648,489 C 633,489 621,501 621,516 621,530 633,542 648,542 L 664,542 C 651,582 626,623 600,662 583,653 563,648 542,648 469,648 410,707 410,780 410,787 411,794 412,801 388,805 361,806 331,806 L 331,357 C 331,197 461,66 621,66 L 621,66 621,66 Z M 621,780 C 621,824 586,859 542,859 498,859 463,824 463,780 463,736 498,701 542,701 586,701 621,736 621,780 L 621,780 621,780 Z M 225,463 L 278,463 278,569 225,569 225,463 225,463 Z M 992,1547 L 621,1547 C 461,1547 331,1416 331,1256 L 331,859 C 367,859 400,858 431,851 454,888 495,912 542,912 615,912 674,853 674,780 674,747 662,718 642,695 675,645 706,594 720,542 L 780,542 C 795,542 807,530 807,516 807,501 795,489 780,489 L 727,489 727,410 780,410 C 795,410 807,398 807,383 807,369 795,357 780,357 L 727,357 727,278 780,278 C 795,278 807,266 807,251 807,237 795,225 780,225 L 727,225 727,66 887,66 C 889,111 895,155 905,196 L 869,217 C 856,224 852,240 859,253 864,261 873,266 882,266 887,266 891,265 895,263 L 921,248 C 937,291 958,331 983,367 L 938,403 C 926,412 925,429 934,440 939,447 947,450 954,450 960,450 966,448 971,444 L 1016,408 C 1043,438 1074,465 1108,485 L 1084,527 C 1076,539 1081,555 1093,563 1098,565 1102,566 1107,566 1116,566 1125,561 1129,553 L 1155,509 C 1194,527 1237,538 1282,541 L 1282,1256 C 1282,1416 1152,1547 992,1547 L 992,1547 992,1547 Z M 1335,463 L 1388,463 1388,569 1335,569 1335,463 1335,463 Z M 1441,410 L 1547,410 1547,621 1441,621 1441,410 1441,410 Z" {}
|
{
|
||||||
path fill="rgb(255,255,255)" d="M 1150,1018 L 463,1018 C 448,1018 436,1030 436,1044 L 436,1177 C 436,1348 545,1468 701,1468 L 912,1468 C 1068,1468 1177,1348 1177,1177 L 1177,1044 C 1177,1030 1165,1018 1150,1018 L 1150,1018 1150,1018 Z M 912,1071 L 1018,1071 1018,1124 912,1124 912,1071 912,1071 Z M 489,1071 L 542,1071 542,1124 489,1124 489,1071 489,1071 Z M 701,1415 L 700,1415 C 701,1385 704,1352 718,1343 731,1335 759,1341 795,1359 802,1363 811,1363 818,1359 854,1341 882,1335 895,1343 909,1352 912,1385 913,1415 L 912,1415 701,1415 701,1415 701,1415 Z M 1124,1177 C 1124,1296 1061,1384 966,1408 964,1365 958,1320 922,1298 894,1281 856,1283 807,1306 757,1283 719,1281 691,1298 655,1320 649,1365 647,1408 552,1384 489,1296 489,1177 L 569,1177 C 583,1177 595,1165 595,1150 L 595,1071 859,1071 859,1150 C 859,1165 871,1177 886,1177 L 1044,1177 C 1059,1177 1071,1165 1071,1150 L 1071,1071 1124,1071 1124,1177 1124,1177 1124,1177 Z" {}
|
path fill="rgb(255,255,255)" d="M 1573,357 L 1415,357 C 1400,357 1388,369 1388,383 L 1388,410 1335,410 1335,357 C 1335,167 1181,13 992,13 L 621,13 C 432,13 278,167 278,357 L 278,410 225,410 225,383 C 225,369 213,357 198,357 L 40,357 C 25,357 13,369 13,383 L 13,648 C 13,662 25,674 40,674 L 198,674 C 213,674 225,662 225,648 L 225,621 278,621 278,1256 C 278,1446 432,1600 621,1600 L 992,1600 C 1181,1600 1335,1446 1335,1256 L 1335,621 1388,621 1388,648 C 1388,662 1400,674 1415,674 L 1573,674 C 1588,674 1600,662 1600,648 L 1600,383 C 1600,369 1588,357 1573,357 L 1573,357 1573,357 Z M 66,410 L 172,410 172,621 66,621 66,410 66,410 Z M 1282,357 L 1282,488 C 1247,485 1213,477 1181,464 L 1196,437 C 1203,425 1199,409 1186,401 1174,394 1158,398 1150,411 L 1133,440 C 1105,423 1079,401 1056,376 L 1075,361 C 1087,352 1089,335 1079,324 1070,313 1054,311 1042,320 L 1023,335 C 1000,301 981,263 967,221 L 1011,196 C 1023,189 1028,172 1021,160 1013,147 997,143 984,150 L 953,168 C 945,136 941,102 940,66 L 992,66 C 1152,66 1282,197 1282,357 L 1282,357 1282,357 Z M 621,66 L 674,66 674,225 648,225 C 633,225 621,237 621,251 621,266 633,278 648,278 L 674,278 674,357 648,357 C 633,357 621,369 621,383 621,398 633,410 648,410 L 674,410 674,489 648,489 C 633,489 621,501 621,516 621,530 633,542 648,542 L 664,542 C 651,582 626,623 600,662 583,653 563,648 542,648 469,648 410,707 410,780 410,787 411,794 412,801 388,805 361,806 331,806 L 331,357 C 331,197 461,66 621,66 L 621,66 621,66 Z M 621,780 C 621,824 586,859 542,859 498,859 463,824 463,780 463,736 498,701 542,701 586,701 621,736 621,780 L 621,780 621,780 Z M 225,463 L 278,463 278,569 225,569 225,463 225,463 Z M 992,1547 L 621,1547 C 461,1547 331,1416 331,1256 L 331,859 C 367,859 400,858 431,851 454,888 495,912 542,912 615,912 674,853 674,780 674,747 662,718 642,695 675,645 706,594 720,542 L 780,542 C 795,542 807,530 807,516 807,501 795,489 780,489 L 727,489 727,410 780,410 C 795,410 807,398 807,383 807,369 795,357 780,357 L 727,357 727,278 780,278 C 795,278 807,266 807,251 807,237 795,225 780,225 L 727,225 727,66 887,66 C 889,111 895,155 905,196 L 869,217 C 856,224 852,240 859,253 864,261 873,266 882,266 887,266 891,265 895,263 L 921,248 C 937,291 958,331 983,367 L 938,403 C 926,412 925,429 934,440 939,447 947,450 954,450 960,450 966,448 971,444 L 1016,408 C 1043,438 1074,465 1108,485 L 1084,527 C 1076,539 1081,555 1093,563 1098,565 1102,566 1107,566 1116,566 1125,561 1129,553 L 1155,509 C 1194,527 1237,538 1282,541 L 1282,1256 C 1282,1416 1152,1547 992,1547 L 992,1547 992,1547 Z M 1335,463 L 1388,463 1388,569 1335,569 1335,463 1335,463 Z M 1441,410 L 1547,410 1547,621 1441,621 1441,410 1441,410 Z" {}
|
||||||
path fill="rgb(255,255,255)" d="M 1071,648 C 998,648 939,707 939,780 939,853 998,912 1071,912 1144,912 1203,853 1203,780 1203,707 1144,648 1071,648 L 1071,648 1071,648 Z M 1071,859 C 1027,859 992,824 992,780 992,736 1027,701 1071,701 1115,701 1150,736 1150,780 1150,824 1115,859 1071,859 L 1071,859 1071,859 Z" {}
|
path fill="rgb(255,255,255)" d="M 1150,1018 L 463,1018 C 448,1018 436,1030 436,1044 L 436,1177 C 436,1348 545,1468 701,1468 L 912,1468 C 1068,1468 1177,1348 1177,1177 L 1177,1044 C 1177,1030 1165,1018 1150,1018 L 1150,1018 1150,1018 Z M 912,1071 L 1018,1071 1018,1124 912,1124 912,1071 912,1071 Z M 489,1071 L 542,1071 542,1124 489,1124 489,1071 489,1071 Z M 701,1415 L 700,1415 C 701,1385 704,1352 718,1343 731,1335 759,1341 795,1359 802,1363 811,1363 818,1359 854,1341 882,1335 895,1343 909,1352 912,1385 913,1415 L 912,1415 701,1415 701,1415 701,1415 Z M 1124,1177 C 1124,1296 1061,1384 966,1408 964,1365 958,1320 922,1298 894,1281 856,1283 807,1306 757,1283 719,1281 691,1298 655,1320 649,1365 647,1408 552,1384 489,1296 489,1177 L 569,1177 C 583,1177 595,1165 595,1150 L 595,1071 859,1071 859,1150 C 859,1165 871,1177 886,1177 L 1044,1177 C 1059,1177 1071,1165 1071,1150 L 1071,1071 1124,1071 1124,1177 1124,1177 1124,1177 Z" {}
|
||||||
}
|
path fill="rgb(255,255,255)" d="M 1071,648 C 998,648 939,707 939,780 939,853 998,912 1071,912 1144,912 1203,853 1203,780 1203,707 1144,648 1071,648 L 1071,648 1071,648 Z M 1071,859 C 1027,859 992,824 992,780 992,736 1027,701 1071,701 1115,701 1150,736 1150,780 1150,824 1115,859 1071,859 L 1071,859 1071,859 Z" {}
|
||||||
}
|
|
||||||
div class="intro-footer__links" {
|
|
||||||
a href="https://crates.io/crates/pagetop" target="_blank" rel="noreferrer" { ("Crates.io") }
|
|
||||||
a href="https://docs.rs/pagetop" target="_blank" rel="noreferrer" { ("Docs.rs") }
|
|
||||||
a href="https://git.cillero.es/manuelcillero/pagetop" target="_blank" rel="noreferrer" { (L10n::l("intro_code").using(page)) }
|
|
||||||
em { (L10n::l("intro_have_fun").using(page)) }
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
div class="intro-footer__links" {
|
||||||
|
a href="https://crates.io/crates/pagetop" target="_blank" rel="noreferrer" { ("Crates.io") }
|
||||||
|
a href="https://docs.rs/pagetop" target="_blank" rel="noreferrer" { ("Docs.rs") }
|
||||||
|
a href="https://git.cillero.es/manuelcillero/pagetop" target="_blank" rel="noreferrer" { (L10n::l("intro_code").using(page)) }
|
||||||
|
em { (L10n::l("intro_have_fun").using(page)) }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
|
use crate::core::component::ChildOp;
|
||||||
use crate::core::theme::all::{theme_by_short_name, DEFAULT_THEME};
|
use crate::core::theme::all::{theme_by_short_name, DEFAULT_THEME};
|
||||||
use crate::core::theme::ThemeRef;
|
use crate::core::theme::{ChildrenInRegions, ThemeRef};
|
||||||
use crate::core::TypeInfo;
|
use crate::core::TypeInfo;
|
||||||
use crate::html::{html, Markup};
|
use crate::html::{html, Markup};
|
||||||
use crate::html::{Assets, Favicon, JavaScript, StyleSheet};
|
use crate::html::{Assets, Favicon, JavaScript, StyleSheet};
|
||||||
|
|
@ -104,6 +105,10 @@ pub trait Contextual: LangId {
|
||||||
#[builder_fn]
|
#[builder_fn]
|
||||||
fn with_assets(self, op: ContextOp) -> Self;
|
fn with_assets(self, op: ContextOp) -> Self;
|
||||||
|
|
||||||
|
/// Opera con [`ChildOp`] en una región (`region_name`) de la página.
|
||||||
|
#[builder_fn]
|
||||||
|
fn with_child_in(self, region_name: &'static str, op: ChildOp) -> Self;
|
||||||
|
|
||||||
// **< Contextual GETTERS >*********************************************************************
|
// **< Contextual GETTERS >*********************************************************************
|
||||||
|
|
||||||
/// Devuelve una referencia a la solicitud HTTP asociada, si existe.
|
/// Devuelve una referencia a la solicitud HTTP asociada, si existe.
|
||||||
|
|
@ -211,6 +216,7 @@ pub struct Context {
|
||||||
favicon : Option<Favicon>, // Favicon, si se ha definido.
|
favicon : Option<Favicon>, // Favicon, si se ha definido.
|
||||||
stylesheets: Assets<StyleSheet>, // Hojas de estilo CSS.
|
stylesheets: Assets<StyleSheet>, // Hojas de estilo CSS.
|
||||||
javascripts: Assets<JavaScript>, // Scripts JavaScript.
|
javascripts: Assets<JavaScript>, // Scripts JavaScript.
|
||||||
|
regions : ChildrenInRegions, // Regiones de componentes para renderizar.
|
||||||
params : HashMap<&'static str, (Box<dyn Any>, &'static str)>, // Parámetros en ejecución.
|
params : HashMap<&'static str, (Box<dyn Any>, &'static str)>, // Parámetros en ejecución.
|
||||||
id_counter : usize, // Contador para generar identificadores únicos.
|
id_counter : usize, // Contador para generar identificadores únicos.
|
||||||
}
|
}
|
||||||
|
|
@ -250,6 +256,7 @@ impl Context {
|
||||||
favicon : None,
|
favicon : None,
|
||||||
stylesheets: Assets::<StyleSheet>::new(),
|
stylesheets: Assets::<StyleSheet>::new(),
|
||||||
javascripts: Assets::<JavaScript>::new(),
|
javascripts: Assets::<JavaScript>::new(),
|
||||||
|
regions : ChildrenInRegions::default(),
|
||||||
params : HashMap::default(),
|
params : HashMap::default(),
|
||||||
id_counter : 0,
|
id_counter : 0,
|
||||||
}
|
}
|
||||||
|
|
@ -283,6 +290,13 @@ impl Context {
|
||||||
markup
|
markup
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Renderiza los componentes de una región (`region_name`).
|
||||||
|
pub fn render_region(&mut self, region_name: &'static str) -> Markup {
|
||||||
|
self.regions
|
||||||
|
.merge_all_components(self.theme, region_name)
|
||||||
|
.render(self)
|
||||||
|
}
|
||||||
|
|
||||||
// **< Context PARAMS >*************************************************************************
|
// **< Context PARAMS >*************************************************************************
|
||||||
|
|
||||||
/// Recupera una *referencia tipada* al parámetro solicitado.
|
/// Recupera una *referencia tipada* al parámetro solicitado.
|
||||||
|
|
@ -471,6 +485,12 @@ impl Contextual for Context {
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[builder_fn]
|
||||||
|
fn with_child_in(mut self, region_name: &'static str, op: ChildOp) -> Self {
|
||||||
|
self.regions.alter_child_in(region_name, op);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
// **< Contextual GETTERS >*********************************************************************
|
// **< Contextual GETTERS >*********************************************************************
|
||||||
|
|
||||||
fn request(&self) -> Option<&HttpRequest> {
|
fn request(&self) -> Option<&HttpRequest> {
|
||||||
|
|
|
||||||
|
|
@ -26,65 +26,65 @@ pub type ThemeRef = &'static dyn Theme;
|
||||||
/// - `<Self as ThemePage>::render_body(self, page, self.page_regions())`
|
/// - `<Self as ThemePage>::render_body(self, page, self.page_regions())`
|
||||||
/// - `<Self as ThemePage>::render_head(self, page)`
|
/// - `<Self as ThemePage>::render_head(self, page)`
|
||||||
pub trait ThemePage {
|
pub trait ThemePage {
|
||||||
/// Renderiza el contenido del `<body>` de la página.
|
/// Renderiza el **contenido interior** del `<body>` de la página.
|
||||||
///
|
///
|
||||||
/// Recorre `regions` en el **orden declarado** y, para cada región con contenido, genera un
|
/// Recorre `regions` en el **orden declarado** y, para cada región con contenido, genera un
|
||||||
/// contenedor con `role="region"` y un `aria-label` localizado. Se asume que cada identificador
|
/// contenedor con `role="region"` y un `aria-label` localizado.
|
||||||
/// de región es **único** dentro de la página.
|
/// Se asume que cada identificador de región es **único** dentro de la página.
|
||||||
|
///
|
||||||
|
/// La etiqueta `<body>` no se incluye aquí; únicamente renderiza su contenido.
|
||||||
fn render_body(&self, page: &mut Page, regions: &[(Region, L10n)]) -> Markup {
|
fn render_body(&self, page: &mut Page, regions: &[(Region, L10n)]) -> Markup {
|
||||||
html! {
|
html! {
|
||||||
body id=[page.body_id().get()] class=[page.body_classes().get()] {
|
@for (region, region_label) in regions {
|
||||||
@for (region, region_label) in regions {
|
@let output = page.render_region(region.key());
|
||||||
@let output = page.render_region(region.key());
|
@if !output.is_empty() {
|
||||||
@if !output.is_empty() {
|
@let region_name = region.name();
|
||||||
@let region_name = region.name();
|
div
|
||||||
div
|
id=(region_name)
|
||||||
id=(region_name)
|
class={ "region region--" (region_name) }
|
||||||
class={ "region region--" (region_name) }
|
role="region"
|
||||||
role="region"
|
aria-label=[region_label.lookup(page)]
|
||||||
aria-label=[region_label.lookup(page)]
|
{
|
||||||
{
|
(output)
|
||||||
(output)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Renderiza el contenido del `<head>` de la página.
|
/// Renderiza el **contenido interior** del `<head>` de la página.
|
||||||
///
|
///
|
||||||
/// Por defecto incluye las etiquetas básicas (`charset`, `title`, `description`, `viewport`,
|
/// Recorre y genera por defecto las etiquetas básicas (`charset`, `title`, `description`,
|
||||||
/// `X-UA-Compatible`), los metadatos (`name/content`) y propiedades (`property/content`),
|
/// `viewport`, `X-UA-Compatible`), los metadatos (`name/content`) y propiedades
|
||||||
/// además de los recursos CSS/JS de la página.
|
/// (`property/content`), además de los recursos CSS/JS de la página.
|
||||||
|
///
|
||||||
|
/// La etiqueta `<head>` no se incluye aquí; únicamente renderiza su contenido.
|
||||||
fn render_head(&self, page: &mut Page) -> Markup {
|
fn render_head(&self, page: &mut Page) -> Markup {
|
||||||
let viewport = "width=device-width, initial-scale=1, shrink-to-fit=no";
|
let viewport = "width=device-width, initial-scale=1, shrink-to-fit=no";
|
||||||
html! {
|
html! {
|
||||||
head {
|
meta charset="utf-8";
|
||||||
meta charset="utf-8";
|
|
||||||
|
|
||||||
@if let Some(title) = page.title() {
|
@if let Some(title) = page.title() {
|
||||||
title { (global::SETTINGS.app.name) (" | ") (title) }
|
title { (global::SETTINGS.app.name) (" | ") (title) }
|
||||||
} @else {
|
} @else {
|
||||||
title { (global::SETTINGS.app.name) }
|
title { (global::SETTINGS.app.name) }
|
||||||
}
|
|
||||||
|
|
||||||
@if let Some(description) = page.description() {
|
|
||||||
meta name="description" content=(description);
|
|
||||||
}
|
|
||||||
|
|
||||||
meta name="viewport" content=(viewport);
|
|
||||||
@for (name, content) in page.metadata() {
|
|
||||||
meta name=(name) content=(content) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
meta http-equiv="X-UA-Compatible" content="IE=edge";
|
|
||||||
@for (property, content) in page.properties() {
|
|
||||||
meta property=(property) content=(content) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
(page.render_assets())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@if let Some(description) = page.description() {
|
||||||
|
meta name="description" content=(description);
|
||||||
|
}
|
||||||
|
|
||||||
|
meta name="viewport" content=(viewport);
|
||||||
|
@for (name, content) in page.metadata() {
|
||||||
|
meta name=(name) content=(content) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
meta http-equiv="X-UA-Compatible" content="IE=edge";
|
||||||
|
@for (property, content) in page.properties() {
|
||||||
|
meta property=(property) content=(content) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
(page.render_assets())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ impl Region {
|
||||||
self.key
|
self.key
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Devuelve el nombre normalizado de la región (para atributos y búsquedas).
|
/// Devuelve el nombre normalizado de la región (para identificadores y atributos HTML).
|
||||||
#[inline]
|
#[inline]
|
||||||
pub fn name(&self) -> &str {
|
pub fn name(&self) -> &str {
|
||||||
&self.name
|
&self.name
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ pub use actix_web::Result as ResultPage;
|
||||||
|
|
||||||
use crate::base::action;
|
use crate::base::action;
|
||||||
use crate::core::component::{Child, ChildOp, Component, Context, ContextOp, Contextual};
|
use crate::core::component::{Child, ChildOp, Component, Context, ContextOp, Contextual};
|
||||||
use crate::core::theme::{ChildrenInRegions, ThemeRef, REGION_CONTENT};
|
use crate::core::theme::{ThemeRef, REGION_CONTENT};
|
||||||
use crate::html::{html, Markup, DOCTYPE};
|
use crate::html::{html, Markup, DOCTYPE};
|
||||||
use crate::html::{Assets, Favicon, JavaScript, StyleSheet};
|
use crate::html::{Assets, Favicon, JavaScript, StyleSheet};
|
||||||
use crate::html::{AttrClasses, ClassesOp};
|
use crate::html::{AttrClasses, ClassesOp};
|
||||||
|
|
@ -29,7 +29,6 @@ pub struct Page {
|
||||||
body_id : AttrId,
|
body_id : AttrId,
|
||||||
body_classes: AttrClasses,
|
body_classes: AttrClasses,
|
||||||
context : Context,
|
context : Context,
|
||||||
regions : ChildrenInRegions,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Page {
|
impl Page {
|
||||||
|
|
@ -47,7 +46,6 @@ impl Page {
|
||||||
body_id : AttrId::default(),
|
body_id : AttrId::default(),
|
||||||
body_classes: AttrClasses::default(),
|
body_classes: AttrClasses::default(),
|
||||||
context : Context::new(Some(request)),
|
context : Context::new(Some(request)),
|
||||||
regions : ChildrenInRegions::default(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -111,7 +109,7 @@ impl Page {
|
||||||
|
|
||||||
/// Añade un componente a la región de contenido por defecto.
|
/// Añade un componente a la región de contenido por defecto.
|
||||||
pub fn add_component(mut self, component: impl Component) -> Self {
|
pub fn add_component(mut self, component: impl Component) -> Self {
|
||||||
self.regions
|
self.context
|
||||||
.alter_child_in(REGION_CONTENT, ChildOp::Add(Child::with(component)));
|
.alter_child_in(REGION_CONTENT, ChildOp::Add(Child::with(component)));
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
@ -122,7 +120,7 @@ impl Page {
|
||||||
region_name: &'static str,
|
region_name: &'static str,
|
||||||
component: impl Component,
|
component: impl Component,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
self.regions
|
self.context
|
||||||
.alter_child_in(region_name, ChildOp::Add(Child::with(component)));
|
.alter_child_in(region_name, ChildOp::Add(Child::with(component)));
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
@ -143,13 +141,6 @@ impl Page {
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Opera con [`ChildOp`] en una región (`region_name`) de la página.
|
|
||||||
#[builder_fn]
|
|
||||||
pub fn with_child_in(mut self, region_name: &'static str, op: ChildOp) -> Self {
|
|
||||||
self.regions.alter_child_in(region_name, op);
|
|
||||||
self
|
|
||||||
}
|
|
||||||
|
|
||||||
// **< Page GETTERS >***************************************************************************
|
// **< Page GETTERS >***************************************************************************
|
||||||
|
|
||||||
/// Devuelve el título traducido para el idioma de la página, si existe.
|
/// Devuelve el título traducido para el idioma de la página, si existe.
|
||||||
|
|
@ -194,13 +185,13 @@ impl Page {
|
||||||
// **< Page RENDER >****************************************************************************
|
// **< Page RENDER >****************************************************************************
|
||||||
|
|
||||||
/// Renderiza los componentes de una región (`region_name`) de la página.
|
/// Renderiza los componentes de una región (`region_name`) de la página.
|
||||||
|
#[inline]
|
||||||
pub fn render_region(&mut self, region_name: &'static str) -> Markup {
|
pub fn render_region(&mut self, region_name: &'static str) -> Markup {
|
||||||
self.regions
|
self.context.render_region(region_name)
|
||||||
.merge_all_components(self.context.theme(), region_name)
|
|
||||||
.render(&mut self.context)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Renderiza los recursos de la página.
|
/// Renderiza los recursos de la página.
|
||||||
|
#[inline]
|
||||||
pub fn render_assets(&mut self) -> Markup {
|
pub fn render_assets(&mut self) -> Markup {
|
||||||
self.context.render_assets()
|
self.context.render_assets()
|
||||||
}
|
}
|
||||||
|
|
@ -238,8 +229,14 @@ impl Page {
|
||||||
Ok(html! {
|
Ok(html! {
|
||||||
(DOCTYPE)
|
(DOCTYPE)
|
||||||
html lang=(lang) dir=(dir) {
|
html lang=(lang) dir=(dir) {
|
||||||
(head)
|
head {
|
||||||
(body)
|
(head)
|
||||||
|
}
|
||||||
|
body id=[self.body_id().get()] class=[self.body_classes().get()] {
|
||||||
|
(self.render_region("page-top"))
|
||||||
|
(body)
|
||||||
|
(self.render_region("page-bottom"))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
@ -290,6 +287,12 @@ impl Contextual for Page {
|
||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[builder_fn]
|
||||||
|
fn with_child_in(mut self, region_name: &'static str, op: ChildOp) -> Self {
|
||||||
|
self.context.alter_child_in(region_name, op);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
// **< Contextual GETTERS >*********************************************************************
|
// **< Contextual GETTERS >*********************************************************************
|
||||||
|
|
||||||
fn request(&self) -> Option<&HttpRequest> {
|
fn request(&self) -> Option<&HttpRequest> {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue