Другая интерпретация реестра
This commit is contained in:
parent
40fad0e75b
commit
aaa9c2e1bf
21 changed files with 156 additions and 92 deletions
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
namespace ctiso\View;
|
||||
use ctiso\View\View,
|
||||
App\Controller\Site,
|
||||
App\Controller\Site, /* Нужно импортровать интерфейс */
|
||||
ctiso\Controller\Component,
|
||||
ctiso\HttpRequest;
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ class Page extends View
|
|||
{
|
||||
private $counter;
|
||||
public $text;
|
||||
public $site;
|
||||
public /*.Site.*/$site;
|
||||
|
||||
function __construct($data, $site)
|
||||
{
|
||||
|
|
@ -55,8 +55,7 @@ class Page extends View
|
|||
|
||||
function replaceContent($match, $offset)
|
||||
{
|
||||
/*.Component.*/$component = null;
|
||||
$component = $this->site->loadComponent($match);
|
||||
/*.Component.*/$component = $this->site->loadComponent($match);
|
||||
|
||||
$req = new HttpRequest();
|
||||
unset($req['active_page']);
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ class Top extends Composite {
|
|||
private function groupFiles(array $list, $debugMode = true)
|
||||
{
|
||||
$debug = ($debugMode) ? 'debug=1' : '';
|
||||
$path = parse_url(WWW_PATH, PHP_URL_PATH);
|
||||
$path = parse_url($this->config->get('system', 'web'), PHP_URL_PATH);
|
||||
|
||||
$groups = array();
|
||||
$use = array();
|
||||
|
|
@ -120,7 +120,7 @@ class Top extends Composite {
|
|||
$this->set('deps', implode(",", array_values($this->require)));
|
||||
|
||||
$this->set('title', $this->getTitle());
|
||||
$this->set('jspath', enableHttps(WWW_PATH));
|
||||
$this->set('jspath', enableHttps($this->config->get('system', 'web')));
|
||||
//
|
||||
return $this->execute(); // execute+phptal ??
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue