Merge branch 'master' of mojotrollz.eu:system

Conflicts:
	sai/page/default_page.php
This commit is contained in:
Messerbill 2015-06-08 14:19:19 +02:00
commit 1c134a14dd
13 changed files with 26 additions and 1980 deletions

6
.gitmodules vendored Normal file
View File

@ -0,0 +1,6 @@
[submodule "lib/jquery"]
path = lib/jquery
url = git@mojotrollz.eu:webcraft/lib_jquery.git
[submodule "lib/bootstrap"]
path = lib/bootstrap
url = git@mojotrollz.eu:webcraft/lib_bootstrap.git

View File

@ -1,3 +1,6 @@
<?php <?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'LIB'); \SYSTEM\autoload::registerFolder(dirname(__FILE__),'LIB');
require_once dirname(__FILE__).'/markdown/autoload.inc'; require_once dirname(__FILE__).'/markdown/autoload.inc';
require_once dirname(__FILE__).'/jquery/autoload.inc';
require_once dirname(__FILE__).'/tablesort/autoload.inc';
require_once dirname(__FILE__).'/bootstrap/autoload.inc';

1
lib/bootstrap Submodule

@ -0,0 +1 @@
Subproject commit 7ec24da73d3de379567f8cf27f4c5e860b1a724a

1
lib/jquery Submodule

@ -0,0 +1 @@
Subproject commit 24eb1a096cb4509a1d9643292f846295d6903a33

View File

@ -1,6 +1,6 @@
<?php <?php
namespace LIB; namespace LIB;
abstract class lib_jscss extends lib{ abstract class lib_jscss extends lib{
protected static abstract function js_path(); protected static function js_path(){}
protected static abstract function css_path(); protected static function css_path(){}
} }

View File

@ -31,7 +31,7 @@ class default_page extends \SYSTEM\PAGE\Page {
throw new \SYSTEM\LOG\ERROR('Your SAI-Start-Module haz a Problem - either it does not exist or it is not public - which is required!');} throw new \SYSTEM\LOG\ERROR('Your SAI-Start-Module haz a Problem - either it does not exist or it is not public - which is required!');}
private static function css(){ private static function css(){
$result = '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/libs/bootstrap.min.css').'" type="text/css" />'. $result = '<link rel="stylesheet" href="'.\LIB\lib_bootstrap::css().'" type="text/css" />'.
'<link rel="stylesheet" href="./sai.php?call=files&amp;cat=sys&amp;id=system.css" type="text/css" />'. '<link rel="stylesheet" href="./sai.php?call=files&amp;cat=sys&amp;id=system.css" type="text/css" />'.
'<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai_classes.css').'" type="text/css" />'. '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai_classes.css').'" type="text/css" />'.
'<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai.css').'" type="text/css" />'; '<link rel="stylesheet" href="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/css/sai.css').'" type="text/css" />';
@ -39,13 +39,15 @@ class default_page extends \SYSTEM\PAGE\Page {
} }
private static function js(){ private static function js(){
$result = '<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/js/libs/jquery.min.js').'" type="text/javascript"></script>'. $result = '<script src="'.\LIB\lib_jquery::js().'" type="text/javascript"></script>'.
'<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/js/libs/bootstrap.min.js').'" type="text/javascript"></script>'. '<script src="'.\LIB\lib_bootstrap::js().'" type="text/javascript"></script>'.
'<script src="'.\LIB\lib_tablesort::js().'" type="text/javascript"></script>'.
'<script type="text/javascript" language="JavaScript" src="./sai.php?call=files&amp;cat=sys&amp;id=system.js"></script>'. '<script type="text/javascript" language="JavaScript" src="./sai.php?call=files&amp;cat=sys&amp;id=system.js"></script>'.
'<script src="'.\LIB\lib_tablesort::js().'" type="text/javascript"></script>'.
'<script src="'.\LIB\lib_tablesort_numeric::js().'" type="text/javascript"></script>'.
'<script src="'.\LIB\lib_tablesort_date::js().'" type="text/javascript"></script>'.
'<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/js/sai.js').'" type="text/javascript"></script>'. '<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/js/sai.js').'" type="text/javascript"></script>'.
'<script src="https://www.google.com/jsapi" type="text/javascript"></script>'. '<script src="https://www.google.com/jsapi" type="text/javascript"></script>'.
'<script src="https://maps.google.com/maps/api/js?v=3&amp;sensor=false" type="text/javascript"></script>'. //'<script src="https://maps.google.com/maps/api/js?v=3&amp;sensor=false" type="text/javascript"></script>'.
'<script type="text/javascript">google.load("visualization", "1", {packages:["corechart"]});</script>'. '<script type="text/javascript">google.load("visualization", "1", {packages:["corechart"]});</script>'.
'<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tinymce/tinymce.min.js').'" type="text/javascript"></script>'; '<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_text/tinymce/tinymce.min.js').'" type="text/javascript"></script>';
return $result; return $result;

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -24,6 +24,11 @@ class PSAI extends PATH {
return C_ROOT.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL).'sai/'.C_SUBPATH;} return C_ROOT.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL).'sai/'.C_SUBPATH;}
} }
class PLIB extends PATH {
static public function getPath(){
return C_ROOT.\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL).'lib/'.C_SUBPATH;}
}
function SERVERPATH(\SYSTEM\PATH $basepath, $subpath = ''){ function SERVERPATH(\SYSTEM\PATH $basepath, $subpath = ''){
return str_replace( array(C_ROOT,C_SUBPATH), return str_replace( array(C_ROOT,C_SUBPATH),
array(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH),$subpath), array(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH),$subpath),