fixup round 1, basic design

This commit is contained in:
Ulf Gebhardt 2017-04-07 23:47:50 +02:00
parent 2f82ce2e19
commit 322a3d5c48
31 changed files with 329 additions and 239 deletions

View File

@ -1,8 +1,8 @@
<?php
require_once dirname(__FILE__).'/path/autoload.inc.php';
require_once dirname(__FILE__).'/page/autoload.inc.php';
require_once dirname(__FILE__).'/config/autoload.inc.php';
require_once dirname(__FILE__).'/dbd/autoload.inc.php';
require_once dirname(__FILE__).'/api/autoload.inc.php';
require_once dirname(__FILE__).'/path/autoload.inc';
require_once dirname(__FILE__).'/page/autoload.inc';
require_once dirname(__FILE__).'/config/autoload.inc';
require_once dirname(__FILE__).'/api/autoload.inc';
require_once dirname(__FILE__).'/sai/autoload.inc';
require_once dirname(__FILE__).'/files/autoload.inc.php';
require_once dirname(__FILE__).'/files/autoload.inc';
require_once dirname(__FILE__).'/sql/autoload.inc';

View File

@ -1,2 +0,0 @@
<?php
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl','DBD');

View File

@ -1,7 +0,0 @@
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (0, 0, 0, -1, NULL, 'call', NULL);
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1, 0, 0, 0, NULL, 'action', NULL);
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (10, 0, 2, 1, 'customer', 'token', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (11, 0, 2, 1, 'billing', 'token', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (12, 0, 2, 1, 'bill', 'token', 'STRING');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (13, 0, 2, 1, 'bill', 'ID', 'UINT');
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (14, 0, 2, 1, 'project', 'token', 'STRING');

View File

@ -1,2 +0,0 @@
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (0, 1, 0, -1, NULL, 'page', NULL);
INSERT INTO `system_api` (`ID`, `group`, `type`, `parentID`, `parentValue`, `name`, `verify`) VALUES (1, 1, 2, 0, 'details', 'projectid', 'UINT');

View File

@ -1,7 +0,0 @@
<?php
namespace DBD;
class locale_string extends \SYSTEM\DBD\system_locale_string {
const CATEGORY_FRISEURTEAM_TEXT = 100;
const CATEGORY_FRISEURTEAM_PAGE = 101;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 54 KiB

View File

@ -0,0 +1,7 @@
<?php
\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_galerie/autoload.inc';
require_once dirname(__FILE__).'/default_preise/autoload.inc';
require_once dirname(__FILE__).'/default_team/autoload.inc';

View File

@ -1,7 +0,0 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page','');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_content','');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_galerie','');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_preise','');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_team','');

View File

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

View File

@ -1,7 +1,23 @@
<?php
class default_galerie extends SYSTEM\PAGE\Page {
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);}
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

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

View File

@ -12,165 +12,164 @@ a {
color: #FFB037;
}
#footer{
width: 100%;
color: white;
clear: both;
font-size: 12px;
}
//#footer{
// width: 100%;
// color: white;
// clear: both;
// font-size: 12px;
//}
#main{
width: 80%;
margin-left: auto;
margin-right: auto;
}
//#main{
// width: 80%;
// margin-left: auto;
// margin-right: auto;
//}
#static {
float: right;
}
//#static {
// float: right;
//}
#map_link {
height: 110px;
cursor: pointer;
}
//#map_link {
// height: 110px;
// cursor: pointer;
//}
#content{
float: left;
background-color: #F996AC;
background-color: rgba(249, 150, 172, 0.6);
opacity: 0.95;
width: 61.8%;
min-height: 500px;
max-height: 500px;
overflow-y: scroll;
border-radius: 0 0 0 5px;
}
#menu {
background-color: #990015;
clear: both;
}
//#content{
// float: left;
// background-color: #F996AC;
// background-color: rgba(249, 150, 172, 0.6);
// opacity: 0.95;
// width: 61.8%;
// min-height: 500px;
// max-height: 500px;
// overflow-y: scroll;
// border-radius: 0 0 0 5px;
//}
//#menu {
// background-color: #990015;
// clear: both;
//}
#content_frame {
margin: 0;
padding: 0;
width: 100%;
}
//#content_frame {
// margin: 0;
// padding: 0;
// width: 100%;
//}
#content_frame_frame {
margin-left: auto;
margin-right: auto;
padding: 0;
text-align: justify;
font-size: 105%;
width: 80%;
}
//#content_frame_frame {
// margin-left: auto;
// margin-right: auto;
// padding: 0;
// text-align: justify;
// font-size: 105%;
// width: 80%;
//}
#info {
width: 38.2%;
float: right;
background-color: rgba(246, 53, 95, 0.8);
font-weight: bold;
//font-family: Verdana;
height: 200px;
}
//#info {
// width: 38.2%;
// float: right;
// background-color: rgba(246, 53, 95, 0.8);
// font-weight: bold;
// height: 200px;
//}
#info_text {
padding-top: 20px;
float: right;
padding-right: 50px;
font-weight: bold;
font-size: 15px;
line-height: 25px;
}
//#info_text {
// padding-top: 20px;
// float: right;
// padding-right: 50px;
// font-weight: bold;
// font-size: 15px;
// line-height: 25px;
//}
#logo {
height: 200px;
opacity: 1;
margin: 0;
width: 61.8%;
float: left;
}
//#logo {
// height: 200px;
// opacity: 1;
// margin: 0;
// width: 61.8%;
// float: left;
//}
#menu div{
margin: 0;
padding: 0;
height: 30px;
width: 20.6%;
text-align: center;
float: left;
padding-top: 5px;
}
//#menu div{
// margin: 0;
// padding: 0;
// height: 30px;
// width: 20.6%;
// text-align: center;
// float: left;
// padding-top: 5px;
//}
#menu div a{
display: block;
height: 30px;
color: white;
}
//#menu div a{
// display: block;
// height: 30px;
// color: white;
//}
#menu div:hover{
background: #EFF0F2;
}
//#menu div:hover{
// background: #EFF0F2;
//}
#menu div:hover a{
color: #3C85D6;
}
//#menu div:hover a{
// color: #3C85D6;
//}
#menu_1{
background: #3C85D6;}
#menu_2{
background: #023F83;}
#menu_3{
background: #91B8E4;}
#angebot{
float: left;
color: white;
font-weight: bold;
text-align: center;
width: 38.2%;
background-color: #023F83;
height: 30px;
padding-top: 5px;
font-size: 12px;
}
//#menu_1{
// background: #3C85D6;}
//#menu_2{
// background: #023F83;}
//#menu_3{
// background: #91B8E4;}
//#angebot{
// float: left;
// color: white;
// font-weight: bold;
// text-align: center;
// width: 38.2%;
// background-color: #023F83;
// height: 30px;
// padding-top: 5px;
// font-size: 12px;
//}
#menu_ul {
margin: 0;
padding: 0;
}
#galleria {
height: 500px;
width: 100%;
}
//#menu_ul {
// margin: 0;
// padding: 0;
//
//}
//#galleria {
// height: 500px;
// width: 100%;
//}
#galleria_container {
float: left;
width: 38.2%;
background-color: rgba(255, 0, 0, 0.3);
border-radius: 0 0 5px 0;
}
//#galleria_container {
// float: left;
// width: 38.2%;
// background-color: rgba(255, 0, 0, 0.3);
// border-radius: 0 0 5px 0;
//}
#galleria_container2 {
float: left;
width: 38.2%;
}
//#galleria_container2 {
// float: left;
// width: 38.2%;
//}
.info_margin {
margin-top: 20px;
//.info_margin {
// margin-top: 20px;
//margin-left: 30px;
float: left;
}
// float: left;
//}
#info_zeiten {
width: auto;
font-size: 12px;
}
//#info_zeiten {
// width: auto;
// font-size: 12px;
//}
#info_mapfb{
width: 50%;
padding-left: 18px;
}
//#info_mapfb{
// width: 50%;
// padding-left: 18px;
//}
#top_container{
background-color: white;
}
//#top_container{
// background-color: white;
//}

View File

@ -11,14 +11,8 @@ class default_page implements SYSTEM\PAGE\DefaultPage {
))).
\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');
/*return '<script type="text/javascript" src="'.\SYSTEM\WEBPATH(new PLIB(),'jquery/jquery-1.9.1.min.js').'"></script>'.
'<script type="text/javascript" src="'.\SYSTEM\WEBPATH(new PLIB(),'bootstrap/js/bootstrap.min.js').'"></script>'.
'<script type="text/javascript" src="http://www.openlayers.org/api/OpenLayers.js"></script>'.
'<script type="text/javascript" src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>'.
'<script type="text/javascript" src="'.\SYSTEM\WEBPATH(new PSAI(),'saimod_webcraft_gallery/js/galleria/galleria-1.2.9.min.js').'"></script>'.
'<script type="text/javascript" src="'.\SYSTEM\WEBPATH(new PPAGE(),'default_page/js/default_page.js').'"></script>'.
'<script type="text/javascript" src="'.\SYSTEM\WEBPATH(new PPAGE(),'default_page/js/map.js').'"></script>';*/
}
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)).
@ -31,8 +25,7 @@ class default_page implements SYSTEM\PAGE\DefaultPage {
if(!$_escaped_fragment_){
$vars['js'] = self::js();}
$vars['css'] = self::css();
//$vars['default_gallery'] = saimod_webcraft_gallery::getGalleryGalleria(1);
$vars['default_content'] = (new default_content())->html();
$vars['head_gallery'] = saimod_webcraft_gallery::getGalleryFlexslider(1);
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('friseurteam'),
\SYSTEM\PAGE\text::tag('basic'));
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/friseurteam.tpl'))->SERVERPATH(), $vars);

View File

@ -1,9 +1,7 @@
$(document).ready(function() {
$('#menu a').click(function(){
$('#content_frame_frame').load('./?page='+$(this).attr('page'));
});
$('#map_link').click(function(){
$('#map_modal').modal();
drawmap();
new SYSTEM('./api.php',1,'start');
$('.navbar-collapse a').click(function(){
$(".navbar-collapse").collapse('hide');
});
});

View File

@ -1,5 +1,5 @@
<!DOCTYPE html>
<html>
<html lang="de">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
@ -7,54 +7,56 @@
<meta name="keywords" content="Friseur, Friseurteam, Zwingenberg, Hair, Styling">
<meta name="author" content="Webcraft-Media.de">
<title>${page_title}</title>
${js}
${css}
<style>
body{background: url('./files/page/background_friseur.png') no-repeat center center fixed; background-size: cover;}
.padding0{
padding:0 !important;
}
.margin0{
margin:0 !important;
}
</style>
</head>
<body style="background: url('./api.php?call=files&cat=page&id=background_friseur.png') no-repeat center center fixed; background-size: cover;">
<div id="map_modal" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h5 class="modal-title">${page_map_modal_title}</h5>
</div>
<div class="modal-body">
<div id="map" style="width: 500px; height: 500px; display: none;"></div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">${basic_close}</button>
</div>
<body>
<div class="container">
<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>
</div>
</div>
</div>
<div id="main">
<div id="top_container">
<div id="logo" style="background: url('./api.php?call=files&cat=page&id=header_friseurteam2.png') no-repeat; background-size: contain;"><div id="info_text">${page_kontakt_info}</div></div>
<div id="info">
<div id="info_mapfb" class="info_margin">
<img id="map_link" src="./api.php?call=files&cat=page&id=marker-02.png" style="border:4px solid pink"/>
<div>
<br/>
<iframe src="http://www.facebook.com/plugins/like.php?href=http%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" scrolling="no" frameborder="0" style="border:none; overflow:hidden; height:20px; margin: 0; padding: 0; width: 140px;" allowTransparency="true"></iframe>
</div>
<div class="row">
<nav class="navbar navbar-default margin0" style="border-radius: 0 !important;">
<div class="navbar-header">
<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="#"><b>${page_menu_home}</b></a>
</div>
<div class="info_margin" id="info_zeiten">
${page_zeiten_info}
<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>
</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>
</ul>
</div>
</div>
</nav>
</div>
<div id="menu">
<div id="menu_1"><a href="#" page="default_content">${page_menu_1}</a></div>
<div id="menu_2"><a href="#" page="default_team">${page_menu_2}</a></div>
<div id="menu_3"><a href="#" page="default_preise">${page_menu_3}</a></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>
<div id="angebot">${page_angebot}</div>
<div id="content_frame">
<div id="content"><div id="content_frame_frame">${default_content}</div></div>
<div id="galleria_container"><div id="galleria">${default_gallery}</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>
<div id="footer">${page_copyright}</div>
</div>
${css}
${js}
</body>
</html>

View File

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

View File

@ -1,9 +1,25 @@
<?php
class default_preise extends SYSTEM\PAGE\Page {
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);
return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_preise/default_preise.tpl'), $vars);}
//$vars['default_gallery'] = saimod_webcraft_gallery::getGalleryGalleria(2);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_preise/default_preise.tpl'))->SERVERPATH(), $vars);}
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

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

View File

@ -1,8 +1,8 @@
<?php
class default_content implements SYSTEM\PAGE\Page {
class default_start implements SYSTEM\PAGE\Page {
public function html() {
$text = \SYSTEM\PAGE\text::tag('friseurteam');
return 'abc';}//$text['default_content'];}
return $text['default_content'];}
public static function css() {
return array();

View File

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

View File

@ -1,7 +1,23 @@
<?php
class default_team extends SYSTEM\PAGE\Page {
class default_team implements SYSTEM\PAGE\Page {
public function html() {
$text = \SYSTEM\PAGE\text::tag('friseurteam');
return $text['default_team'];}
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

@ -10,12 +10,12 @@ class page_friseurteam extends \SYSTEM\API\api_default {
public static function default_page($_escaped_fragment_ = NULL){
return (new default_page())->html($_escaped_fragment_);}
public static function page_default_content(){
return (new default_content())->html();}
public static function page_default_team(){
public static function page_start(){
return (new default_start())->html();}
public static function page_team(){
return (new default_team())->html();}
public static function page_default_galerie(){
public static function page_galerie(){
return (new default_galerie())->html();}
public static function page_default_preise(){
public static function page_preise(){
return (new default_preise())->html();}
}

View File

@ -0,0 +1,9 @@
<?php
namespace SQL;
class DATA_FRISEURTEAM 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(),
(new \PSQL('/mysql/system_page.sql'))->SERVERPATH());
}
}

View File

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

View File

@ -0,0 +1,5 @@
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, '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 (20, 1, 'impressum', 'impressum', -1, 0, 0, '#content', './?page=impressum', 'init_impressum', 'default_impressum');

File diff suppressed because one or more lines are too long