fixup round 3, updated system reference
This commit is contained in:
parent
c478b4c202
commit
aafe12ef58
@ -1,2 +1,3 @@
|
||||
RewriteEngine On
|
||||
RewriteRule ^files/([^/]+)/([^/]+)$ api.php?call=files&cat=$1&id=$2
|
||||
RewriteRule ^files/([^/]+)/([^/]+)$ api.php?call=files&cat=$1&id=$2 [L]
|
||||
RewriteRule ^cache/([^/]+)/([^/]+)$ api.php?call=cache&id=$1&ident=$2 [L]
|
||||
|
Before Width: | Height: | Size: 62 KiB After Width: | Height: | Size: 62 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
BIN
danube/files/content/top2.png
Normal file
BIN
danube/files/content/top2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 232 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 8.8 KiB |
BIN
danube/files/content/verlauf_bg.small.png
Normal file
BIN
danube/files/content/verlauf_bg.small.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 34 KiB |
@ -1,11 +1,10 @@
|
||||
<?php
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page','');
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/googlemaps','');
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_prices','');
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/osm','');
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_contact','');
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_partners','');
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_certificates','');
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_introduction','');
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_impressions','');
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__));
|
||||
require_once dirname(__FILE__).'/default_page/autoload.inc';
|
||||
require_once dirname(__FILE__).'/default_start/autoload.inc';
|
||||
require_once dirname(__FILE__).'/default_prices/autoload.inc';
|
||||
require_once dirname(__FILE__).'/default_contact/autoload.inc';
|
||||
require_once dirname(__FILE__).'/default_partners/autoload.inc';
|
||||
require_once dirname(__FILE__).'/default_certificates/autoload.inc';
|
||||
require_once dirname(__FILE__).'/default_introduction/autoload.inc';
|
||||
require_once dirname(__FILE__).'/default_impressions/autoload.inc';
|
||||
3
danube/page/default_certificates/autoload.inc
Normal file
3
danube/page/default_certificates/autoload.inc
Normal file
@ -0,0 +1,3 @@
|
||||
<?php
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__));
|
||||
|
||||
3
danube/page/default_contact/autoload.inc
Normal file
3
danube/page/default_contact/autoload.inc
Normal file
@ -0,0 +1,3 @@
|
||||
<?php
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__));
|
||||
|
||||
3
danube/page/default_impressions/autoload.inc
Normal file
3
danube/page/default_impressions/autoload.inc
Normal file
@ -0,0 +1,3 @@
|
||||
<?php
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__));
|
||||
|
||||
3
danube/page/default_introduction/autoload.inc
Normal file
3
danube/page/default_introduction/autoload.inc
Normal file
@ -0,0 +1,3 @@
|
||||
<?php
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__));
|
||||
|
||||
3
danube/page/default_page/autoload.inc
Normal file
3
danube/page/default_page/autoload.inc
Normal file
@ -0,0 +1,3 @@
|
||||
<?php
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__));
|
||||
|
||||
15
danube/page/default_page/css/default_page.css
Normal file
15
danube/page/default_page/css/default_page.css
Normal file
@ -0,0 +1,15 @@
|
||||
#galleria{ width: 800px; height: 600px; background: #FFF }
|
||||
table tr td { padding: 3px; }
|
||||
div { border-radius: 5px;}
|
||||
body {background: #6699FF !important}
|
||||
#headbanner {width: 900px; margin-right: auto; margin-left: auto;}
|
||||
#box1{border: 1px solid black; border-top: 0px solid black; box-shadow: 5px 5px 3px; width: 934px; padding: 0px; margin: 0; margin-bottom: 15px; padding-bottom: -10px; margin-left: auto; margin-right: auto; margin-top: -2px;}
|
||||
#box2{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;}
|
||||
#myCarousel{background: black; width: 916px; padding: 0; margin: 0; margin-left: auto; margin-right: auto; border-bottom: 0px solid black;}
|
||||
#space{height: 7px;margin-left: 9px; margin-right: 9px;}
|
||||
#text{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;}
|
||||
#languages {float: right; margin-right: 25px;}
|
||||
#footer{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;}
|
||||
#footer-left{float: left}
|
||||
#footer-left a {color: grey}
|
||||
#footer-right{text-align: right}
|
||||
@ -13,7 +13,9 @@ class default_page implements SYSTEM\PAGE\DefaultPage {
|
||||
}
|
||||
|
||||
public static function css(){
|
||||
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false));}
|
||||
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)).
|
||||
\SYSTEM\HTML\html::link( \SYSTEM\CACHE\cache_css::minify(
|
||||
array( new PPAGE('default_page/css/default_page.css'))));}
|
||||
|
||||
public function html($_escaped_fragment_ = NULL){
|
||||
$vars = array();
|
||||
|
||||
@ -1,62 +1,10 @@
|
||||
/* jQuery on document ready */
|
||||
$(document).ready(function() {
|
||||
// handle navigation link click
|
||||
$('#danube_menu ul li a, #danube_menu .dropdown-menu li a, .test a').click(function () {
|
||||
loadAjaxContent($(this).attr('url'));
|
||||
//loadUrlPic($(this).attr('url'));
|
||||
});
|
||||
//handle arrowclicks
|
||||
$('.test a').click(function () {
|
||||
//loadUrlPic($(this).attr('url'));
|
||||
//alert("fu");
|
||||
loadApiPic(-1);
|
||||
});
|
||||
|
||||
$(document).ready(function() {
|
||||
new SYSTEM('./api.php',1,'start');
|
||||
});
|
||||
|
||||
function loadAjaxContent(url) {
|
||||
var dataTmp;
|
||||
$.get(url, function (data) {
|
||||
dataTmp = data;
|
||||
bodyelem = $("html,body");
|
||||
bodyelem.animate();
|
||||
}).complete(function() {
|
||||
$('#site-content-wrapper').slideUp({duration: 'slow',
|
||||
complete: function(){
|
||||
$('#site-content').html(dataTmp);
|
||||
$('#site-content-wrapper').slideDown('slow');
|
||||
site_content_is_visible = true;
|
||||
}});
|
||||
});
|
||||
|
||||
}
|
||||
function loadUrlPic(url_pic) {
|
||||
var dataTmp;
|
||||
$.get(url_pic, function (data) {
|
||||
dataTmp = data;
|
||||
bodyelem = $("html,body");
|
||||
bodyelem.animate();
|
||||
}).complete(function() {
|
||||
$('.carousel-inner').slideUp({duration: 'slow',
|
||||
complete: function(){
|
||||
$('#pic').html(dataTmp);
|
||||
$('.carousel-inner').slideDown('slow');
|
||||
site_content_is_visible = true;
|
||||
}});
|
||||
});
|
||||
}
|
||||
|
||||
function loadApiPic(id) {
|
||||
var dataTmp;
|
||||
$.get('./api.php?call=img&id='+id, function (data) {
|
||||
dataTmp = data;
|
||||
bodyelem = $("html,body");
|
||||
bodyelem.animate();
|
||||
}).complete(function() {
|
||||
|
||||
|
||||
$('.navbar-collapse a').click(function(){
|
||||
$(".navbar-collapse").collapse('hide');
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
function switchTextBg(color){
|
||||
|
||||
@ -64,7 +12,7 @@ function switchTextBg(color){
|
||||
div.style.backgroundColor = color;
|
||||
|
||||
var div2 = document.getElementById("site-content-wrapper");
|
||||
//div2.style.backgroundColor = color;
|
||||
div2.style.backgroundColor = color;
|
||||
|
||||
if (color == "black") div.style.color = "white";
|
||||
if (color == "white") div.style.color = "black";
|
||||
|
||||
@ -3,72 +3,67 @@
|
||||
<head>
|
||||
<title>${danube_page_title}</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
|
||||
<meta name="fragment" content="!">
|
||||
${danube_html_meta}
|
||||
|
||||
<style type="text/css">
|
||||
#galleria{ width: 800px; height: 600px; background: #FFF }
|
||||
table tr td { padding: 3px; }
|
||||
div { border-radius: 5px;}
|
||||
</style>
|
||||
<style>#box1, #box2, #space, #footer{background:url(./files/content/verlauf_bg.png)}</style>
|
||||
</head>
|
||||
<body style="background: #6699FF;">
|
||||
<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;">
|
||||
<body>
|
||||
<div id="headbanner"><img src="./files/content/font.png" alt="Blue Danube Massage"/></div>
|
||||
<div class="hero-unit" id="box1">
|
||||
<div class="hero-unit" id="box2">
|
||||
<nav id="danube_menu" class="navbar navbar-inverse" style="background: none;">
|
||||
<div class="container-fluid">
|
||||
<!-- Brand and toggle get grouped for better mobile display -->
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
|
||||
<button type="button" class="navbar-toggle collapsed pull-left" data-toggle="collapse" data-target="#menu-collapse" aria-expanded="false">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="" url="?action=default_page">${danube_menu_home}</a>
|
||||
<a class="navbar-brand" href="#" onclick="switchTextBg('white')">${danube_menu_home}</a>
|
||||
</div>
|
||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||
<div class="collapse navbar-collapse" id="menu-collapse">
|
||||
<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="./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>
|
||||
<li><a href="javascript:switchTextBg('black')" url="./?page=certificates">${danube_menu_certificates}</a></li>
|
||||
<li><a href="#!introduction" onclick="switchTextBg('white')">${danube_menu_introduction}</a></li>
|
||||
<li><a href="#!prices" onclick="switchTextBg('white')">${danube_menu_prices}</a></li>
|
||||
<li><a href="#!contact" onclick="switchTextBg('white')">${danube_menu_contact}</a></li>
|
||||
<li><a href="#!impressions" onclick="switchTextBg('black')">${danube_menu_impressions}</a></li>
|
||||
<li><a href="#!partners" onclick="switchTextBg('black')">${danube_menu_partners}</a></li>
|
||||
<li><a href="#!certificates" onclick="switchTextBg('black')">${danube_menu_certificates}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</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 id="myCarousel" class="carousel slide">
|
||||
<div class="carousel-inner">
|
||||
<div id="pic">
|
||||
${danube_page_headpic_home}
|
||||
<div class="hero-unit" style="background: url('files/content/top2.png') no-repeat black; border-bottom-left-radius: 5; border-bottom-right-radius: 5; margin: 0; padding: 0;">
|
||||
<div class="item active" style="height: 410px; width: 100%; text-align: right; padding-top: 5px;"> </div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="space" style="height: 7px; background: url(./files/content/verlauf_bg.png); margin-left: 9px; margin-right: 9px;"></div>
|
||||
<div id="space"></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;">
|
||||
<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 class="hero-unit" id="text">
|
||||
<div id="languages">
|
||||
<a href="javascript:system.language('deDE');"><img src="./files/content/ger.jpg" alt="Sprache Deutsch"/></a>
|
||||
<a href="javascript:system.language('enUS');"><img src="./files/content/uk.jpg" alt="Language English"/></a>
|
||||
<a href="javascript:system.language('huHU');"><img src="./files/content/hu.jpg" alt="Language Hungarian"/></a>
|
||||
</div>
|
||||
<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 id="site-content-wrapper" style="width: 100%;">
|
||||
<div id="content" style="width: 100%;">
|
||||
|
||||
</div>
|
||||
<div style="clear: both;"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<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 class="hero-unit" id="footer">
|
||||
<div id="footer-left">© 2017 <a href="https://www.webcraft-media.de">Webcraft Media</a></div> <div id="footer-right">${danube_footer}</div>
|
||||
</div>
|
||||
</div>
|
||||
${css}
|
||||
|
||||
3
danube/page/default_partners/autoload.inc
Normal file
3
danube/page/default_partners/autoload.inc
Normal file
@ -0,0 +1,3 @@
|
||||
<?php
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__));
|
||||
|
||||
3
danube/page/default_prices/autoload.inc
Normal file
3
danube/page/default_prices/autoload.inc
Normal file
@ -0,0 +1,3 @@
|
||||
<?php
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__));
|
||||
|
||||
3
danube/page/default_start/autoload.inc
Normal file
3
danube/page/default_start/autoload.inc
Normal file
@ -0,0 +1,3 @@
|
||||
<?php
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__));
|
||||
|
||||
15
danube/page/default_start/default_start.php
Normal file
15
danube/page/default_start/default_start.php
Normal file
@ -0,0 +1,15 @@
|
||||
<?php
|
||||
class default_start implements SYSTEM\PAGE\Page {
|
||||
public static function title(){
|
||||
return \SYSTEM\PAGE\text::get('title_start');}
|
||||
public static function meta(){
|
||||
return \SYSTEM\PAGE\text::tag('meta_start');}
|
||||
|
||||
public static function css() {return array();}
|
||||
public static function js() {return array();}
|
||||
|
||||
public function html(){
|
||||
$vars = \SYSTEM\PAGE\text::tag('danube');
|
||||
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_start/tpl/default_start.tpl'))->SERVERPATH(), $vars);
|
||||
}
|
||||
}
|
||||
1
danube/page/default_start/tpl/default_start.tpl
Normal file
1
danube/page/default_start/tpl/default_start.tpl
Normal file
@ -0,0 +1 @@
|
||||
${danube_page_content}
|
||||
@ -11,18 +11,9 @@ class page_danube extends \SYSTEM\API\api_default {
|
||||
public static function default_page($_escaped_fragment_ = NULL){
|
||||
return (new default_page($_escaped_fragment_))->html();}
|
||||
|
||||
public static function page_googlemaps(){
|
||||
return (new googlemaps())->html();
|
||||
}
|
||||
|
||||
public static function page_osm(){
|
||||
return (new osm())->html();
|
||||
}
|
||||
|
||||
public static function page_test(){
|
||||
return (new default_page())->html();
|
||||
}
|
||||
|
||||
public static function page_start(){
|
||||
return (new default_start())->html();}
|
||||
|
||||
public static function page_prices(){
|
||||
return (new default_prices())->html();}
|
||||
|
||||
|
||||
@ -3,6 +3,7 @@ namespace SQL;
|
||||
class DATA_DANUBE extends \SYSTEM\DB\QI {
|
||||
public static function get_class(){return \get_class();}
|
||||
public static function files_mysql(){
|
||||
return array( (new \PSQL('/mysql/system_text.sql'))->SERVERPATH());
|
||||
return array( (new \PSQL('/mysql/system_text.sql'))->SERVERPATH(),
|
||||
(new \PSQL('/mysql/system_page.sql'))->SERVERPATH());
|
||||
}
|
||||
}
|
||||
7
danube/sql/mysql/system_page.sql
Normal file
7
danube/sql/mysql/system_page.sql
Normal file
@ -0,0 +1,7 @@
|
||||
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (10, 1, 'start', 'start', -1, 0, 0, '#content', './?page=start', 'init_start', 'default_start');
|
||||
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (11, 1, 'introduction', 'introduction', -1, 0, 0, '#content', './?page=introduction', 'init_introduction', 'default_introduction');
|
||||
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (12, 1, 'prices', 'prices', -1, 0, 0, '#content', './?page=prices', 'init_prices', 'default_prices');
|
||||
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (13, 1, 'contact', 'contact', -1, 0, 0, '#content', './?page=contact', 'init_contact', 'default_contact');
|
||||
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (14, 1, 'impressions', 'impressions', -1, 0, 0, '#content', './?page=impressions', 'init_impressions', 'default_impressions');
|
||||
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (15, 1, 'partners', 'partners', -1, 0, 0, '#content', './?page=partners', 'init_partners', 'default_partners');
|
||||
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (16, 1, 'certificates', 'certificates', -1, 0, 0, '#content', './?page=certificates', 'init_certificates', 'default_certificates');
|
||||
@ -1 +1 @@
|
||||
Subproject commit 97d494dc078a207490c4f07089ee5e1cd6061e12
|
||||
Subproject commit 44c20d3cf0d614b0776118a57e4eda5c8baa1922
|
||||
Reference in New Issue
Block a user