emelie/zola
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Do not require themes to have a static folder

Browse source
This commit is contained in:
Vincent Prouillet 2018-03-18 09:34:37 +01:00
parent b558b51dff
commit 43db3a43ff
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -6,6 +6,7 @@
- Sitemap entries are now sorted by permalinks to avoid random ordering - Sitemap entries are now sorted by permalinks to avoid random ordering
- Preserve directory structure from sass folder when copying compiled css files - Preserve directory structure from sass folder when copying compiled css files
to the public directory to the public directory
- Do not require themes to have a static folder
## 0.3.2 (2018-03-05) ## 0.3.2 (2018-03-05)

5
components/site/src/lib.rs
View file

@ -92,14 +92,11 @@ impl Site {
// Grab data from the extra section of the theme // Grab data from the extra section of the theme
config.merge_with_theme(&path.join("themes").join(&theme).join("theme.toml"))?; config.merge_with_theme(&path.join("themes").join(&theme).join("theme.toml"))?;
// Test that the {templates,static} folder exist for that theme // Test that the templates folder exist for that theme
let theme_path = path.join("themes").join(&theme); let theme_path = path.join("themes").join(&theme);
if !theme_path.join("templates").exists() { if !theme_path.join("templates").exists() {
bail!("Theme `{}` is missing a templates folder", theme); bail!("Theme `{}` is missing a templates folder", theme);
} }
if !theme_path.join("static").exists() {
bail!("Theme `{}` is missing a static folder", theme);
}
let theme_tpl_glob = format!("{}/{}", path.to_string_lossy().replace("\\", "/"), "themes/**/*.html"); let theme_tpl_glob = format!("{}/{}", path.to_string_lossy().replace("\\", "/"), "themes/**/*.html");
let mut tera_theme = Tera::parse(&theme_tpl_glob).chain_err(|| "Error parsing templates from themes")?; let mut tera_theme = Tera::parse(&theme_tpl_glob).chain_err(|| "Error parsing templates from themes")?;

2
docs/content/documentation/getting-started/directory-structure.md
View file

@ -33,6 +33,8 @@ To learn more, read [the content overview](./documentation/content/overview.md).
## `sass` ## `sass`
Contains the [Sass](http://sass-lang.com) files to be compiled. Non-Sass files will be ignored. Contains the [Sass](http://sass-lang.com) files to be compiled. Non-Sass files will be ignored.
The directory structure of the `sass` folder will be preserved when copying over the compiled files: a file at
`sass/something/site.scss` will be compiled to `public/something/site.css`.
## `static` ## `static`
Contains any kind of files. All the files/folders in the `static` folder will be copied as-is in the output directory. Contains any kind of files. All the files/folders in the `static` folder will be copied as-is in the output directory.