fixup round 2 danube, updated system reference

This commit is contained in:
Ulf Gebhardt 2017-04-01 01:56:12 +02:00
parent deb3ad8649
commit f08a6386ba
14 changed files with 31 additions and 61 deletions

View File

Before

Width:  |  Height:  |  Size: 758 KiB

After

Width:  |  Height:  |  Size: 758 KiB

View File

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB

View File

Before

Width:  |  Height:  |  Size: 622 B

After

Width:  |  Height:  |  Size: 622 B

View File

Before

Width:  |  Height:  |  Size: 553 B

After

Width:  |  Height:  |  Size: 553 B

View File

Before

Width:  |  Height:  |  Size: 780 B

After

Width:  |  Height:  |  Size: 780 B

View File

Before

Width:  |  Height:  |  Size: 215 KiB

After

Width:  |  Height:  |  Size: 215 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

View File

@ -1,4 +1,5 @@
<?php
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/content/','content');
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/certificates/','certificates');
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/partners/','partners');
\SYSTEM\FILES\files::registerFolder(dirname(__FILE__).'/impressions/','impressions');

View File

@ -1,38 +1,26 @@
<?php
class default_page implements SYSTEM\PAGE\DefaultPage {
public static function js(){
return \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()->WEBPATH()).
\SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()).
return \SYSTEM\HTML\html::script( \SYSTEM\CACHE\cache_js::minify(
array( \LIB\lib_jquery::js(),
\LIB\lib_bootstrap::js(),
\LIB\lib_system::js(),
new PPAGE('default_page/js/default_page.js'),
new PPAGE('default_page/js/galleria/galleria-1.2.9.min.js')
))).
\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());
\SYSTEM\HTML\html::script('https://www.openstreetmap.org/openlayers/OpenStreetMap.js');
}
public static function css(){
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="'.(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){
$arr = array_merge($_GET, $_POST);
if (isset($arr['lang'])) {
SYSTEM\locale::set($arr['lang']);
}
public function html($_escaped_fragment_ = NULL){
$vars = array();
$vars['css'] = $this->css();
$vars['js'] = '';
if(!$_escaped_fragment_){
$vars['js'] = $this->js();}
$vars['languageFlags'] = $this->languageFlags();
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/danube.tpl'))->SERVERPATH(), $vars);

View File

@ -11,6 +11,8 @@ $(document).ready(function() {
//alert("fu");
loadApiPic(-1);
});
new SYSTEM('./api.php',1,'start');
});
function loadAjaxContent(url) {

View File

@ -5,8 +5,6 @@
<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 }
@ -15,9 +13,9 @@
</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 style="width: 900px; margin-right: auto; margin-left: auto;"><img src="./files/content/font.png" /></div>
<div class="hero-unit" style=" border: 1px solid black; border-top: 0px solid black; box-shadow: 5px 5px 3px; background: url(./files/content/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(./files/content/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;">
<nav id="danube_menu" class="navbar navbar-inverse" style="background: none;">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
@ -33,7 +31,7 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-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=prices" url_pic="./files/content/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>
@ -52,10 +50,14 @@
</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 id="space" style="height: 7px; background: url(./files/content/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="languages" style="float: right; margin-right: 25px;">
<a href="javascript:system.language('deDE');"><img src="./files/content/ger.jpg" /></a>
<a href="javascript:system.language('enUS');"><img src="./files/content/uk.jpg" /></a>
<a href="javascript:system.language('huHU');"><img src="./files/content/hu.jpg" /></a>
</div>
<div id="site-content-wrapper" style="width: 100%; background: none;">
<div id="site-content" style="width: 100%; background: none;">
@ -65,9 +67,11 @@
</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;">
<div class="hero-unit" style="background: url(./files/content/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>
${css}
${js}
</body>
</html>

View File

@ -1,30 +0,0 @@
function switchLocale(locale){
reloadWithQueryStringVars({"lang": locale});
}
function reloadWithQueryStringVars (queryStringVars) {
var existingQueryVars = location.search ? location.search.substring(1).split("&") : [],
currentUrl = location.search ? location.href.replace(location.search,"") : location.href,
newQueryVars = {},
newUrl = currentUrl.replace(/#/g, "") + "?";
if(existingQueryVars.length > 0) {
for (var i = 0; i < existingQueryVars.length; i++) {
var pair = existingQueryVars[i].split("=");
newQueryVars[pair[0]] = pair[1];
}
}
if(queryStringVars) {
for (var queryStringVar in queryStringVars) {
newQueryVars[queryStringVar] = queryStringVars[queryStringVar];
}
}
if(newQueryVars) {
for (var newQueryVar in newQueryVars) {
newUrl += newQueryVar + "=" + newQueryVars[newQueryVar] + "&";
}
newUrl = newUrl.substring(0, newUrl.length-1);
window.location.href = newUrl;
} else {
window.location.href = location.href;
}
}

5
danube/path/PLIB.php Normal file
View File

@ -0,0 +1,5 @@
<?php
class PLIB extends \SYSTEM\PATH {
public function __construct($subpath = '') {
parent::__construct(new \SYSTEM\PROOT(), 'lib/', $subpath);}
}

@ -1 +1 @@
Subproject commit 41e82faa64d8fc8932737b3615bfa762f3d796aa
Subproject commit 97d494dc078a207490c4f07089ee5e1cd6061e12