From 9eec6f88e25be12233630727e55bb28ef72ab414 Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sun, 23 Jul 2023 07:51:12 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A5=20Replace=20Basic=20theme=20by=20D?= =?UTF-8?q?efaultTheme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- drust/config/local.toml | 1 + pagetop/config/settings.predefined.toml | 2 +- pagetop/src/config.rs | 4 ++-- pagetop/src/core/theme/default.rs | 6 +++++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/drust/config/local.toml b/drust/config/local.toml index be142ade..410a913d 100644 --- a/drust/config/local.toml +++ b/drust/config/local.toml @@ -1,4 +1,5 @@ [app] +#theme = "Default" #theme = "Aliner" theme = "Bootsier" #theme = "Bulmix" diff --git a/pagetop/config/settings.predefined.toml b/pagetop/config/settings.predefined.toml index 1372ad98..cfdbfd75 100644 --- a/pagetop/config/settings.predefined.toml +++ b/pagetop/config/settings.predefined.toml @@ -2,7 +2,7 @@ name = "PageTop Application" description = "Developed with the amazing PageTop framework." # Tema predeterminado. -theme = "Basic" +theme = "Default" # Idioma (localización) predeterminado. language = "en-US" # Dirección predeterminada para el texto: "ltr", "rtl" o "auto". diff --git a/pagetop/src/config.rs b/pagetop/src/config.rs index be332e00..53533905 100644 --- a/pagetop/src/config.rs +++ b/pagetop/src/config.rs @@ -182,7 +182,7 @@ pub struct App { /// Por defecto: *"Modular web solutions made simple with PageTop."*. pub description: String, /// Tema predeterminado. - /// Por defecto: *"Basic"*. + /// Por defecto: *"Default"*. pub theme: String, /// Idioma (localización) predeterminado. /// Por defecto: *"en-US"*. @@ -284,7 +284,7 @@ default_settings!( // [app] "app.name" => "PageTop App", "app.description" => "Modular web solutions made simple with PageTop.", - "app.theme" => "Basic", + "app.theme" => "Default", "app.language" => "en-US", "app.direction" => "ltr", "app.startup_banner" => "Slant", diff --git a/pagetop/src/core/theme/default.rs b/pagetop/src/core/theme/default.rs index 4444f27a..059e8f40 100644 --- a/pagetop/src/core/theme/default.rs +++ b/pagetop/src/core/theme/default.rs @@ -1,4 +1,4 @@ -use crate::core::component::ContextOp; +use crate::core::component::{l10n::L10n, ContextOp}; use crate::core::module::ModuleTrait; use crate::core::theme::{ThemeRef, ThemeTrait}; use crate::html::{Favicon, StyleSheet}; @@ -17,6 +17,10 @@ impl ModuleTrait for DefaultTheme { THEME_DEFAULT } + fn name(&self) -> L10n { + L10n::n("Default") + } + fn theme(&self) -> Option { Some(&DefaultTheme) }