Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-03-22 12:31:36 +01:00
Code Issues Packages Projects Releases Activity

initial default override support

Browse Source
This commit is contained in:
Andy Miller
2015-06-29 12:51:05 -06:00
parent f1a929624f
commit b529456745
2 changed files with 42 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
system/src/Grav/Common/Page/Page.php
View File

@@ -54,6 +54,8 @@ class Page
protected $unpublish_date;
protected $slug;
protected $route;
protected $url;
protected $routes;
protected $routable;
protected $modified;
protected $id;
@@ -121,6 +123,8 @@ class Page
$this->date();
$this->metadata();
$this->slug();
$this->route();
$this->url();
$this->visible();
$this->modularTwig($this->slug[0] == '_');
@@ -226,6 +230,9 @@ class Page
if (isset($this->header->slug)) {
$this->slug = trim($this->header->slug);
}
if (isset($this->header->routes)) {
$this->routes = (array)($this->header->routes);
}
if (isset($this->header->title)) {
$this->title = trim($this->header->title);
}
@@ -1050,16 +1057,13 @@ class Page
{
if ($var !== null) {
$this->slug = $var;
$baseRoute = $this->parent ? (string) $this->parent()->route() : null;
$this->route = isset($baseRoute) ? $baseRoute . '/'. $this->slug : null;
}
if (empty($this->slug)) {
$regex = '/^[0-9]+\./u';
$this->slug = preg_replace($regex, '', $this->folder);
$baseRoute = $this->parent ? (string) $this->parent()->route() : null;
$this->route = isset($baseRoute) ? $baseRoute . '/'. $this->slug : null;
}
return $this->slug;
}
@@ -1109,21 +1113,26 @@ class Page
*/
public function url($include_host = false)
{
/** @var Pages $pages */
$pages = self::getGrav()['pages'];
if (empty($this->url)) {
/** @var Pages $pages */
$pages = self::getGrav()['pages'];
/** @var Uri $uri */
$uri = self::getGrav()['uri'];
/** @var Uri $uri */
$uri = self::getGrav()['uri'];
$rootUrl = $uri->rootUrl($include_host) . $pages->base();
$url = $rootUrl.'/'.trim($this->route(), '/');
$rootUrl = $uri->rootUrl($include_host) . $pages->base();
$url = $rootUrl.'/'.trim($this->route(), '/');
// trim trailing / if not root
if ($url !== '/') {
$url = rtrim($url, '/');
// trim trailing / if not root
if ($url !== '/') {
$url = rtrim($url, '/');
}
$this->url = $url;
}
return $url;
return $this->url;
}
/**
@@ -1138,6 +1147,19 @@ class Page
if ($var !== null) {
$this->route = $var;
}
if (empty($this->route)) {
if (!empty($this->routes) && isset($this->routes['default'])) {
$this->route = $this->routes['default'];
return $this->route;
}
// calculate route based on parent slugs
$baseRoute = $this->parent ? (string) $this->parent()->route() : null;
$this->route = isset($baseRoute) ? $baseRoute . '/'. $this->slug() : null;
}
return $this->route;
}

9
system/src/Grav/Common/Page/Pages.php
View File

@@ -627,11 +627,14 @@ class Pages
/** @var $page Page */
foreach ($this->instances as $page) {
$parent = $page->parent();
$route = null;
if ($parent) {
$route = rtrim($parent->route(), '/') . '/' . $page->slug();
$this->routes[$route] = $page->path();
$page->route($route);
// $route = rtrim($parent->route(), '/') . '/' . $page->slug();
$route = $page->route();
$this->routes[$page->route()] = $page->path();
// $page->route($route);
}
if (!empty($route)) {