webcraftmedia/slingit.org
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved bootstrap into lib folder

Browse Source
This commit is contained in:
Naeltard 2015-04-02 00:43:24 +02:00
parent 5b515c750b
commit 36bac040b2
19 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
slingit/lib/bootstrap/css/bootstrap-responsive.css → lib/bootstrap/css/bootstrap-responsive.css vendored
View File

0
slingit/lib/bootstrap/css/bootstrap-responsive.min.css → lib/bootstrap/css/bootstrap-responsive.min.css vendored
View File

0
slingit/lib/bootstrap/css/bootstrap-theme.css → lib/bootstrap/css/bootstrap-theme.css vendored
View File

0
slingit/lib/bootstrap/css/bootstrap-theme.css.map → lib/bootstrap/css/bootstrap-theme.css.map
View File

0
slingit/lib/bootstrap/css/bootstrap-theme.min.css → lib/bootstrap/css/bootstrap-theme.min.css vendored
View File

0
slingit/lib/bootstrap/css/bootstrap.css → lib/bootstrap/css/bootstrap.css vendored
View File

0
slingit/lib/bootstrap/css/bootstrap.css.map → lib/bootstrap/css/bootstrap.css.map
View File

0
slingit/lib/bootstrap/css/bootstrap.min.css → lib/bootstrap/css/bootstrap.min.css vendored
View File

0
slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.eot → lib/bootstrap/fonts/glyphicons-halflings-regular.eot
View File

0
slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.svg → lib/bootstrap/fonts/glyphicons-halflings-regular.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

0
slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf → lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
View File

0
slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.woff → lib/bootstrap/fonts/glyphicons-halflings-regular.woff
View File

0
slingit/lib/bootstrap/img/glyphicons-halflings-white.png → lib/bootstrap/img/glyphicons-halflings-white.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.6 KiB

After

Width:  |  Height:  |  Size: 8.6 KiB

0
slingit/lib/bootstrap/img/glyphicons-halflings.png → lib/bootstrap/img/glyphicons-halflings.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

0
slingit/lib/bootstrap/js/bootstrap.js → lib/bootstrap/js/bootstrap.js vendored
View File

0
slingit/lib/bootstrap/js/bootstrap.min.js → lib/bootstrap/js/bootstrap.min.js vendored
View File

0
slingit/lib/bootstrap/js/jquery-1.9.1.min.js → lib/bootstrap/js/jquery-1.9.1.min.js vendored
View File

10
slingit/page/default_page/default_page.php
View File

@ -2,7 +2,7 @@
class default_page extends \SYSTEM\PAGE\Page {
private function js(){
return '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'jquery/jquery-1.9.1.min.js').'"></script>'.
//'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/js/bootstrap.min.js').'"></script>'.
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/js/bootstrap.min.js').'"></script>'.
'<script src="'.SYSTEM\WEBPATH(new PLIB(),'webtorrent/webtorrent.min.js').'"></script>'.
//'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'jqbootstrapvalidation/jqBootstrapValidation.js').'"></script>'.
//'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PLIB(),'hashmask/jquery.md5.js').'"></script>'.
@ -13,10 +13,10 @@ class default_page extends \SYSTEM\PAGE\Page {
}
private function css(){
return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/default_page.css').'" rel="stylesheet">';
//'<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap.min.css').'" rel="stylesheet">'.
//'<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap-theme.min.css').'" rel="stylesheet">'.
//'<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap-responsive.min.css').'" rel="stylesheet">';
return '<link href="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/css/default_page.css').'" rel="stylesheet">'.
'<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap.min.css').'" rel="stylesheet">'.
'<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap-theme.min.css').'" rel="stylesheet">'.
'<link href="'.SYSTEM\WEBPATH(new PLIB(),'bootstrap/css/bootstrap-responsive.min.css').'" rel="stylesheet">';
}
public function html(){

1
slingit/page/default_page/js/default_page.js
View File

@ -1,4 +1,3 @@
$(document).ready(function() {
new SYSTEM('./api.php',1,'start');
init_start();
});