Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-11-01 10:56:21 +01:00
Code Issues Packages Projects Releases Activity

Some changes to make custom template object instantiation to work

Browse Source
This commit is contained in:
Matias Griese
2014-08-28 20:26:14 +03:00
parent 9b3b463909
commit 4e3db05d10
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
system/defines.php
View File

@@ -6,9 +6,10 @@ define('GRAV_VERSION', '0.9.0');
define('DS', '/'); define('DS', '/');
// Directories and Paths // Directories and Paths
if (!defined('ROOT_DIR')) { if (!defined('GRAV_ROOT')) {
define('ROOT_DIR', getcwd() .'/'); define('GRAV_ROOT', getcwd());
} }
define('ROOT_DIR', GRAV_ROOT . '/');
define('USER_PATH', 'user/'); define('USER_PATH', 'user/');
define('USER_DIR', ROOT_DIR . USER_PATH); define('USER_DIR', ROOT_DIR . USER_PATH);
define('SYSTEM_DIR', ROOT_DIR .'system/'); define('SYSTEM_DIR', ROOT_DIR .'system/');

36
system/src/Grav/Common/Themes.php
View File

@@ -49,33 +49,33 @@ class Themes
/** /**
* Get theme or throw exception if it cannot be found. * Get theme or throw exception if it cannot be found.
* *
* @param string $type * @param string $name
* @return Data\Data * @return Data
* @throws \RuntimeException * @throws \RuntimeException
*/ */
public function get($type) public function get($name)
{ {
if (!$type) { if (!$name) {
throw new \RuntimeException('Theme name not provided.'); throw new \RuntimeException('Theme name not provided.');
} }
$blueprints = new Data\Blueprints(THEMES_DIR . $type); $blueprints = new Blueprints("theme://{$name}");
$blueprint = $blueprints->get('blueprints'); $blueprint = $blueprints->get('blueprints');
$blueprint->name = $type; $blueprint->name = $name;
// Find thumbnail. // Find thumbnail.
$thumb = THEMES_DIR . "{$type}/thumbnail.jpg"; $thumb = THEMES_DIR . "{$name}/thumbnail.jpg";
if (file_exists($thumb)) { if (file_exists($thumb)) {
// TODO: use real URL with base path. // TODO: use real URL with base path.
$blueprint->set('thumbnail', "/user/themes/{$type}/thumbnail.jpg"); $blueprint->set('thumbnail', "/user/themes/{$name}/thumbnail.jpg");
} }
// Load default configuration. // Load default configuration.
$file = File\Yaml::instance(THEMES_DIR . "{$type}/{$type}" . YAML_EXT); $file = File\Yaml::instance("theme://{$name}.yaml");
$obj = new Data\Data($file->content(), $blueprint); $obj = new Data($file->content(), $blueprint);
// Override with user configuration. // Override with user configuration.
$file = File\Yaml::instance(USER_DIR . "config/themes/{$type}" . YAML_EXT); $file = File\Yaml::instance("user://config/themes/{$name}.yaml");
$obj->merge($file->content()); $obj->merge($file->content());
// Save configuration always to user/config. // Save configuration always to user/config.
@@ -86,28 +86,32 @@ class Themes
public function load($name = null) public function load($name = null)
{ {
$grav = $this->grav;
/** @var Config $config */ /** @var Config $config */
$config = $this->grav['config']; $config = $grav['config'];
if (!$name) { if (!$name) {
$name = $config->get('system.pages.theme'); $name = $config->get('system.pages.theme');
} }
$file = THEMES_DIR . "{$name}/{$name}.php"; $path = THEMES_DIR . $name;
$file = "{$path}/{$name}.php";
if (file_exists($file)) { if (file_exists($file)) {
$class = require_once $file; // Local variables available in the file: $grav, $config, $name, $path, $file
$class = include $file;
if (!is_object($class)) { if (!is_object($class)) {
$className = '\\Grav\\Theme\\' . ucfirst($name); $className = '\\Grav\\Theme\\' . ucfirst($name);
if (class_exists($className)) { if (class_exists($className)) {
$class = new $className($this->grav, $config, $name); $class = new $className($grav, $config, $name);
} }
} }
} }
if (empty($class)) { if (empty($class)) {
$class = new Theme($this->grav, $config, $name); $class = new Theme($grav, $config, $name);
} }
return $class; return $class;