diff --git a/danube/page/default_certificates/default_certificates.php b/danube/page/default_certificates/default_certificates.php index 9cbf358..8348946 100644 --- a/danube/page/default_certificates/default_certificates.php +++ b/danube/page/default_certificates/default_certificates.php @@ -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); } diff --git a/danube/page/default_certificates/js/default_certificates.js b/danube/page/default_certificates/js/default_certificates.js new file mode 100644 index 0000000..953bce0 --- /dev/null +++ b/danube/page/default_certificates/js/default_certificates.js @@ -0,0 +1,9 @@ +function init_certificates(){ + $('.flexslider').flexslider({ + animation: "slide", + directionNav: true, + controlNav: false, + slideshow: true, + animationLoop: true + }); +} \ No newline at end of file diff --git a/danube/page/default_certificates/tpl/cerfiticates.tpl b/danube/page/default_certificates/tpl/cerfiticates.tpl index b10e309..5be22ef 100644 --- a/danube/page/default_certificates/tpl/cerfiticates.tpl +++ b/danube/page/default_certificates/tpl/cerfiticates.tpl @@ -1,11 +1,3 @@ -
-
-
- ${gallery_certifictes} -
-
-
- \ No newline at end of file +
+
${gallery}
+
\ 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 abeb9b8..c561b40 100644 --- a/danube/page/default_contact/default_contact.php +++ b/danube/page/default_contact/default_contact.php @@ -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); } diff --git a/danube/page/default_contact/js/default_contact.js b/danube/page/default_contact/js/default_contact.js new file mode 100644 index 0000000..9ebb239 --- /dev/null +++ b/danube/page/default_contact/js/default_contact.js @@ -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="Blue Danube Massage Studio
Heidelberger Straße 17
64673 Zwingenberg

"; + + 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: '© OpenStreetMap'} + ); + layer_mapnik.sour + + //OpenLayers.Layer.OSM.Mapnik.tileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { +// maxZoom: 19, +// attribution: '© OpenStreetMap' +//}); + 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; + } +} \ No newline at end of file diff --git a/danube/page/default_contact/tpl/contact.tpl b/danube/page/default_contact/tpl/contact.tpl index 673b161..c6c50e5 100644 --- a/danube/page/default_contact/tpl/contact.tpl +++ b/danube/page/default_contact/tpl/contact.tpl @@ -1,6 +1,5 @@ -
-${danube_page_googlemaps} -
-
-${danube_page_contact} +
+
+
${danube_page_contact}
+
${gallery}
\ No newline at end of file diff --git a/danube/page/default_impressions/default_impressions.php b/danube/page/default_impressions/default_impressions.php index c8a6db8..fd6512b 100644 --- a/danube/page/default_impressions/default_impressions.php +++ b/danube/page/default_impressions/default_impressions.php @@ -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); } diff --git a/danube/page/default_impressions/js/default_impressions.js b/danube/page/default_impressions/js/default_impressions.js new file mode 100644 index 0000000..da29866 --- /dev/null +++ b/danube/page/default_impressions/js/default_impressions.js @@ -0,0 +1,9 @@ +function init_impressions(){ + $('.flexslider').flexslider({ + animation: "slide", + directionNav: true, + controlNav: false, + slideshow: true, + animationLoop: true + }); +} \ No newline at end of file diff --git a/danube/page/default_impressions/tpl/impressions.tpl b/danube/page/default_impressions/tpl/impressions.tpl index 95b428d..d3c10f3 100644 --- a/danube/page/default_impressions/tpl/impressions.tpl +++ b/danube/page/default_impressions/tpl/impressions.tpl @@ -1,9 +1,3 @@ -
-
-${gallery_impressions} -
- -
+
+
${gallery}
+
\ No newline at end of file diff --git a/danube/page/default_introduction/tpl/introduction.tpl b/danube/page/default_introduction/tpl/introduction.tpl index 8ffea9c..8f3e7d4 100644 --- a/danube/page/default_introduction/tpl/introduction.tpl +++ b/danube/page/default_introduction/tpl/introduction.tpl @@ -1,3 +1 @@ -
-${danube_page_introduction} -
+
${danube_page_introduction}
diff --git a/danube/page/default_page/css/default_page.css b/danube/page/default_page/css/default_page.css index c8a370e..f522014 100644 --- a/danube/page/default_page/css/default_page.css +++ b/danube/page/default_page/css/default_page.css @@ -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) { diff --git a/danube/page/default_page/default_page.php b/danube/page/default_page/default_page.php index f84d543..c9b8530 100644 --- a/danube/page/default_page/default_page.php +++ b/danube/page/default_page/default_page.php @@ -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'))));} diff --git a/danube/page/default_page/js/default_page.js b/danube/page/default_page/js/default_page.js index e2db2d3..70f45eb 100644 --- a/danube/page/default_page/js/default_page.js +++ b/danube/page/default_page/js/default_page.js @@ -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"; -} \ No newline at end of file +}); \ No newline at end of file diff --git a/danube/page/default_page/tpl/danube.tpl b/danube/page/default_page/tpl/danube.tpl index 1e8860b..df6ef0f 100644 --- a/danube/page/default_page/tpl/danube.tpl +++ b/danube/page/default_page/tpl/danube.tpl @@ -6,7 +6,9 @@ - ${danube_html_meta} + + + @@ -31,16 +33,16 @@ - ${danube_menu_home} + ${danube_menu_home}
diff --git a/danube/page/default_partners/default_partners.php b/danube/page/default_partners/default_partners.php index 0830533..09515ba 100644 --- a/danube/page/default_partners/default_partners.php +++ b/danube/page/default_partners/default_partners.php @@ -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); } diff --git a/danube/page/default_partners/js/default_partners.js b/danube/page/default_partners/js/default_partners.js new file mode 100644 index 0000000..20883da --- /dev/null +++ b/danube/page/default_partners/js/default_partners.js @@ -0,0 +1,9 @@ +function init_partners(){ + $('.flexslider').flexslider({ + animation: "slide", + directionNav: true, + controlNav: false, + slideshow: true, + animationLoop: true + }); +} \ No newline at end of file diff --git a/danube/page/default_partners/tpl/partners.tpl b/danube/page/default_partners/tpl/partners.tpl index d1ef425..82fb81e 100644 --- a/danube/page/default_partners/tpl/partners.tpl +++ b/danube/page/default_partners/tpl/partners.tpl @@ -1,10 +1,4 @@ -
- ${danube_page_partners} -
- ${gallery_partners} -
-
- \ No newline at end of file +
+
${danube_page_partners}
+
${gallery}
+
\ No newline at end of file diff --git a/danube/page/default_prices/tpl/prices.tpl b/danube/page/default_prices/tpl/prices.tpl index aa5e0e4..2556dad 100644 --- a/danube/page/default_prices/tpl/prices.tpl +++ b/danube/page/default_prices/tpl/prices.tpl @@ -1,8 +1,4 @@ -
-${danube_page_prices} -
- -
-${danube_page_offers} -
-
\ No newline at end of file +
+
${danube_page_prices}
+
${danube_page_offers}
+
\ No newline at end of file diff --git a/danube/page/default_start/tpl/default_start.tpl b/danube/page/default_start/tpl/default_start.tpl index 4b9df3f..ef066cb 100644 --- a/danube/page/default_start/tpl/default_start.tpl +++ b/danube/page/default_start/tpl/default_start.tpl @@ -1,4 +1,4 @@ -
+
${danube_page_content}
Blue Danube Massage Blume Innen diff --git a/danube/sai/saimod_webcraft_gallery b/danube/sai/saimod_webcraft_gallery index 3bd2fc0..d74a38a 160000 --- a/danube/sai/saimod_webcraft_gallery +++ b/danube/sai/saimod_webcraft_gallery @@ -1 +1 @@ -Subproject commit 3bd2fc0926ea73cce1932756fc7c88a949b4a4b9 +Subproject commit d74a38a45095b40b1e318d8fde0c73144a3184f6