updated system reference, fixed several problems regarding system update
This commit is contained in:
parent
59d0c4aa40
commit
a352e73c8d
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
require_once dirname(__FILE__).'/path/register_path_classes.php';
|
||||
require_once dirname(__FILE__).'/path/autoload.inc';
|
||||
require_once dirname(__FILE__).'/page/register_page_classes.php';
|
||||
require_once dirname(__FILE__).'/sql/autoload.inc.php';
|
||||
require_once dirname(__FILE__).'/api/autoload.inc.php';
|
||||
|
||||
@ -1,11 +1,7 @@
|
||||
<?php
|
||||
|
||||
class default_introduction extends SYSTEM\PAGE\Page {
|
||||
public function html(){
|
||||
$vars = array();
|
||||
|
||||
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
|
||||
|
||||
return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_introduction/introduction.tpl'), $vars);
|
||||
$vars = \SYSTEM\PAGE\text::tag('danube');
|
||||
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_introduction/tpl/introduction.tpl'))->SERVERPATH(), $vars);
|
||||
}
|
||||
}
|
||||
@ -1,3 +0,0 @@
|
||||
<div>
|
||||
${danube_page_partners}
|
||||
</div>
|
||||
@ -1,96 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>${danube_page_title}</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
|
||||
${danube_html_meta}
|
||||
${css}
|
||||
${js}
|
||||
|
||||
<style>
|
||||
#galleria{ width: 800px; height: 600px; background: #FFF }
|
||||
table tr td { padding: 3px; }
|
||||
</style>
|
||||
<style type="text/css">
|
||||
|
||||
div
|
||||
{
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<!--<body style="background: #3366CC;"> -->
|
||||
<body style="background: #6699FF;">
|
||||
|
||||
<div style="width: 900px; margin-right: auto; margin-left: auto;"><img src="danube/page/default_page/pics/css/font.png" /></div>
|
||||
<div class="hero-unit" style=" border: 1px solid black; border-top: 0px solid black; box-shadow: 5px 5px 3px; background: url(danube/page/default_page/pics/css/verlauf_bg.png); width: 934px; padding: 0px; margin: 0; margin-bottom: 15px; padding-bottom: -10px; margin-left: auto; margin-right: auto; margin-top: -2px;">
|
||||
<div class="hero-unit" style="background: url(danube/page/default_page/pics/css/verlauf_bg.png); margin: 0; padding: 0; border-top-left-radius: 5px; border-top-right-radius: 5px; -moz-border-bottom-left-radius: 0; -moz-border-bottom-right-radius: 0; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px;">
|
||||
|
||||
<!-- <div class="hero-unit" style=" height: 700px; margin-top: 0px; padding: 0;">
|
||||
<div class="hero-unit" style=" margin-top: 0px; padding:7px; height: 200;">
|
||||
<img src="banner2.png" style="">
|
||||
</div>-->
|
||||
|
||||
<div id="danube_menu" class="navbar navbar-inverse" style="height: 32px; ">
|
||||
<div class="navbar-inner" style="border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; background: url(danube/page/default_page/pics/css/verlauf_bg.png); ">
|
||||
<div class="1container">
|
||||
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="brand" href="" url="?action=default_page">${danube_menu_home}</a>
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav">
|
||||
<li><a href="javascript:switchTextBg('white')" url="./?page=introduction">${danube_menu_introduction}</a></li>
|
||||
<li><a href="javascript:switchTextBg('white')" url="./?page=prices" url_pic="danube/page/default_page/pics/photos/bar_front2.png">${danube_menu_prices}</a></li>
|
||||
<li><a href="javascript:switchTextBg('white')" url="./?page=contact">${danube_menu_contact}</a></li>
|
||||
<li><a href="javascript:switchTextBg('black')" url="./?page=impressions" textbg="black">${danube_menu_impressions}</a></li>
|
||||
<li><a href="javascript:switchTextBg('black')" url="./?page=partners">${danube_menu_partners}</a></li>
|
||||
<li><a href="javascript:switchTextBg('black')" url="./?page=certificates">${danube_menu_certificates}</a></li></ul>
|
||||
|
||||
</div><!--/.nav-collapse -->
|
||||
|
||||
</div>
|
||||
|
||||
<div id="fb" style="margin-left: 750px; padding-top: 15px;">
|
||||
<iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.blue-danube-massage.de&layout=button_count&show_faces=true&width=450&action=like&colorscheme=light&height=80" scrolling="no" frameborder="0" style="border:none; overflow:hidden; height:80px; margin: 0; padding: 0; width: 140px;" allowTransparency="true">
|
||||
</iframe>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="myCarousel" class="carousel slide" style="background: black; width: 916px; padding: 0; margin: 0; margin-left: auto; margin-right: auto; border-bottom: 0px solid black;">
|
||||
|
||||
<div class="carousel-inner">
|
||||
|
||||
<div id="pic">
|
||||
|
||||
${danube_page_headpic_home}
|
||||
</div>
|
||||
<!-- <div class="test"><a class="left carousel-control" href="#myCarousel" data-slide="prev">‹</a></div>
|
||||
<div class="test"><a class="right carousel-control" href="#" url_pic="" data-slide="next">›</a></div> -->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Three columns of text below the carousel -->
|
||||
<div id="space" style="height: 7px; background: url(danube/page/default_page/pics/css/verlauf_bg.png); margin-left: 9px; margin-right: 9px;"></div>
|
||||
|
||||
<div class="hero-unit" id="text" style="line-height: 180%; fonz-size: 80%; border-top-left-radius: 5; border-top-right-radius: 5; border-right: 1px solid black; border-left: 1px solid black; padding: 0; padding-left: 20px; padding-bottom: 20px; padding-top: 15px; margin: 0; margin-bottom: 3px; margin-left: 8px; margin-right: 8px; background: white;">
|
||||
${languageFlags}
|
||||
<div id="site-content-wrapper" style="width: 100%; background: none;">
|
||||
|
||||
<div id="site-content" style="width: 100%; background: none;">
|
||||
${danube_page_content}<div style="clear: both;"></div></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="hero-unit" style="background: url(danube/page/default_page/pics/css/verlauf_bg.png)no-repeat; text-align: right; font-size: 75%; color: grey; height: 25px; padding: 0; margin: 0; border-top-left-radius: 0; border-top-right-radius: 0; padding-bottom: 3px; padding-right: 3px;">
|
||||
<!-- WebCraft Media -->${danube_footer}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@ -1,25 +1,22 @@
|
||||
<?php
|
||||
|
||||
class default_page extends SYSTEM\PAGE\Page {
|
||||
|
||||
private function js(){
|
||||
return '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PJQUERY(),'jquery-1.9.1.min.js').'"></script>'.
|
||||
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PBOOTSTRAP(),'js/bootstrap.min.js').'"></script>'.
|
||||
//'<script type="text/javascript" language="JavaScript" src="https://www.openlayers.org/api/OpenLayers.js"></script>'.
|
||||
'<script type="text/javascript" language="JavaScript" src="https://cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js"></script>'.
|
||||
'<script type="text/javascript" language="JavaScript" src="https://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>'.
|
||||
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/loadtexts.js').'"></script>'.
|
||||
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'js/lang_switcher.js').'"></script>'.
|
||||
'<script src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/galleria/galleria-1.2.9.min.js').'"></script>';
|
||||
return \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()->WEBPATH()).
|
||||
\SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()).
|
||||
\SYSTEM\HTML\html::script('https://cdnjs.cloudflare.com/ajax/libs/openlayers/2.13.1/OpenLayers.js').
|
||||
\SYSTEM\HTML\html::script('https://www.openstreetmap.org/openlayers/OpenStreetMap.js').
|
||||
\SYSTEM\HTML\html::script((new PPAGE('default_page/js/loadtexts.js'))->WEBPATH()).
|
||||
\SYSTEM\HTML\html::script((new PPAGE('js/lang_switcher.js'))->WEBPATH()).
|
||||
\SYSTEM\HTML\html::script((new PPAGE('default_page/js/galleria/galleria-1.2.9.min.js'))->WEBPATH());
|
||||
}
|
||||
|
||||
private function css(){
|
||||
return '<link href="'.SYSTEM\WEBPATH(new PBOOTSTRAP(),'css/bootstrap.min.css').'" rel="stylesheet" media="screen">';}
|
||||
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false));}
|
||||
|
||||
private function languageFlags(){
|
||||
return '<div id="languages" style="float: right; margin-right: 25px;"><a href="javascript:switchLocale(\'deDE\');"><img src="'.SYSTEM\WEBPATH(new PPAGE(),'js/flags/ger.jpg').'" /></a>
|
||||
<a href="#" onclick="switchLocale(\'enUS\'); return false;"><img src="'.SYSTEM\WEBPATH(new PPAGE(),'js/flags/uk.jpg').'" /></a>
|
||||
<a href="javascript:switchLocale(\'huHU\');"><img src="'.SYSTEM\WEBPATH(new PPAGE(),'js/flags/hu.jpg').'" /></a></div>';
|
||||
return '<div id="languages" style="float: right; margin-right: 25px;"><a href="javascript:switchLocale(\'deDE\');"><img src="'.(new PPAGE('js/flags/ger.jpg'))->WEBPATH().'" /></a>
|
||||
<a href="#" onclick="switchLocale(\'enUS\'); return false;"><img src="'.(new PPAGE('js/flags/uk.jpg'))->WEBPATH().'" /></a>
|
||||
<a href="javascript:switchLocale(\'huHU\');"><img src="'.(new PPAGE('js/flags/hu.jpg'))->WEBPATH().'" /></a></div>';
|
||||
}
|
||||
|
||||
public function html($_escaped_fragment_ = NULL){
|
||||
@ -38,6 +35,6 @@ class default_page extends SYSTEM\PAGE\Page {
|
||||
$vars['languageFlags'] = $this->languageFlags();
|
||||
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
|
||||
|
||||
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/danube.tpl'), $vars);
|
||||
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/danube.tpl'))->SERVERPATH(), $vars);
|
||||
}
|
||||
}
|
||||
74
danube/page/default_page/tpl/danube.tpl
Normal file
74
danube/page/default_page/tpl/danube.tpl
Normal file
@ -0,0 +1,74 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<title>${danube_page_title}</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
|
||||
${danube_html_meta}
|
||||
${css}
|
||||
${js}
|
||||
|
||||
<style type="text/css">
|
||||
#galleria{ width: 800px; height: 600px; background: #FFF }
|
||||
table tr td { padding: 3px; }
|
||||
div { border-radius: 5px;}
|
||||
</style>
|
||||
</head>
|
||||
<body style="background: #6699FF;">
|
||||
<div style="width: 900px; margin-right: auto; margin-left: auto;"><img src="danube/page/default_page/pics/css/font.png" /></div>
|
||||
<div class="hero-unit" style=" border: 1px solid black; border-top: 0px solid black; box-shadow: 5px 5px 3px; background: url(danube/page/default_page/pics/css/verlauf_bg.png); width: 934px; padding: 0px; margin: 0; margin-bottom: 15px; padding-bottom: -10px; margin-left: auto; margin-right: auto; margin-top: -2px;">
|
||||
<div class="hero-unit" style="background: url(danube/page/default_page/pics/css/verlauf_bg.png); margin: 0; padding: 0; border-top-left-radius: 5px; border-top-right-radius: 5px; -moz-border-bottom-left-radius: 0; -moz-border-bottom-right-radius: 0; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px;">
|
||||
<div id="danube_menu" class="navbar navbar-inverse" style="height: 32px;">
|
||||
<div class="navbar-inner" style="border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; background: url(danube/page/default_page/pics/css/verlauf_bg.png); ">
|
||||
<div class="1container">
|
||||
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="brand" href="" url="?action=default_page">${danube_menu_home}</a>
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav">
|
||||
<li><a href="javascript:switchTextBg('white')" url="./?page=introduction">${danube_menu_introduction}</a></li>
|
||||
<li><a href="javascript:switchTextBg('white')" url="./?page=prices" url_pic="danube/page/default_page/pics/photos/bar_front2.png">${danube_menu_prices}</a></li>
|
||||
<li><a href="javascript:switchTextBg('white')" url="./?page=contact">${danube_menu_contact}</a></li>
|
||||
<li><a href="javascript:switchTextBg('black')" url="./?page=impressions" textbg="black">${danube_menu_impressions}</a></li>
|
||||
<li><a href="javascript:switchTextBg('black')" url="./?page=partners">${danube_menu_partners}</a></li>
|
||||
<li><a href="javascript:switchTextBg('black')" url="./?page=certificates">${danube_menu_certificates}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div id="fb" style="margin-left: 750px; padding-top: 15px;">
|
||||
<iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.blue-danube-massage.de&layout=button_count&show_faces=true&width=450&action=like&colorscheme=light&height=80" scrolling="no" frameborder="0" style="border:none; overflow:hidden; height:80px; margin: 0; padding: 0; width: 140px;" allowTransparency="true"></iframe>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="myCarousel" class="carousel slide" style="background: black; width: 916px; padding: 0; margin: 0; margin-left: auto; margin-right: auto; border-bottom: 0px solid black;">
|
||||
<div class="carousel-inner">
|
||||
<div id="pic">
|
||||
${danube_page_headpic_home}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="space" style="height: 7px; background: url(danube/page/default_page/pics/css/verlauf_bg.png); margin-left: 9px; margin-right: 9px;"></div>
|
||||
|
||||
<div class="hero-unit" id="text" style="line-height: 180%; fonz-size: 80%; border-top-left-radius: 5; border-top-right-radius: 5; border-right: 1px solid black; border-left: 1px solid black; padding: 0; padding-left: 20px; padding-bottom: 20px; padding-top: 15px; margin: 0; margin-bottom: 3px; margin-left: 8px; margin-right: 8px; background: white;">
|
||||
${languageFlags}
|
||||
<div id="site-content-wrapper" style="width: 100%; background: none;">
|
||||
|
||||
<div id="site-content" style="width: 100%; background: none;">
|
||||
${danube_page_content}
|
||||
<div style="clear: both;"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="hero-unit" style="background: url(danube/page/default_page/pics/css/verlauf_bg.png)no-repeat; text-align: right; font-size: 75%; color: grey; height: 25px; padding: 0; margin: 0; border-top-left-radius: 0; border-top-right-radius: 0; padding-bottom: 3px; padding-right: 3px;">
|
||||
${danube_footer}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@ -5,7 +5,7 @@ class googlemaps extends SYSTEM\PAGE\Page {
|
||||
$vars = array();
|
||||
$vars['content'] = '<div style="width: 900px; padding: 0; margin: 0; border: 1px solid red; height: 500px;">
|
||||
<iframe style="padding: 0; margin: 0; display: block; width: 100%; height: 500px;"
|
||||
src="http://regiohelden.de/google-maps/map.php?width=600&height=300&hl=de&q=Heidelbergerstra%C3%9Fe%2017%2064673%20Zwingenberg+(Blue%20Danube%20Massage)&ie=UTF8&t=&z=14&iwloc=A&output=embed"
|
||||
src="https://regiohelden.de/google-maps/map.php?width=600&height=300&hl=de&q=Heidelbergerstra%C3%9Fe%2017%2064673%20Zwingenberg+(Blue%20Danube%20Massage)&ie=UTF8&t=&z=14&iwloc=A&output=embed"
|
||||
frameborder="0" scrolling="no" marginwidth="auto">
|
||||
</iframe>
|
||||
</div>';
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
<?php
|
||||
class PBOOTSTRAP extends \SYSTEM\PATH {
|
||||
public static function getPath(){
|
||||
return \SYSTEM\C_ROOT.'lib/bootstrap/'.\SYSTEM\C_SUBPATH;}
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
<?php
|
||||
class PJQUERY extends \SYSTEM\PATH {
|
||||
public static function getPath(){
|
||||
return \SYSTEM\C_ROOT.'lib/jquery/'.\SYSTEM\C_SUBPATH;}
|
||||
}
|
||||
2
danube/path/autoload.inc
Normal file
2
danube/path/autoload.inc
Normal file
@ -0,0 +1,2 @@
|
||||
<?php
|
||||
SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
|
||||
@ -1,2 +0,0 @@
|
||||
<?php
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
|
||||
@ -3,6 +3,6 @@ namespace SQL;
|
||||
class DATA_DANUBE 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_text.sql'));
|
||||
return array( (new \PSQL('/mysql/system_text.sql'))->SERVERPATH());
|
||||
}
|
||||
}
|
||||
@ -1 +1 @@
|
||||
Subproject commit b80827e711506a335dc51774948eba102396b528
|
||||
Subproject commit 55ef099e06745bda131cbc386b115107f3899487
|
||||
Reference in New Issue
Block a user