fixed alot of minor bugs in demo basic, updated system reference - and corrected the project accordingly

This commit is contained in:
Ulf Gebhardt 2017-07-05 13:28:01 +02:00
parent 440b1471d3
commit 2177b6172d
15 changed files with 94 additions and 29 deletions

3
.htaccess Normal file
View File

@ -0,0 +1,3 @@
RewriteEngine On
RewriteRule ^files/([^/]+)/([^/]+)$ api.php?call=files&cat=$1&id=$2 [L]
RewriteRule ^cache/([^/]+)/([^/]+)$ api.php?call=cache&id=$1&ident=$2 [L]

0
demo_basic/files/cache/dummy vendored Normal file
View File

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View File

@ -1,5 +1,9 @@
<?php
class default_about extends SYSTEM\PAGE\Page {
class default_about implements SYSTEM\PAGE\Page {
public static function title(){
return \SYSTEM\PAGE\text::get('title_about');}
public static function meta(){
return \SYSTEM\PAGE\text::tag('meta_about');}
public static function js(){
return array( new PPAGE('default_about/js/default_about.js'));}
public static function css(){

View File

@ -1,5 +1,9 @@
<?php
class default_impressum extends \SYSTEM\PAGE\Page {
class default_impressum implements \SYSTEM\PAGE\Page {
public static function title(){
return \SYSTEM\PAGE\text::get('title_impressum');}
public static function meta(){
return \SYSTEM\PAGE\text::tag('meta_impressum');}
public function html(){
$vars = array();
$vars['impressum'] = \SYSTEM\PAGE\text::get('webcraft_imprint');
@ -8,4 +12,5 @@ class default_impressum extends \SYSTEM\PAGE\Page {
public static function js(){
return array( new PPAGE('default_impressum/js/default_impressum.js'));
}
public static function css(){return array();}
}

View File

@ -1,15 +1,19 @@
<?php
class default_page extends \SYSTEM\PAGE\Page {
private static function js(){
return \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()->WEBPATH()).
\SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()).
\SYSTEM\HTML\html::script(\LIB\lib_system::js()->WEBPATH()).
\SYSTEM\HTML\html::script((new PPAGE('default_page/js/default_page.js'))->WEBPATH());
class default_page implements \SYSTEM\PAGE\DefaultPage {
public static function js(){
return \SYSTEM\HTML\html::script(\SYSTEM\CACHE\cache_js::minify(array(
\LIB\lib_jquery::js(),
\LIB\lib_bootstrap::js(),
\LIB\lib_system::js(),
new PPAGE('default_page/js/default_page.js')
)));
}
private static function css(){
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH()).
\SYSTEM\HTML\html::link((new PPAGE('default_page/css/default_page.css'))->WEBPATH());
public static function css(){
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)).
\SYSTEM\HTML\html::link(\SYSTEM\CACHE\cache_css::minify(array(
new PPAGE('default_page/css/default_page.css')
)));
}
public function html($_escaped_fragment_ = null){

View File

@ -2,15 +2,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="${meta_description}">
<meta name="keywords" content="${meta_keywords}">
<meta name="author" content="${meta_author}">
<title>${meta_title}</title>
<meta name="description" content="${meta_start_description}">
<meta name="keywords" content="${meta_start_author}">
<meta name="author" content="${meta_start_keywords}">
<title>${title_start}</title>
${css}
${js}
<link rel="shortcut icon" href="./api.php?call=files&amp;cat=img&amp;id=favicon.png" type="image/x-icon" />
<link rel="shortcut icon" href="./files/img/favicon.ico" type="image/x-icon" />
</head>
<body style="background: #cccccc; padding-top: 10px;">
<body style="background: #cccccc;">
<div class="modal fade" id="modal_text" style="" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
@ -23,7 +23,7 @@
</div><!-- /.modal -->
<div id="menu">
<div id="menu_content">
<a href="#!start">${menu_start}</a>
<a href="#!start">${menu_start}</a> |
<a href="#!about">${menu_about}</a>
</div>
</div>

View File

@ -1 +0,0 @@
<a href="#!start">${menu_start}</a>&nbsp;&nbsp-&nbsp;&nbsp;

View File

@ -1,5 +1,9 @@
<?php
class default_start extends SYSTEM\PAGE\Page {
class default_start implements SYSTEM\PAGE\Page {
public static function title(){
return \SYSTEM\PAGE\text::get('title_start');}
public static function meta(){
return \SYSTEM\PAGE\text::tag('meta_start');}
public static function js(){
return array( new PPAGE('default_start/js/default_start.js'));}
public static function css(){

View File

@ -3,7 +3,9 @@ class page_demo_basic extends \SYSTEM\API\api_default {
public static function get_apigroup(){
return 1;}
public static function get_class($params = null){
return self::class;}
return self::class;}
public static function get_default_state() {
return 'start';}
public static function default_page($_escaped_fragment_ = null){
return (new default_page())->html($_escaped_fragment_);}

View File

@ -4,6 +4,6 @@ class DATA_DEMO_BASIC extends \SYSTEM\DB\QI {
public static function get_class(){return \get_class();}
public static function files_mysql(){
return array( (new \PSQL('/mysql/system_page.sql'))->SERVERPATH(),
(new \PSQL('/mysql/webcraft_imprint.sql'))->SERVERPATH());
(new \PSQL('/mysql/system_text.sql'))->SERVERPATH());
}
}

View File

@ -1,3 +1,3 @@
INSERT 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');
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (15, 1, 'impressum', 'impressum', -1, 0, 0, '#content', './?page=impressum', 'init_impressum', 'default_impressum');
INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (20, 1, 'about', 'about', -1, 0, 0, '#content', './?page=about', 'init_about', 'default_about');
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 (15, 1, 'impressum', 'impressum', -1, 0, 0, '#content', './?page=impressum', 'init_impressum', 'default_impressum');
REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (20, 1, 'about', 'about', -1, 0, 0, '#content', './?page=about', 'init_about', 'default_about');

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1 +1 @@
Subproject commit 60fb33a7ab9fbf72aa4e9e9e5b7a87f31c3ca985
Subproject commit a483fdbacb41f917468623ac5fdbcf6036226a53