fixed remaining pages

This commit is contained in:
Ulf Gebhardt 2017-04-02 14:01:55 +02:00
parent 2e076fdefe
commit d04aff4687
20 changed files with 263 additions and 85 deletions

View File

@ -6,11 +6,11 @@ class default_certificates implements SYSTEM\PAGE\Page {
return \SYSTEM\PAGE\text::tag('meta_certificates');}
public static function css() {return array();}
public static function js() {return array();}
public static function js() {return array(new PPAGE('default_certificates/js/default_certificates.js'));}
public function html(){
$vars = array();
$vars['gallery_certifictes'] = $this->gallery();
$vars['gallery'] = saimod_webcraft_gallery::getGalleryFlexslider(4);
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_certificates/tpl/cerfiticates.tpl'))->SERVERPATH(), $vars);
}

View File

@ -0,0 +1,9 @@
function init_certificates(){
$('.flexslider').flexslider({
animation: "slide",
directionNav: true,
controlNav: false,
slideshow: true,
animationLoop: true
});
}

View File

@ -1,11 +1,3 @@
<div style="margin-left: auto; margin-right: auto; text-align: center; border-radius: 5px; width: 100%;">
<div id="galleria" style="border-radius: 5px; width: 100%; background: none;">
<div id="galleria" style="border-radius: 5px;">
${gallery_certifictes}
</div>
</div>
</div>
<script>
Galleria.loadTheme('danube/page/default_page/js/galleria/themes/classic/galleria.classic.min.js');
Galleria.run('#galleria');
</script>
<div class="row-fluid flex-row">
<div class="col-md-12 flexslider margin0 padding0 flexhorz">${gallery}</div>
</div>

View File

@ -6,11 +6,11 @@ class default_contact implements SYSTEM\PAGE\Page {
return \SYSTEM\PAGE\text::tag('meta_contact');}
public static function css() {return array();}
public static function js() {return array();}
public static function js() {return array(new PPAGE('default_contact/js/default_contact.js'));}
public function html(){
$vars = array();
$vars['content'] = '';
$vars = array();
$vars['gallery'] = saimod_webcraft_gallery::getGalleryFlexslider(1);
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_contact/tpl/contact.tpl'))->SERVERPATH(), $vars);
}

View File

@ -0,0 +1,129 @@
function init_contact(){
drawmap();
$('.flexslider').flexslider({
animation: "slide",
directionNav: true,
controlNav: false,
slideshow: true,
animationLoop: true
});
}
var map;
var layer_mapnik;
var layer_tah;
var layer_markers;
function drawmap() {
// Popup und Popuptext mit evtl. Grafik
var popuptext="<b style=\"font-color: black\">Blue Danube Massage Studio<br>Heidelberger Straße 17<br>64673 Zwingenberg</b><p><img src=\"./files/content/top2.png\" width=\"200\" height=\"120\"></p>";
OpenLayers.Lang.setCode('de');
// Position und Zoomstufe der Karte
var lon = 8.6133649;
var lat = 49.7195325;
var zoom = 15;
$('#map').empty();
map = new OpenLayers.Map('map', {
projection: new OpenLayers.Projection("EPSG:900913"),
displayProjection: new OpenLayers.Projection("EPSG:4326"),
controls: [
new OpenLayers.Control.Navigation(),
//new OpenLayers.Control.LayerSwitcher(),
new OpenLayers.Control.PanZoomBar()],
//maxExtent:
// new OpenLayers.Bounds(-20037508.34,-20037508.34,
// 20037508.34, 20037508.34),
numZoomLevels: 18,
maxResolution: 156543,
units: 'meters'
});
layer_mapnik = new OpenLayers.Layer.OSM('Mapnik',
[ 'https://a.tile.openstreetmap.org/${z}/${x}/${y}.png',
'https://b.tile.openstreetmap.org/${z}/${x}/${y}.png',
'https://c.tile.openstreetmap.org/${z}/${x}/${y}.png'],
{maxZoom: 19,
attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'}
);
layer_mapnik.sour
//OpenLayers.Layer.OSM.Mapnik.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
// maxZoom: 19,
// attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>'
//});
layer_markers = new OpenLayers.Layer.Markers("Address", { projection: new OpenLayers.Projection("EPSG:4326"),
visibility: true, displayInLayerSwitcher: false });
map.addLayers([layer_mapnik, layer_markers]);
jumpTo(lon, lat, zoom);
// Position des Markers
addMarker(layer_markers, lon, lat, popuptext);
}
function jumpTo(lon, lat, zoom) {
var x = Lon2Merc(lon);
var y = Lat2Merc(lat);
map.setCenter(new OpenLayers.LonLat(x, y), zoom);
return false;
}
function Lon2Merc(lon) {
return 20037508.34 * lon / 180;
}
function Lat2Merc(lat) {
var PI = 3.14159265358979323846;
lat = Math.log(Math.tan( (90 + lat) * PI / 360)) / (PI / 180);
return 20037508.34 * lat / 180;
}
function addMarker(layer, lon, lat, popupContentHTML) {
var ll = new OpenLayers.LonLat(Lon2Merc(lon), Lat2Merc(lat));
var feature = new OpenLayers.Feature(layer, ll);
feature.closeBox = true;
feature.popupClass = OpenLayers.Class(OpenLayers.Popup.FramedCloud, {minSize: new OpenLayers.Size(300, 180) } );
feature.data.popupContentHTML = popupContentHTML;
feature.data.overflow = "hidden";
var marker = new OpenLayers.Marker(ll);
marker.feature = feature;
var markerClick = function(evt) {
if (this.popup == null) {
this.popup = this.createPopup(this.closeBox);
map.addPopup(this.popup);
this.popup.show();
} else {
this.popup.toggle();
}
OpenLayers.Event.stop(evt);
};
marker.events.register("mousedown", feature, markerClick);
layer.addMarker(marker);
map.addPopup(feature.createPopup(feature.closeBox));
}
function getCycleTileURL(bounds) {
var res = this.map.getResolution();
var x = Math.round((bounds.left - this.maxExtent.left) / (res * this.tileSize.w));
var y = Math.round((this.maxExtent.top - bounds.top) / (res * this.tileSize.h));
var z = this.map.getZoom();
var limit = Math.pow(2, z);
if (y < 0 || y >= limit)
{
return null;
}
else
{
x = ((x % limit) + limit) % limit;
return this.url + z + "/" + x + "/" + y + "." + this.type;
}
}

View File

@ -1,6 +1,5 @@
<div style="margin: 0; padding: 0; width: 450px; margin-left: auto; margin-right: auto;">
${danube_page_googlemaps}
</div>
<div style="margin: 0; padding: 0; width: 450px; margin-left: auto; margin-right: auto; margin-top: 35px; margin-bottom: 45px;">
${danube_page_contact}
<div class="row-fluid flex-row">
<div class="col-md-9" id="map" style="height: 450px;"></div>
<div class="col-md-3" style="padding-top: 150px; text-align: center; height: 450px;">${danube_page_contact}</div>
<div class="col-md-12 flexslider margin0 padding0 flexvert">${gallery}</div>
</div>

View File

@ -6,11 +6,11 @@ class default_impressions implements SYSTEM\PAGE\Page {
return \SYSTEM\PAGE\text::tag('meta_impressions');}
public static function css() {return array();}
public static function js() {return array();}
public static function js() {return array(new PPAGE('default_impressions/js/default_impressions.js'));}
public function html(){
$vars = array();
$vars['gallery_impressions'] = $this->gallery();
$vars['gallery'] = saimod_webcraft_gallery::getGalleryFlexslider(2);
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_impressions/tpl/impressions.tpl'))->SERVERPATH(), $vars);
}

View File

@ -0,0 +1,9 @@
function init_impressions(){
$('.flexslider').flexslider({
animation: "slide",
directionNav: true,
controlNav: false,
slideshow: true,
animationLoop: true
});
}

View File

@ -1,9 +1,3 @@
<div style="margin-left: auto; margin-right: auto; text-align: center; border-radius: 5px; width: 100%;">
<div id="galleria" style="border-radius: 5px; width: 100%; background: none;">
${gallery_impressions}
</div>
<script>
Galleria.loadTheme('danube/page/default_page/js/galleria/themes/classic/galleria.classic.min.js');
Galleria.run('#galleria');
</script>
</div>
<div class="row-fluid flex-row">
<div class="col-md-12 flexslider margin0 padding0 flexvert">${gallery}</div>
</div>

View File

@ -1,3 +1 @@
<div style="border-radius: 5px;">
${danube_page_introduction}
</div>
<div class="noflex-row">${danube_page_introduction}</div>

View File

@ -1,12 +1,69 @@
#galleria{ width: 800px; height: 600px; }
table tr td { padding: 3px; }
div { border-radius: 5px;}
body {background: #6699FF !important; font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;}
#footer{color: grey; height: 25px; padding: 5px; margin-bottom: 5px;}
#footer{color: grey; height: 25px; padding: 5px; margin-bottom: 5px; font-size: 12px;}
#footer-left{}
#footer-right a {color: grey}
#footer-right{text-align: right}
.noflex-row{
padding: 10px;
}
.flexslider{
border:0; background: black;
}
.flexslider .slides li {
text-align: center;
}
.flexslider .slides img{
max-height: 650px;
display: inline;
}
.flexhorz .slides img{
width: auto;
}
.flex-direction-nav a {
display: block;
width: 40px;
height: 40px;
margin: -20px 0 0;
position: absolute;
top: 50%;
z-index: 10;
overflow: hidden;
opacity: 0;
cursor: pointer;
color: rgba(0, 0, 0, 0.8);
text-shadow: none;
-webkit-transition: all 0.3s ease-in-out;
-moz-transition: all 0.3s ease-in-out;
-ms-transition: all 0.3s ease-in-out;
-o-transition: all 0.3s ease-in-out;
transition: all 0.3s ease-in-out;
color: #fff;
background-color: #000;
border-radius: 50%;
text-align: center;
}
.flex-direction-nav a:before {
font-family: "flexslider-icon";
font-size: 20px;
display: inline-block;
content: '\f001';
color: #FFF;
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3);
line-height: 40px;
}
.flex-direction-nav .flex-next {
right: -50px;
text-align: center;
}
.padding0{
padding:0 !important
}
@ -52,7 +109,7 @@ body {background: #6699FF !important; font-family: "Helvetica Neue",Helvetica,Ar
}
#content-row{
margin:0; line-height: 180%; border-right: 1px solid black; border-left: 1px solid black; padding: 10px; background: white;
margin:0; line-height: 180%; border-right: 1px solid black; border-left: 1px solid black; padding-bottom: 0px; background: beige;
}
@media (max-width: 991px) {

View File

@ -5,8 +5,9 @@ class default_page implements SYSTEM\PAGE\DefaultPage {
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')
\LIB\lib_flexslider::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');
@ -14,6 +15,7 @@ class default_page implements SYSTEM\PAGE\DefaultPage {
public static function css(){
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)).
\SYSTEM\HTML\html::link(\LIB\lib_flexslider::css()->WEBPATH(false)).
\SYSTEM\HTML\html::link( \SYSTEM\CACHE\cache_css::minify(
array( new PPAGE('default_page/css/default_page.css'))));}

View File

@ -4,16 +4,4 @@ $(document).ready(function() {
$('.navbar-collapse a').click(function(){
$(".navbar-collapse").collapse('hide');
});
});
function switchTextBg(color){
var div = document.getElementById("text");
div.style.backgroundColor = color;
var div2 = document.getElementById("site-content-wrapper");
div2.style.backgroundColor = color;
if (color == "black") div.style.color = "white";
if (color == "white") div.style.color = "black";
}
});

View File

@ -6,7 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="fragment" content="!">
<meta property="og:url" content="http://www.blue-danube-massage.de" />
${danube_html_meta}
<meta name="description" content="${meta_start_description}">
<meta name="author" content="${meta_start_author}">
<meta name="keywords" content="${meta_start_keywords}">
<style>.background{background:url(./files/content/verlauf_bg.png)}#main-img{background: url('files/content/top2.png') no-repeat black}</style>
</head>
<body>
@ -31,16 +33,16 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#" onclick="switchTextBg('white')"><b>${danube_menu_home}</b></a>
<a class="navbar-brand" href="#"><b>${danube_menu_home}</b></a>
</div>
<div class="collapse navbar-collapse" id="menu-collapse">
<ul class="nav navbar-nav">
<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>
<li><a href="#!introduction">${danube_menu_introduction}</a></li>
<li><a href="#!prices">${danube_menu_prices}</a></li>
<li><a href="#!contact">${danube_menu_contact}</a></li>
<li><a href="#!impressions">${danube_menu_impressions}</a></li>
<li><a href="#!partners">${danube_menu_partners}</a></li>
<li><a href="#!certificates">${danube_menu_certificates}</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><iframe title="Facebook Button" src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fwww.blue-danube-massage.de&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;colorscheme=light&amp;height=80" style="border:none; overflow:hidden;height:30px; margin-top: 15px; margin-left: 16px; padding: 0; width: 140px;"></iframe></li>
@ -64,8 +66,8 @@
<div id="content" class="col-md-12 padding0"></div>
</div>
<div class="row" id="footer">
<div id="footer-left" class="col-md-8">${danube_footer}</div>
<div id="footer-right" class="col-md-4 pull-right">© 2017 <a href="https://www.webcraft-media.de">Webcraft Media</a></div>
<div id="footer-left" class="col-md-8 col-sm-8 col-xs-8">${danube_footer}</div>
<div id="footer-right" class="col-md-3 col-sm-3 col-xs-3 pull-right">© 2017 <a href="https://www.webcraft-media.de">Webcraft Media</a></div>
</div>
</div>
</div>

View File

@ -6,11 +6,11 @@ class default_partners implements SYSTEM\PAGE\Page {
return \SYSTEM\PAGE\text::tag('meta_partners');}
public static function css() {return array();}
public static function js() {return array();}
public static function js() {return array(new PPAGE('default_partners/js/default_partners.js'));}
public function html(){
$vars = array();
$vars['gallery_partners'] = $this->gallery();
$vars['gallery'] = saimod_webcraft_gallery::getGalleryFlexslider(3);
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_partners/tpl/partners.tpl'))->SERVERPATH(), $vars);
}

View File

@ -0,0 +1,9 @@
function init_partners(){
$('.flexslider').flexslider({
animation: "slide",
directionNav: true,
controlNav: false,
slideshow: true,
animationLoop: true
});
}

View File

@ -1,10 +1,4 @@
<div id="text" style="margin-left: auto; margin-right: auto;">
${danube_page_partners}
<div id="galleria" style="border-radius: 5px;">
${gallery_partners}
</div>
</div>
<script>
Galleria.loadTheme('danube/page/default_page/js/galleria/themes/classic/galleria.classic.min.js');
Galleria.run('#galleria');
</script>
<div class="row-fluid flex-row">
<div class="col-md-12 noflex-row">${danube_page_partners}</div>
<div class="col-md-12 flexslider margin0 padding0 flexvert">${gallery}</div>
</div>

View File

@ -1,8 +1,4 @@
<div style="float: left; border-radius: 0; width: 38%; border-right: 1px dotted grey; padding-right: 15px; padding-top: 10px; background: none;">
${danube_page_prices}
</div>
<div style="float: right; width: 58%; background: none;">
${danube_page_offers}
</div>
<div style="clear: both;"></div>
<div class="row-fluid noflex-row">
<div class="col-md-5">${danube_page_prices}</div>
<div class="col-md-7" style="border-left: 1px dotted grey; border-radius: 0; margin-bottom: 10px;">${danube_page_offers}</div>
</div>

View File

@ -1,4 +1,4 @@
<div class="row-fluid">
<div class="row-fluid noflex-row">
<div class="col-md-10">${danube_page_content}</div>
<div class="col-md-2 padding0" style="text-align: right;">
<img src="./files/content/flower.png" alt="Blue Danube Massage Blume Innen" style="border-radius: 5px;"/>

@ -1 +1 @@
Subproject commit 3bd2fc0926ea73cce1932756fc7c88a949b4a4b9
Subproject commit d74a38a45095b40b1e318d8fde0c73144a3184f6