From 1dfdd3991453bee40e3205a2eba89a36a9014bb3 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 10 Sep 2015 03:33:39 +0200 Subject: [PATCH] mojotrollz install, statesystem, cleanup --- mojotrollz/autoload.inc | 3 +- mojotrollz/page/autoload.inc | 1 + .../default_impressum/default_impressum.php | 2 +- mojotrollz/page/default_page/default_page.php | 6 ---- .../page/default_page/tpl/content_navbar.tpl | 23 -------------- .../page/default_page/tpl/default_page.tpl | 30 +++++++++++++++---- mojotrollz/page/default_start/autoload.inc | 2 ++ .../page/default_start/default_start.php | 16 ++++++++++ .../page/default_start/js/default_start.js | 2 ++ .../tpl/content_addons.tpl | 0 .../tpl/content_client.tpl | 0 .../tpl/content_more.tpl | 0 .../tpl/content_server.tpl | 0 .../tpl/content_tshirt.tpl | 0 .../page/default_start/tpl/default_start.tpl | 5 ++++ mojotrollz/page/page_mojotrollz.php | 3 ++ mojotrollz/path/PSQL.php | 5 ++++ mojotrollz/sql/DATA_MOJOTROLLZ.php | 8 +++++ mojotrollz/sql/autoload.inc | 4 +++ mojotrollz/sql/mysql/system_page.sql | 2 ++ 20 files changed, 75 insertions(+), 37 deletions(-) delete mode 100644 mojotrollz/page/default_page/tpl/content_navbar.tpl create mode 100644 mojotrollz/page/default_start/autoload.inc create mode 100644 mojotrollz/page/default_start/default_start.php create mode 100644 mojotrollz/page/default_start/js/default_start.js rename mojotrollz/page/{default_page => default_start}/tpl/content_addons.tpl (100%) rename mojotrollz/page/{default_page => default_start}/tpl/content_client.tpl (100%) rename mojotrollz/page/{default_page => default_start}/tpl/content_more.tpl (100%) rename mojotrollz/page/{default_page => default_start}/tpl/content_server.tpl (100%) rename mojotrollz/page/{default_page => default_start}/tpl/content_tshirt.tpl (100%) create mode 100644 mojotrollz/page/default_start/tpl/default_start.tpl create mode 100644 mojotrollz/path/PSQL.php create mode 100644 mojotrollz/sql/DATA_MOJOTROLLZ.php create mode 100644 mojotrollz/sql/autoload.inc create mode 100644 mojotrollz/sql/mysql/system_page.sql diff --git a/mojotrollz/autoload.inc b/mojotrollz/autoload.inc index d4ce88a..e37cab6 100644 --- a/mojotrollz/autoload.inc +++ b/mojotrollz/autoload.inc @@ -2,4 +2,5 @@ require_once dirname(__FILE__).'/path/autoload.inc'; require_once dirname(__FILE__).'/page/autoload.inc'; require_once dirname(__FILE__).'/files/autoload.inc'; -require_once dirname(__FILE__).'/api/autoload.inc'; \ No newline at end of file +require_once dirname(__FILE__).'/api/autoload.inc'; +require_once dirname(__FILE__).'/sql/autoload.inc'; \ No newline at end of file diff --git a/mojotrollz/page/autoload.inc b/mojotrollz/page/autoload.inc index 4981f50..03297b9 100644 --- a/mojotrollz/page/autoload.inc +++ b/mojotrollz/page/autoload.inc @@ -1,4 +1,5 @@ js();} $vars['css'] = $this->css(); - $vars['content_navbar'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_navbar.tpl')); - $vars['content_client'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_client.tpl')); - $vars['content_server'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_server.tpl')); - $vars['content_tshirt'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_tshirt.tpl')); - $vars['content_addons'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_addons.tpl')); - $vars['content_more'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_more.tpl')); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('meta')); return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars); } diff --git a/mojotrollz/page/default_page/tpl/content_navbar.tpl b/mojotrollz/page/default_page/tpl/content_navbar.tpl deleted file mode 100644 index e07bb94..0000000 --- a/mojotrollz/page/default_page/tpl/content_navbar.tpl +++ /dev/null @@ -1,23 +0,0 @@ - \ No newline at end of file diff --git a/mojotrollz/page/default_page/tpl/default_page.tpl b/mojotrollz/page/default_page/tpl/default_page.tpl index f00fa3b..095c5bc 100644 --- a/mojotrollz/page/default_page/tpl/default_page.tpl +++ b/mojotrollz/page/default_page/tpl/default_page.tpl @@ -15,11 +15,29 @@ - ${content_navbar} - ${content_client} - ${content_server} - ${content_tshirt} - ${content_addons} - ${content_more} + +
\ No newline at end of file diff --git a/mojotrollz/page/default_start/autoload.inc b/mojotrollz/page/default_start/autoload.inc new file mode 100644 index 0000000..8fd92c5 --- /dev/null +++ b/mojotrollz/page/default_start/autoload.inc @@ -0,0 +1,2 @@ +html();} + + public static function page_start(){ + return (new default_start())->html();} } \ No newline at end of file diff --git a/mojotrollz/path/PSQL.php b/mojotrollz/path/PSQL.php new file mode 100644 index 0000000..84976e2 --- /dev/null +++ b/mojotrollz/path/PSQL.php @@ -0,0 +1,5 @@ +