8
0

#171 Redo the configuration layer to add a ConfigBuilder and group configuration parts

Dieser Commit ist enthalten in:
Stéphane Goetz
2019-12-05 21:25:58 +01:00
Ursprung 688de1d5b9
Commit b5633e93c7
47 geänderte Dateien mit 1177 neuen und 710 gelöschten Zeilen

Datei anzeigen

@ -15,7 +15,7 @@ class ContentPage extends \Todaymade\Daux\Format\Base\ContentPage
//Embed images
// We do it after generation so we can catch the images that were in html already
$content = (new EmbedImages($this->params['tree']))
$content = (new EmbedImages($this->config->getTree()))
->embed(
$content,
$this->file,
@ -36,10 +36,9 @@ class ContentPage extends \Todaymade\Daux\Format\Base\ContentPage
}
);
$intro = '';
if (array_key_exists('confluence', $this->params) && array_key_exists('header', $this->params['confluence']) && !empty($this->params['confluence']['header'])) {
$intro = '<ac:structured-macro ac:name="info"><ac:rich-text-body>' . $this->params['confluence']['header'] . '</ac:rich-text-body></ac:structured-macro>';
if ($this->config->getConfluenceConfiguration()->hasHeader()) {
$intro = '<ac:structured-macro ac:name="info"><ac:rich-text-body>' . $this->config->getConfluenceConfiguration()->getHeader() . '</ac:rich-text-body></ac:structured-macro>';
}
return $intro . $content;