included lib_jquery

This commit is contained in:
Ulf Gebhardt 2015-06-08 14:01:35 +02:00
parent 77963fec91
commit f12eeec1ec
5 changed files with 14 additions and 2 deletions

3
.gitmodules vendored Normal file
View File

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

View File

@ -1,3 +1,5 @@
<?php
\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';

1
lib/jquery Submodule

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

View File

@ -39,7 +39,8 @@ class default_page extends \SYSTEM\PAGE\Page {
}
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="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/js/libs/jquery.min.js').'" type="text/javascript"></script>'.
'<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 type="text/javascript" language="JavaScript" src="./sai.php?call=files&amp;cat=sys&amp;id=system.js"></script>'.
'<script src="'.\SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/js/sai.js').'" type="text/javascript"></script>'.

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;}
}
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 = ''){
return str_replace( array(C_ROOT,C_SUBPATH),
array(\SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEPATH),$subpath),