From 7a0901d472021029341c9bff1beeb92136cf1a7e Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 31 May 2016 00:55:29 +0200 Subject: [PATCH] fixed menu and all pages to work with new systempaths, fixed autoload names --- danube/api/{autoload.inc.php => autoload.inc} | 0 danube/autoload.inc | 10 +-- .../config/{autoload.inc.php => autoload.inc} | 0 .../files/{autoload.inc.php => autoload.inc} | 0 ...register_page_classes.php => autoload.inc} | 0 .../default_certificates/certificates.html | 3 - .../default_certificates.php | 8 +- .../{ => tpl}/cerfiticates.tpl | 0 danube/page/default_contact/contact.html | 1 - .../page/default_contact/default_contact.php | 4 +- .../default_contact/{ => tpl}/contact.tpl | 0 .../default_impressions.php | 8 +- .../page/default_impressions/impressions.html | 3 - .../{ => tpl}/impressions.tpl | 0 danube/page/default_page/tpl/danube.tpl | 83 +++++++++---------- .../default_partners/default_partners.php | 10 +-- danube/page/default_partners/partners.html | 3 - .../default_partners/{ => tpl}/partners.tpl | 0 danube/page/default_prices/default_prices.php | 8 +- danube/page/default_prices/prices.html | 1 - .../page/default_prices/{ => tpl}/prices.tpl | 0 danube/sql/{autoload.inc.php => autoload.inc} | 0 22 files changed, 55 insertions(+), 87 deletions(-) rename danube/api/{autoload.inc.php => autoload.inc} (100%) rename danube/config/{autoload.inc.php => autoload.inc} (100%) rename danube/files/{autoload.inc.php => autoload.inc} (100%) rename danube/page/{register_page_classes.php => autoload.inc} (100%) delete mode 100644 danube/page/default_certificates/certificates.html rename danube/page/default_certificates/{ => tpl}/cerfiticates.tpl (100%) delete mode 100644 danube/page/default_contact/contact.html rename danube/page/default_contact/{ => tpl}/contact.tpl (100%) delete mode 100644 danube/page/default_impressions/impressions.html rename danube/page/default_impressions/{ => tpl}/impressions.tpl (100%) delete mode 100644 danube/page/default_partners/partners.html rename danube/page/default_partners/{ => tpl}/partners.tpl (100%) delete mode 100644 danube/page/default_prices/prices.html rename danube/page/default_prices/{ => tpl}/prices.tpl (100%) rename danube/sql/{autoload.inc.php => autoload.inc} (100%) diff --git a/danube/api/autoload.inc.php b/danube/api/autoload.inc similarity index 100% rename from danube/api/autoload.inc.php rename to danube/api/autoload.inc diff --git a/danube/autoload.inc b/danube/autoload.inc index 12d9887..2ea6ca5 100644 --- a/danube/autoload.inc +++ b/danube/autoload.inc @@ -1,8 +1,8 @@ -${danube_page_partners} - \ No newline at end of file diff --git a/danube/page/default_certificates/default_certificates.php b/danube/page/default_certificates/default_certificates.php index 2bc67b9..e8017ec 100644 --- a/danube/page/default_certificates/default_certificates.php +++ b/danube/page/default_certificates/default_certificates.php @@ -2,19 +2,15 @@ class default_certificates extends SYSTEM\PAGE\Page { public function html(){ $vars = array(); - $vars['gallery_certifictes'] = $this->gallery(); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube')); - - return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_certificates/cerfiticates.tpl'), $vars); + return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_certificates/tpl/cerfiticates.tpl'))->SERVERPATH(), $vars); } - private function gallery(){ $pics = \SYSTEM\FILES\files::get('certificates'); $result = ''; foreach($pics as $pic){ - $result .= ''; - } + $result .= '';} return $result; } } \ No newline at end of file diff --git a/danube/page/default_certificates/cerfiticates.tpl b/danube/page/default_certificates/tpl/cerfiticates.tpl similarity index 100% rename from danube/page/default_certificates/cerfiticates.tpl rename to danube/page/default_certificates/tpl/cerfiticates.tpl diff --git a/danube/page/default_contact/contact.html b/danube/page/default_contact/contact.html deleted file mode 100644 index 0bfe7ff..0000000 --- a/danube/page/default_contact/contact.html +++ /dev/null @@ -1 +0,0 @@ -
${danube_page_contact}
\ No newline at end of file diff --git a/danube/page/default_contact/default_contact.php b/danube/page/default_contact/default_contact.php index 1cf3997..6f45941 100644 --- a/danube/page/default_contact/default_contact.php +++ b/danube/page/default_contact/default_contact.php @@ -4,9 +4,7 @@ class default_contact extends SYSTEM\PAGE\Page { public function html(){ $vars = array(); $vars['content'] = ''; - $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube')); - - return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_contact/contact.tpl'), $vars); + return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_contact/tpl/contact.tpl'))->SERVERPATH(), $vars); } } \ No newline at end of file diff --git a/danube/page/default_contact/contact.tpl b/danube/page/default_contact/tpl/contact.tpl similarity index 100% rename from danube/page/default_contact/contact.tpl rename to danube/page/default_contact/tpl/contact.tpl diff --git a/danube/page/default_impressions/default_impressions.php b/danube/page/default_impressions/default_impressions.php index 7757839..224c531 100644 --- a/danube/page/default_impressions/default_impressions.php +++ b/danube/page/default_impressions/default_impressions.php @@ -1,21 +1,17 @@ gallery(); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube')); - - return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_impressions/impressions.tpl'), $vars); + return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_impressions/tpl/impressions.tpl'))->SERVERPATH(), $vars); } private function gallery(){ $pics = \SYSTEM\FILES\files::get('impressions'); $result = ''; foreach($pics as $pic){ - $result .= ''; - } + $result .= '';} return $result; } } \ No newline at end of file diff --git a/danube/page/default_impressions/impressions.html b/danube/page/default_impressions/impressions.html deleted file mode 100644 index 7ebaf78..0000000 --- a/danube/page/default_impressions/impressions.html +++ /dev/null @@ -1,3 +0,0 @@ -
-${danube_page_partners} -
\ No newline at end of file diff --git a/danube/page/default_impressions/impressions.tpl b/danube/page/default_impressions/tpl/impressions.tpl similarity index 100% rename from danube/page/default_impressions/impressions.tpl rename to danube/page/default_impressions/tpl/impressions.tpl diff --git a/danube/page/default_page/tpl/danube.tpl b/danube/page/default_page/tpl/danube.tpl index c54947d..9a6fa76 100644 --- a/danube/page/default_page/tpl/danube.tpl +++ b/danube/page/default_page/tpl/danube.tpl @@ -18,56 +18,55 @@
-