deleted old js files in sai, included bootstrap submodule, libframework fixes
This commit is contained in:
parent
f12eeec1ec
commit
5aed4de7f8
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -1,3 +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
|
||||
|
||||
@ -2,4 +2,5 @@
|
||||
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'LIB');
|
||||
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__).'/tablesort/autoload.inc';
|
||||
require_once dirname(__FILE__).'/bootstrap/autoload.inc';
|
||||
1
lib/bootstrap
Submodule
1
lib/bootstrap
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 7ec24da73d3de379567f8cf27f4c5e860b1a724a
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
namespace LIB;
|
||||
abstract class lib_jscss extends lib{
|
||||
protected static abstract function js_path();
|
||||
protected static abstract function css_path();
|
||||
protected static function js_path(){}
|
||||
protected static function css_path(){}
|
||||
}
|
||||
@ -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!');}
|
||||
|
||||
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&cat=sys&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.css').'" type="text/css" />';
|
||||
@ -39,13 +39,15 @@ 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>'.
|
||||
'<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>'.
|
||||
$result = '<script src="'.\LIB\lib_jquery::js().'" type="text/javascript"></script>'.
|
||||
'<script src="'.\LIB\lib_bootstrap::js().'" type="text/javascript"></script>'.
|
||||
'<script type="text/javascript" language="JavaScript" src="./sai.php?call=files&cat=sys&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="https://www.google.com/jsapi" type="text/javascript"></script>'.
|
||||
'<script src="https://maps.google.com/maps/api/js?v=3&sensor=false" type="text/javascript"></script>'.
|
||||
//'<script src="https://maps.google.com/maps/api/js?v=3&sensor=false" type="text/javascript"></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>';
|
||||
return $result;
|
||||
|
||||
2
sai/page/js/libs/_jquery.min.js
vendored
2
sai/page/js/libs/_jquery.min.js
vendored
File diff suppressed because one or more lines are too long
1951
sai/page/js/libs/bootstrap.js
vendored
1951
sai/page/js/libs/bootstrap.js
vendored
File diff suppressed because it is too large
Load Diff
6
sai/page/js/libs/bootstrap.min.js
vendored
6
sai/page/js/libs/bootstrap.min.js
vendored
File diff suppressed because one or more lines are too long
5
sai/page/js/libs/jquery-1.9.1.min.js
vendored
5
sai/page/js/libs/jquery-1.9.1.min.js
vendored
File diff suppressed because one or more lines are too long
4
sai/page/js/libs/jquery-2.1.4.min.js
vendored
4
sai/page/js/libs/jquery-2.1.4.min.js
vendored
File diff suppressed because one or more lines are too long
4
sai/page/js/libs/jquery.min.js
vendored
4
sai/page/js/libs/jquery.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user