D3Public/daux.io
8
0
Fork 0
Code Pull Requests Releases Activity

Bugfixes related to themes and Commonmark migration

Browse Source
This commit is contained in:
Stéphane Goetz 2015-05-22 15:05:16 +02:00 committed by Stéphane Goetz
parent 1fe3e62df3
commit 63d6b17ec4
5 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libs/Daux.php
View File

@ -109,6 +109,10 @@ class Daux
}
}
/**
* @todo make it an object
* @return array
*/
public function getParams()
{
$params = $this->options += array(
@ -138,13 +142,6 @@ class Daux
$params['index_key'] = 'index.html';
$params['base_page'] = $params['base_url'] = '';
$params['theme'] = DauxHelper::getTheme(
$this->options['theme-name'],
$params['base_url'],
$this->local_base,
$params['base_url']
);
return $params;
}
}

14
libs/DauxHelper.php
View File

@ -4,10 +4,10 @@ use Todaymade\Daux\Tree\Directory;
class DauxHelper
{
public static function getTheme($theme_name, $base_url, $local_base, $current_url)
public static function getTheme($params, $current_url)
{
$theme_folder = $local_base . DS . 'resources' . DS . 'themes' . DS . $theme_name;
$theme_url = $base_url . "resources/themes/" . $theme_name . '/';
$theme_folder = $params['local_base'] . DS . 'resources' . DS . 'themes' . DS . $params['theme-name'];
$theme_url = $params['base_url'] . "resources/themes/" . $params['theme-name'] . '/';
$theme = array();
if (is_file($theme_folder . DS . "config.json")) {
@ -19,7 +19,7 @@ class DauxHelper
//Default parameters for theme
$theme += [
'name' => $theme_name,
'name' => $params['theme-name'],
'css' => [],
'js' => [],
'fonts' => [],
@ -29,7 +29,11 @@ class DauxHelper
'templates' => $theme_folder . DS . 'templates',
];
$substitutions = ['<local_base>' => $local_base, '<base_url>' => $current_url, '<theme_url>' => $theme_url];
$substitutions = [
'<local_base>' => $params['local_base'],
'<base_url>' => $current_url,
'<theme_url>' => $theme_url
];
// Substitute some placeholders
$theme['templates'] = strtr($theme['templates'], $substitutions);

7
libs/Format/HTML/Generator.php
View File

@ -28,12 +28,7 @@ class Generator
$params['base_url'] = $params['base_page'] = $base_url;
// Rebase Theme
$params['theme'] = DauxHelper::getTheme(
$params['theme-name'],
$params['base_url'],
$params['local_base'],
$base_url
);
$params['theme'] = DauxHelper::getTheme($params, $base_url);
$params['image'] = str_replace('<base_url>', $base_url, $params['image']);
if ($base_url !== '') {

2
libs/Server/Server.php
View File

@ -78,6 +78,8 @@ class Server
$params['image'] = str_replace('<base_url>', $params['base_url'], $params['image']);
}
$params['theme'] = DauxHelper::getTheme($params, $this->base_url);
return $params;
}