friseur team, sai fix, default page cleanup
This commit is contained in:
parent
5bcb243115
commit
80bc2ddf3c
10
config.php
10
config.php
@ -1,7 +1,7 @@
|
||||
<?php
|
||||
$friseurteam_config = array( array(config_ids::SYS_CONFIG_ERRORREPORTING, E_ALL | E_STRICT),
|
||||
array(config_ids::SYS_CONFIG_PATH_BASEURL, 'http://mojotrollz.eu/web/friseurteam/'),
|
||||
array(config_ids::SYS_CONFIG_PATH_BASEPATH, '/home/web/webdir/webcraft/'),
|
||||
array(config_ids::SYS_CONFIG_PATH_BASEPATH, '/home/web/webdir/friseurteam/'),
|
||||
array(config_ids::SYS_CONFIG_DB_TYPE, SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_TYPE_MYS),
|
||||
array(config_ids::SYS_CONFIG_DB_HOST, '127.0.0.1'),
|
||||
array(config_ids::SYS_CONFIG_DB_PORT, ''),
|
||||
@ -10,9 +10,9 @@ $friseurteam_config = array( array(config_ids::SYS_CONFIG_ERRORREPORTING,
|
||||
array(config_ids::SYS_CONFIG_DB_DBNAME, 'host_friseurteam'),
|
||||
array(config_ids::SYS_SAI_CONFIG_NAVIMG, '/web/system/sai/page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')),
|
||||
array(config_ids::SYS_SAI_CONFIG_BASEURL, 'http://mojotrollz.eu/web/friseurteam/sai.php?'),
|
||||
array(config_ids::SYS_SAI_CONFIG_TITLE, 'webcraft - Admin Area'),
|
||||
array(config_ids::SYS_SAI_CONFIG_COPYRIGHT, '<a href="http://mojotrollz.eu/web/friseurteam/" target="_blank">webcraft</a>, © WebCraft Media 2013'),
|
||||
array(config_ids::SYS_SAI_CONFIG_TITLE, 'Friseur Team - Admin Area'),
|
||||
array(config_ids::SYS_SAI_CONFIG_COPYRIGHT, '<a href="http://mojotrollz.eu/web/friseurteam/" target="_blank">Friseur Team</a>, © WebCraft Media 2014'),
|
||||
array(config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, 'system/'),
|
||||
array(config_ids::SYS_CONFIG_LANGS, array('deDE', 'enUS')),
|
||||
array(config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'));
|
||||
//array(config_ids::WEBCRAFT_BILLING_TOKEN, 'DANUBEdhasda3afdsjadfa3'));
|
||||
array(config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE'),
|
||||
array(config_ids::WEBCRAFT_BILLING_TOKEN, 'DANUBEdhasda3afdsjadfa3'));
|
||||
@ -1,65 +1,3 @@
|
||||
.halfCircleRight{
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
right: 38%;
|
||||
bottom: 50%;
|
||||
height:50px;
|
||||
width:25px;
|
||||
border-radius: 90px 0 0 90px;
|
||||
background-color: #333333;
|
||||
display: table;
|
||||
z-index: 3;
|
||||
}
|
||||
|
||||
#navigation-right-wrapper {
|
||||
box-shadow: 0px 0px 20px black;
|
||||
//background-color: rgb(244, 244, 244);
|
||||
background-color: gray;
|
||||
width: 38%;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
right: 0px;
|
||||
z-index: 2;
|
||||
//display: none;
|
||||
opacity: 0.98;
|
||||
}
|
||||
|
||||
.halfCircleLeft{
|
||||
cursor: pointer;
|
||||
position: absolute;
|
||||
left: 62%;
|
||||
bottom: 50%;
|
||||
height:50px;
|
||||
width:25px;
|
||||
border-radius: 0 90px 90px 0;
|
||||
background-color: #333333;
|
||||
display: table;
|
||||
z-index: 3;
|
||||
}
|
||||
|
||||
#navigation-left-wrapper {
|
||||
box-shadow: 0px 0px 20px black;
|
||||
//background-color: rgb(244, 244, 244);
|
||||
background-color: gray;
|
||||
width: 62%;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
top: 0px;
|
||||
left: 0px;
|
||||
z-index: 2;
|
||||
//display: none;
|
||||
opacity: 0.98;
|
||||
}
|
||||
|
||||
body{
|
||||
margin: 0;
|
||||
padding-top: 40px;
|
||||
padding-bottom: 30px;
|
||||
}
|
||||
#map {
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
bottom: 30px;
|
||||
top: 40px;
|
||||
}
|
||||
@ -1,209 +1,2 @@
|
||||
$(document).ready(function() {
|
||||
drawmap();
|
||||
drawmarker();
|
||||
$('#toggle-sidebar').click(function(){
|
||||
toggleSidebar();});
|
||||
$('#toggle-mainbar').click(function(){
|
||||
toggleMainbar();});
|
||||
loadPageDetails(3);
|
||||
|
||||
$('#webcraft_nav a').click(function(){
|
||||
loadPage($(this).attr('page'));});
|
||||
|
||||
$('#footer a').click(function(){
|
||||
loadPage($(this).attr('page'));});
|
||||
});
|
||||
|
||||
var popupStore = {};
|
||||
|
||||
var map;
|
||||
var osm;
|
||||
var cycle;
|
||||
var markers;
|
||||
|
||||
// Position und Zoomstufe der Karte
|
||||
var lon = 8.672434;
|
||||
var lat = 49.398752;
|
||||
var zoom = 7;
|
||||
|
||||
var map_div = 'map';
|
||||
var map_lang = 'de';
|
||||
|
||||
function drawmarker(){
|
||||
$.ajax({ type :'GET',
|
||||
url : 'http://www.webcraft-media.de/api.php?call=map&action=markers',
|
||||
success : function(data) {
|
||||
if(!data || !data['status']){
|
||||
alert('Fail');
|
||||
return;
|
||||
}
|
||||
data = data['result'];
|
||||
for (var i in data) {
|
||||
addMarker(markers, parseFloat(data[i]['lon']), parseFloat(data[i]['lat']), parseInt(data[i]['ID']));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function drawmap() {
|
||||
OpenLayers.Lang.setCode(map_lang);
|
||||
map = new OpenLayers.Map(map_div, {
|
||||
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'
|
||||
});
|
||||
|
||||
|
||||
osm = new OpenLayers.Layer.OSM.Mapnik("Mapnik");
|
||||
cycle = new OpenLayers.Layer.OSM.CycleMap("Cycle Map");
|
||||
|
||||
markers = new OpenLayers.Layer.Markers("Websites", { projection: new OpenLayers.Projection("EPSG:4326"),
|
||||
visibility: true, displayInLayerSwitcher: false, hover: true });
|
||||
|
||||
map.addLayers([ cycle, osm, markers]);
|
||||
jumpTo(lon, lat, zoom);
|
||||
}
|
||||
|
||||
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, projectid) {
|
||||
|
||||
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();
|
||||
}
|
||||
console.log(popupStore);
|
||||
OpenLayers.Event.stop(evt);
|
||||
};*/
|
||||
|
||||
var markerHover = function(evt){
|
||||
loadPageDetails(projectid);
|
||||
showSidebar();
|
||||
}
|
||||
|
||||
//marker.events.register('featurehighlighted', null, markerHover);
|
||||
marker.events.register("mouseover", feature, markerHover);
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
function showSidebar() {
|
||||
$('#toggle-sidebar i').removeClass('icon-chevron-left').addClass('icon-chevron-right');
|
||||
$('#navigation-right-wrapper').show(350);
|
||||
//$('#navigation-right-wrapper').animate({right: '200px'}, 'slow');
|
||||
$('#toggle-sidebar').animate({right: '38%'}, 'slow');
|
||||
}
|
||||
|
||||
/*
|
||||
* Hides the left navigation bar with a slide effect
|
||||
*/
|
||||
function hideSidebar() {
|
||||
$('#toggle-sidebar i').removeClass('icon-chevron-right').addClass('icon-chevron-left');
|
||||
$('#navigation-right-wrapper').hide(350);
|
||||
//$('#navigation-right-wrapper').animate({right: '-200px'}, 'slow');
|
||||
$('#toggle-sidebar').animate({right: '0px'}, 'slow');
|
||||
}
|
||||
|
||||
function toggleSidebar() {
|
||||
if($('#navigation-right-wrapper').is(':visible')){
|
||||
hideSidebar();
|
||||
} else {
|
||||
showSidebar();}
|
||||
}
|
||||
|
||||
function loadPageDetails(projectid){
|
||||
$('#navigation-right-wrapper').load('./?page=details&projectid='+projectid);
|
||||
}
|
||||
|
||||
function loadPage(page){
|
||||
$('#navigation-left-wrapper').load('./?page='+page,function(){
|
||||
switch(page){
|
||||
case 'start':
|
||||
showSidebar();
|
||||
showMainbar();
|
||||
break;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function showMainbar() {
|
||||
$('#toggle-mainbar i').removeClass('icon-chevron-right').addClass('icon-chevron-left');
|
||||
$('#navigation-left-wrapper').show(350);
|
||||
//$('#navigation-right-wrapper').animate({right: '200px'}, 'slow');
|
||||
$('#toggle-mainbar').animate({left: '62%'}, 'slow');
|
||||
}
|
||||
|
||||
/*
|
||||
* Hides the left navigation bar with a slide effect
|
||||
*/
|
||||
function hideMainbar() {
|
||||
$('#toggle-mainbar i').removeClass('icon-chevron-left').addClass('icon-chevron-right');
|
||||
$('#navigation-left-wrapper').hide(350);
|
||||
//$('#navigation-right-wrapper').animate({right: '-200px'}, 'slow');
|
||||
$('#toggle-mainbar').animate({left: '0px'}, 'slow');
|
||||
}
|
||||
|
||||
function toggleMainbar() {
|
||||
if($('#navigation-left-wrapper').is(':visible')){
|
||||
hideMainbar();
|
||||
} else {
|
||||
showMainbar();}
|
||||
}
|
||||
});
|
||||
@ -12,7 +12,7 @@ class default_page extends SYSTEM\PAGE\Page {
|
||||
$vars['js'] = self::js();
|
||||
$vars['css'] = self::css();
|
||||
$vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::CATEGORY_FRISEURTEAM_TEXT));
|
||||
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_page/webcraft.tpl'), $vars);
|
||||
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_page/friseurteam.tpl'), $vars);
|
||||
}
|
||||
|
||||
public static function css(){
|
||||
|
||||
12
friseurteam/page/default_page/friseurteam.tpl
Normal file
12
friseurteam/page/default_page/friseurteam.tpl
Normal file
@ -0,0 +1,12 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title></title>
|
||||
${js}
|
||||
${css}
|
||||
</head>
|
||||
<body>
|
||||
tralala
|
||||
</body>
|
||||
</html>
|
||||
@ -1,47 +0,0 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<head>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
|
||||
<title>WebCraft-Media</title>
|
||||
${js}
|
||||
${css}
|
||||
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
|
||||
<link href="css/special.css" rel="stylesheet" media="screen">
|
||||
</head>
|
||||
<body>
|
||||
<div class="navbar navbar-inverse navbar-fixed-top" id="webcraft_nav">
|
||||
<div class="navbar-inner">
|
||||
<div class="container">
|
||||
<button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="brand" style="" href="#" page="start">WebCraft-Media</a>
|
||||
<!-- <a class="brand" href="#"><img src="http://mojotrollz.eu/web/system/sai/modules/saistart_sys_sai/img/logo_sai.png"></a>-->
|
||||
<div class="nav-collapse collapse">
|
||||
<ul class="nav">
|
||||
<li><a href="#" page="services">Dienstleistungen</a></li>
|
||||
<li><a href="#" page="company">Das Unternehmen</a></li>
|
||||
<li><a href="#" page="contact">Kontakt</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="navigation-left-wrapper" style="background: url(http://www.webcraft-media.de/api.php?call=files&cat=how_to&id=background.png) repeat-x;">${default_start}</div>
|
||||
<div class="halfCircleLeft" id="toggle-mainbar">
|
||||
<i class="icon-chevron-left icon-white" style="margin-right: 12px; margin-top: 60%; color: #d6d6d6"></i>
|
||||
</div>
|
||||
<div id="map"></div>
|
||||
<div id="navigation-right-wrapper"></div>
|
||||
<div class="halfCircleRight" id="toggle-sidebar">
|
||||
<i class="icon-chevron-right icon-white" style="margin-left: 8px; margin-top: 60%; color: #d6d6d6"></i>
|
||||
</div>
|
||||
<div id="footer">
|
||||
<div class="navbar navbar-inverse navbar-fixed-bottom" style="height: 30px; text-align: right; padding-top: 7px; padding-right: 10px;">
|
||||
<a href="#" page="inprint">Impressum</a>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
class PAPI extends \SYSTEM\PATH {
|
||||
public static function getPath(){
|
||||
return \SYSTEM\C_ROOT.'webcraft/api/'.\SYSTEM\C_SUBPATH;}
|
||||
return \SYSTEM\C_ROOT.'friseurteam/api/'.\SYSTEM\C_SUBPATH;}
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
class PPAGE extends \SYSTEM\PATH {
|
||||
public static function getPath(){
|
||||
return \SYSTEM\C_ROOT.'webcraft/page/'.\SYSTEM\C_SUBPATH;}
|
||||
return \SYSTEM\C_ROOT.'friseurteam/page/'.\SYSTEM\C_SUBPATH;}
|
||||
}
|
||||
|
||||
5
friseurteam/path/PSAI.php
Normal file
5
friseurteam/path/PSAI.php
Normal file
@ -0,0 +1,5 @@
|
||||
<?php
|
||||
class PSAI extends \SYSTEM\PATH {
|
||||
public static function getPath(){
|
||||
return \SYSTEM\C_ROOT.'friseurteam/sai/'.\SYSTEM\C_SUBPATH;}
|
||||
}
|
||||
2
sai.php
2
sai.php
@ -2,7 +2,7 @@
|
||||
require_once 'system/autoload.inc.php'; //SYSTEM Classes
|
||||
SYSTEM\system::register_errorhandler_dbwriter(); //write errors to database (must be first errorhandler to register)
|
||||
SYSTEM\system::register_errorhandler_jsonoutput(); //print errors as json to caller
|
||||
require_once 'webcraft/autoload.inc.php'; //Project Classes
|
||||
require_once 'friseurteam/autoload.inc.php'; //Project Classes
|
||||
|
||||
require_once 'config.php'; //Server config
|
||||
SYSTEM\system::start($friseurteam_config); //Start System time + config
|
||||
|
||||
Reference in New Issue
Block a user