fixup round 2, galleries, anfahrt, layout & css

This commit is contained in:
Ulf Gebhardt 2017-04-08 22:59:44 +02:00
parent 322a3d5c48
commit f8089f5295
23 changed files with 243 additions and 66 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 208 KiB

View File

@ -4,4 +4,6 @@ require_once dirname(__FILE__).'/default_page/autoload.inc';
require_once dirname(__FILE__).'/default_start/autoload.inc';
require_once dirname(__FILE__).'/default_galerie/autoload.inc';
require_once dirname(__FILE__).'/default_preise/autoload.inc';
require_once dirname(__FILE__).'/default_team/autoload.inc';
require_once dirname(__FILE__).'/default_team/autoload.inc';
require_once dirname(__FILE__).'/default_anfahrt/autoload.inc';
require_once dirname(__FILE__).'/default_impressum/autoload.inc';

View File

@ -0,0 +1,3 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__));

View File

@ -0,0 +1,21 @@
<?php
class default_anfahrt implements SYSTEM\PAGE\Page {
public function html() {
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_anfahrt/tpl/default_anfahrt.tpl'))->SERVERPATH());}
public static function css() {
return array();
}
public static function js() {
return array(new PPAGE('default_anfahrt/js/default_anfahrt.js'));}
public static function meta() {
return NULL;
}
public static function title() {
return NULL;
}
}

View File

@ -0,0 +1,121 @@
function init_anfahrt(){
drawmap();
}
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\">Friseursalon Gabriel<br>Darmstaedter Strasse 30<br>64673 Zwingenberg</b><p><img src=\"./files/page/friseurteam_gallery_2.jpg\" width=\"200\" height=\"140\"></p>";
OpenLayers.Lang.setCode('de');
// Position und Zoomstufe der Karte
var lon = 8.6109639;
var lat = 49.7273731;
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

@ -0,0 +1 @@
<div class="col-md-12" id="map" style="height: 450px;"></div>

View File

@ -1,17 +1,15 @@
<?php
class default_galerie implements SYSTEM\PAGE\Page {
public function html() {
$vars = array('default_gallery' => saimod_webcraft_gallery::getGalleryGalleria(1));
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_galerie/galerie.tpl'), $vars);}
$vars = array('default_gallery' => saimod_webcraft_gallery::getGalleryFlexslider(1));
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_galerie/tpl/default_galerie.tpl'))->SERVERPATH(), $vars);}
public static function css() {
return array();
}
public static function js() {
return array();
}
public static function js(){
return array(new PPAGE('default_galerie/js/default_galerie.js'));}
public static function meta() {
return NULL;

View File

@ -1 +0,0 @@
<div id="galleria">${default_gallery}</div>

View File

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

View File

@ -0,0 +1 @@
<div class="flexslider" style="border:0; margin-bottom: 0;">${default_gallery}</div>

View File

@ -0,0 +1,3 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__));

View File

@ -0,0 +1,23 @@
<?php
class default_impressum implements SYSTEM\PAGE\Page {
public function html() {
$text = \SYSTEM\PAGE\text::get('impressum');
return $text;}
public static function css() {
return array();
}
public static function js() {
return array();
}
public static function meta() {
return NULL;
}
public static function title() {
return NULL;
}
}

View File

@ -4,4 +4,12 @@ $(document).ready(function() {
$('.navbar-collapse a').click(function(){
$(".navbar-collapse").collapse('hide');
});
$('.flexsliderheader').flexslider({
animation: "slide",
directionNav: false,
controlNav: false,
slideshow: true,
animationLoop: true
});
});

View File

@ -1,37 +0,0 @@
// Position und Zoomstufe der Karte
var lon = 8.6109639;
var lat = 49.7273731;
var zoom = 15;
var map_div = 'map';
function drawmap(){
map = new OpenLayers.Map(map_div);
layer = new OpenLayers.Layer.OSM();
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0, 0), 0);
var fromProjection = new OpenLayers.Projection("EPSG:4326"); // Transform from WGS 1984
var toProjection = new OpenLayers.Projection("EPSG:900913");
var position = new OpenLayers.LonLat(lon,lat).transform( fromProjection, toProjection);
var markers = new OpenLayers.Layer.Markers( "Markers" );
map.addLayer(markers);
var size = new OpenLayers.Size(25,40);
var offset = new OpenLayers.Pixel(-(size.w/2), -size.h);
var icon = new OpenLayers.Icon('http://meetaprogrammer.com/assets/leaflet/blue-marker-icon.png',size,offset);
var halfIcon = icon.clone();
marker = new OpenLayers.Marker(position,icon.clone());
marker.setOpacity(1);
marker.events.register('mousedown', marker, function(evt) { alert(this.icon.url); OpenLayers.Event.stop(evt); });
markers.addMarker(marker);
//map.addControl(new OpenLayers.Control.LayerSwitcher());
//map.zoomToMaxExtent();
map.setCenter(position, zoom );
halfIcon.setOpacity(0.5);
$('#'+map_div).show();
}

View File

@ -16,19 +16,23 @@
.margin0{
margin:0 !important;
}
.flexsliderheader li img {
height: 100%;
width: 100%;
}
</style>
</head>
<body>
<div class="container">
<div class="container" style="margin-top: 25px; box-shadow: 3px 3px 1px; border: 1px solid gold; margin-bottom: 10px; border-radius: 5px 5px 5px 5px; color: goldenrod">
<div class="row">
<div class="col-md-12 padding0" style="height: 250px;">
<img style="float:left; z-index: 1; position: relative;" src="./files/page/header_friseurteam2.png"/>
<div style="z-index: 0; height: 100%; border-radius: 0 !important;" class="flexslider">${head_gallery}</div>
<img style="float:left; z-index: 1; position: absolute; margin-top: 50px;" src="./files/page/header_friseurteam2.png"/>
<div class="col-md-12 padding0" style="height: 300px; background: black;">
<div style="float: left; z-index: 0; height: 300px; overflow: hidden; float: left; position: relative;" class="flexsliderheader">${head_gallery}</div>
</div>
</div>
<div class="row">
<nav class="navbar navbar-default margin0" style="border-radius: 0 !important;">
<div class="navbar-header">
<nav class="navbar navbar-inverse margin0" style="border-radius: 0 !important; background-color: grey; border: 0;">
<div class="navbar-header" style="margin-left: 5px;">
<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>
@ -40,20 +44,24 @@
<div class="collapse navbar-collapse" id="menu-collapse">
<ul class="nav navbar-nav">
<li><a href="#!team">${page_menu_team}</a></li>
<li><a href="#!preise">${page_menu_preise}</a></li>
<li><a href="#!preise">${page_menu_prices}</a></li>
<li><a href="#!galerie">${page_menu_gallery}</a></li>
<li><a href="#!anfahrt">${page_menu_contact}</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li><iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fwww.friseurteam-zwingenberg.de&amp;layout=button_count&amp;show_faces=true&amp;width=450&amp;action=like&amp;colorscheme=light&amp;height=80" style="border:none; overflow:hidden; height:20px; margin: 0; padding: 0; width: 140px;"></iframe></li>
<li><iframe src="https://www.facebook.com/plugins/like.php?href=https%3A%2F%2Fwww.friseurteam-zwingenberg.de&amp;layout=button_count&amp;show_faces=true&amp;width=450&amp;action=like&amp;colorscheme=light&amp;height=80" style="border:none; overflow:hidden; height:20px; margin: 0; padding: 0; margin-top: 15px; width: 140px;"></iframe></li>
</ul>
</div>
</nav>
</div>
<div class="row" style="background-color: white;">
<div class="col-md-4">${page_zeiten_info} ${page_kontakt_info}</div>
<div class="col-md-8" id="content"></div>
<div class="col-md-8 padding0" id="content" style="border-left: 1px dotted gold;"></div>
</div>
<div class="row">
<div id="footer">© 2017 <a href="https://www.webcraft-media.de" target="_blank" title="Webcraft Media Webdesign">Webcraft Media</a></div>
<div class="row" style="background-color: grey; border-radius: 0 0 5px 5px;">
<div id="footer-left" class="col-md-3 col-sm-3 col-xs-3"><a href="#!impressum" title="Impressum">Impressum</a></div>
<div style="text-align: center;" id="footer-middle" class="col-md-6 col-sm-6 col-xs-6">${page_footer}</div>
<div style="text-align: right;" id="footer-right" class="col-md-3 col-sm-3 col-xs-3 pull-right">© 2017 <a href="https://www.webcraft-media.de" title="Webcraft Media Webdesign" target="blank">Webcraft Media</a></div>
</div>
</div>
${css}

View File

@ -2,9 +2,7 @@
class default_preise implements SYSTEM\PAGE\Page {
public function html() {
$text = \SYSTEM\PAGE\text::tag('friseurteam');
$vars = array();
//$vars['default_gallery'] = saimod_webcraft_gallery::getGalleryGalleria(2);
$vars = \SYSTEM\PAGE\text::tag('friseurteam');
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_preise/default_preise.tpl'))->SERVERPATH(), $vars);}
public static function css() {

View File

@ -1 +1,2 @@
<div id="galleria2_container"><div id="galleria">${default_gallery}</div></div>
${page_angebot}
${default_preise}

View File

@ -2,16 +2,15 @@
class default_team implements SYSTEM\PAGE\Page {
public function html() {
$text = \SYSTEM\PAGE\text::tag('friseurteam');
return $text['default_team'];}
$vars = array('default_gallery' => saimod_webcraft_gallery::getGalleryFlexslider(1));
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_team/tpl/default_team.tpl'))->SERVERPATH(), $vars);}
public static function css() {
return array();
}
public static function js() {
return array();
}
return array(new PPAGE('default_team/js/default_team.js'));}
public static function meta() {
return NULL;

View File

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

View File

@ -0,0 +1 @@
<div class="flexslider" style="border:0; margin-bottom: 0;">${default_gallery}</div>

View File

@ -18,4 +18,8 @@ class page_friseurteam extends \SYSTEM\API\api_default {
return (new default_galerie())->html();}
public static function page_preise(){
return (new default_preise())->html();}
public static function page_anfahrt(){
return (new default_anfahrt())->html();}
public static function page_impressum(){
return (new default_impressum())->html();}
}

View File

@ -2,4 +2,5 @@ REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (11, 1, 'team', 'team', -1, 0, 0, '#content', './?page=team', 'init_team', 'default_team');
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (12, 1, 'preise', 'preise', -1, 0, 0, '#content', './?page=preise', 'init_preise', 'default_preise');
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (13, 1, 'galerie', 'galerie', -1, 0, 0, '#content', './?page=galerie', 'init_galerie', 'default_galerie');
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (14, 1, 'anfahrt', 'anfahrt', -1, 0, 0, '#content', './?page=anfahrt', 'init_anfahrt', 'default_anfahrt');
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (20, 1, 'impressum', 'impressum', -1, 0, 0, '#content', './?page=impressum', 'init_impressum', 'default_impressum');

View File

@ -25,12 +25,16 @@ INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('page_zeiten_info', 'friseur
INSERT INTO`system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('page_map_modal_title', 'deDE', '<p>Anfahrt: Darmstaedter Strasse 30 - 64673 Zwingenberg</p>', 0, 0, '2015-05-18 12:27:26', '0000-00-00 00:00:00');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('page_map_modal_title', 'friseurteam');
INSERT INTO`system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('page_menu_home', 'deDE', '<p>Friseur-Team</p>', 0, 0, '2015-05-18 12:27:26', '0000-00-00 00:00:00');
INSERT INTO`system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('page_menu_team', 'deDE', 'Unsere Mitarbeiter', 0, 0, '2015-05-18 12:27:26', '0000-00-00 00:00:00');
INSERT INTO`system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('page_menu_home', 'deDE', 'Friseur-Team', 0, 0, '2015-05-18 12:27:26', '0000-00-00 00:00:00');
INSERT INTO`system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('page_menu_team', 'deDE', 'Unser Team', 0, 0, '2015-05-18 12:27:26', '0000-00-00 00:00:00');
INSERT INTO`system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('page_menu_gallery', 'deDE', 'Galerie', 0, 0, '2015-05-18 12:27:26', '0000-00-00 00:00:00');
INSERT INTO`system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('page_menu_contact', 'deDE', 'Anfahrt', 0, 0, '2015-05-18 12:27:26', '0000-00-00 00:00:00');
INSERT INTO`system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('page_menu_prices', 'deDE', 'Preise', 0, 0, '2015-05-18 12:27:26', '0000-00-00 00:00:00');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('page_menu_home', 'friseurteam');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('page_menu_team', 'friseurteam');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('page_menu_gallery', 'friseurteam');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('page_menu_contact', 'friseurteam');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('page_menu_prices', 'friseurteam');
INSERT INTO`system_text` (`id`, `lang`, `text`, `author`, `author_edit`, `time_create`, `time_edit`) VALUES ('page_title', 'deDE', 'Friseurteam Zwingenberg', 0, 0, '2015-05-18 12:27:26', '0000-00-00 00:00:00');
INSERT INTO `system_text_tag` (`id`, `tag`) VALUES ('page_title', 'friseurteam');