updated project to new path syntax, updated system reference, made system reference relative to project
This commit is contained in:
parent
0f474745d1
commit
f5bf4c6c11
2
.gitmodules
vendored
2
.gitmodules
vendored
@ -1,3 +1,3 @@
|
||||
[submodule "lib/system"]
|
||||
path = lib/system
|
||||
url = git@mojotrollz.eu:webcraft/system.git
|
||||
url = ../system.git
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
<?php
|
||||
class default_about extends SYSTEM\PAGE\Page {
|
||||
public static function js(){
|
||||
return array( \SYSTEM\WEBPATH(new PPAGE(),'default_about/js/default_about.js'));}
|
||||
return array( new PPAGE('default_about/js/default_about.js'));}
|
||||
public static function css(){
|
||||
return array( \SYSTEM\WEBPATH(new PPAGE(),'default_about/css/default_about.css'));}
|
||||
return array( new PPAGE('default_about/css/default_about.css'));}
|
||||
public function html(){
|
||||
$vars = \SYSTEM\PAGE\text::tag('example');
|
||||
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_about/tpl/default_about.tpl'), $vars);
|
||||
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_about/tpl/default_about.tpl'))->SERVERPATH(), $vars);
|
||||
}
|
||||
}
|
||||
@ -3,9 +3,9 @@ class default_impressum extends \SYSTEM\PAGE\Page {
|
||||
public function html(){
|
||||
$vars = array();
|
||||
$vars['impressum'] = \SYSTEM\PAGE\text::get('webcraft_imprint');
|
||||
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_impressum/tpl/impressum.tpl'), $vars);
|
||||
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_impressum/tpl/impressum.tpl'))->SERVERPATH(), $vars);
|
||||
}
|
||||
public static function js(){
|
||||
return array( \SYSTEM\WEBPATH(new PPAGE(),'default_impressum/js/default_impressum.js'));
|
||||
return array( new PPAGE('default_impressum/js/default_impressum.js'));
|
||||
}
|
||||
}
|
||||
@ -1,15 +1,15 @@
|
||||
<?php
|
||||
class default_page extends \SYSTEM\PAGE\Page {
|
||||
private static function js(){
|
||||
return \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()).
|
||||
\SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()).
|
||||
\SYSTEM\HTML\html::script(\LIB\lib_system::js()).
|
||||
\SYSTEM\HTML\html::script(\SYSTEM\WEBPATH(new PPAGE(),'default_page/js/default_page.js'));
|
||||
return \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()->WEBPATH()).
|
||||
\SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()).
|
||||
\SYSTEM\HTML\html::script(\LIB\lib_system::js()->WEBPATH()).
|
||||
\SYSTEM\HTML\html::script((new PPAGE('default_page/js/default_page.js'))->WEBPATH());
|
||||
}
|
||||
|
||||
private static function css(){
|
||||
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()).
|
||||
\SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new PPAGE(),'default_page/css/default_page.css'));
|
||||
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH()).
|
||||
\SYSTEM\HTML\html::link((new PPAGE('default_page/css/default_page.css'))->WEBPATH());
|
||||
}
|
||||
|
||||
public function html($_escaped_fragment_ = null){
|
||||
@ -19,6 +19,6 @@ class default_page extends \SYSTEM\PAGE\Page {
|
||||
$vars['js'] = self::js();}
|
||||
$vars['css'] = self::css();
|
||||
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('demo_basic'));
|
||||
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars);
|
||||
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/default_page.tpl'))->SERVERPATH(), $vars);
|
||||
}
|
||||
}
|
||||
@ -1,12 +1,12 @@
|
||||
<?php
|
||||
class default_start extends SYSTEM\PAGE\Page {
|
||||
public static function js(){
|
||||
return array( \SYSTEM\WEBPATH(new PPAGE(),'default_start/js/default_start.js'));}
|
||||
return array( new PPAGE('default_start/js/default_start.js'));}
|
||||
public static function css(){
|
||||
return array( \SYSTEM\WEBPATH(new PPAGE(),'default_start/css/default_start.css'));}
|
||||
return array( new PPAGE('default_start/css/default_start.css'));}
|
||||
public function html(){
|
||||
$vars = array();
|
||||
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('demo_basic'));
|
||||
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/default_start.tpl'), $vars);
|
||||
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_start/tpl/default_start.tpl'))->SERVERPATH(), $vars);
|
||||
}
|
||||
}
|
||||
@ -3,9 +3,7 @@ namespace SQL;
|
||||
class DATA_DEMO_BASIC extends \SYSTEM\DB\QI {
|
||||
public static function get_class(){return \get_class();}
|
||||
public static function files_mysql(){
|
||||
return array( \SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_page.sql'),
|
||||
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/webcraft_imprint.sql')/*,
|
||||
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_text.sql'),
|
||||
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_cron.sql')*/);
|
||||
return array( (new \PSQL('/mysql/system_page.sql'))->SERVERPATH(),
|
||||
(new \PSQL('/mysql/webcraft_imprint.sql'))->SERVERPATH());
|
||||
}
|
||||
}
|
||||
@ -1 +1 @@
|
||||
Subproject commit d9e385714bbdc868a6f504d9eb3bf76c452d42e9
|
||||
Subproject commit 90de2d66319486fafb2fae691c1b6b43240af005
|
||||
Loading…
x
Reference in New Issue
Block a user