From 36bac040b2a1943c8c09a10f20ee0d145f72d26c Mon Sep 17 00:00:00 2001
From: Naeltard <t.rechel@gmx.de>
Date: Thu, 2 Apr 2015 00:43:24 +0200
Subject: [PATCH] moved bootstrap into lib folder

---
 .../bootstrap/css/bootstrap-responsive.css          |   0
 .../bootstrap/css/bootstrap-responsive.min.css      |   0
 .../lib => lib}/bootstrap/css/bootstrap-theme.css   |   0
 .../bootstrap/css/bootstrap-theme.css.map           |   0
 .../bootstrap/css/bootstrap-theme.min.css           |   0
 {slingit/lib => lib}/bootstrap/css/bootstrap.css    |   0
 .../lib => lib}/bootstrap/css/bootstrap.css.map     |   0
 .../lib => lib}/bootstrap/css/bootstrap.min.css     |   0
 .../fonts/glyphicons-halflings-regular.eot          | Bin
 .../fonts/glyphicons-halflings-regular.svg          |   0
 .../fonts/glyphicons-halflings-regular.ttf          | Bin
 .../fonts/glyphicons-halflings-regular.woff         | Bin
 .../bootstrap/img/glyphicons-halflings-white.png    | Bin
 .../bootstrap/img/glyphicons-halflings.png          | Bin
 {slingit/lib => lib}/bootstrap/js/bootstrap.js      |   0
 {slingit/lib => lib}/bootstrap/js/bootstrap.min.js  |   0
 .../lib => lib}/bootstrap/js/jquery-1.9.1.min.js    |   0
 slingit/page/default_page/default_page.php          |  10 +++++-----
 slingit/page/default_page/js/default_page.js        |   1 -
 19 files changed, 5 insertions(+), 6 deletions(-)
 rename {slingit/lib => lib}/bootstrap/css/bootstrap-responsive.css (100%)
 rename {slingit/lib => lib}/bootstrap/css/bootstrap-responsive.min.css (100%)
 rename {slingit/lib => lib}/bootstrap/css/bootstrap-theme.css (100%)
 rename {slingit/lib => lib}/bootstrap/css/bootstrap-theme.css.map (100%)
 rename {slingit/lib => lib}/bootstrap/css/bootstrap-theme.min.css (100%)
 rename {slingit/lib => lib}/bootstrap/css/bootstrap.css (100%)
 rename {slingit/lib => lib}/bootstrap/css/bootstrap.css.map (100%)
 rename {slingit/lib => lib}/bootstrap/css/bootstrap.min.css (100%)
 rename {slingit/lib => lib}/bootstrap/fonts/glyphicons-halflings-regular.eot (100%)
 rename {slingit/lib => lib}/bootstrap/fonts/glyphicons-halflings-regular.svg (100%)
 rename {slingit/lib => lib}/bootstrap/fonts/glyphicons-halflings-regular.ttf (100%)
 rename {slingit/lib => lib}/bootstrap/fonts/glyphicons-halflings-regular.woff (100%)
 rename {slingit/lib => lib}/bootstrap/img/glyphicons-halflings-white.png (100%)
 rename {slingit/lib => lib}/bootstrap/img/glyphicons-halflings.png (100%)
 rename {slingit/lib => lib}/bootstrap/js/bootstrap.js (100%)
 rename {slingit/lib => lib}/bootstrap/js/bootstrap.min.js (100%)
 rename {slingit/lib => lib}/bootstrap/js/jquery-1.9.1.min.js (100%)

diff --git a/slingit/lib/bootstrap/css/bootstrap-responsive.css b/lib/bootstrap/css/bootstrap-responsive.css
similarity index 100%
rename from slingit/lib/bootstrap/css/bootstrap-responsive.css
rename to lib/bootstrap/css/bootstrap-responsive.css
diff --git a/slingit/lib/bootstrap/css/bootstrap-responsive.min.css b/lib/bootstrap/css/bootstrap-responsive.min.css
similarity index 100%
rename from slingit/lib/bootstrap/css/bootstrap-responsive.min.css
rename to lib/bootstrap/css/bootstrap-responsive.min.css
diff --git a/slingit/lib/bootstrap/css/bootstrap-theme.css b/lib/bootstrap/css/bootstrap-theme.css
similarity index 100%
rename from slingit/lib/bootstrap/css/bootstrap-theme.css
rename to lib/bootstrap/css/bootstrap-theme.css
diff --git a/slingit/lib/bootstrap/css/bootstrap-theme.css.map b/lib/bootstrap/css/bootstrap-theme.css.map
similarity index 100%
rename from slingit/lib/bootstrap/css/bootstrap-theme.css.map
rename to lib/bootstrap/css/bootstrap-theme.css.map
diff --git a/slingit/lib/bootstrap/css/bootstrap-theme.min.css b/lib/bootstrap/css/bootstrap-theme.min.css
similarity index 100%
rename from slingit/lib/bootstrap/css/bootstrap-theme.min.css
rename to lib/bootstrap/css/bootstrap-theme.min.css
diff --git a/slingit/lib/bootstrap/css/bootstrap.css b/lib/bootstrap/css/bootstrap.css
similarity index 100%
rename from slingit/lib/bootstrap/css/bootstrap.css
rename to lib/bootstrap/css/bootstrap.css
diff --git a/slingit/lib/bootstrap/css/bootstrap.css.map b/lib/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from slingit/lib/bootstrap/css/bootstrap.css.map
rename to lib/bootstrap/css/bootstrap.css.map
diff --git a/slingit/lib/bootstrap/css/bootstrap.min.css b/lib/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from slingit/lib/bootstrap/css/bootstrap.min.css
rename to lib/bootstrap/css/bootstrap.min.css
diff --git a/slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.eot b/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to lib/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.svg b/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to lib/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf b/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.woff b/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from slingit/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to lib/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/slingit/lib/bootstrap/img/glyphicons-halflings-white.png b/lib/bootstrap/img/glyphicons-halflings-white.png
similarity index 100%
rename from slingit/lib/bootstrap/img/glyphicons-halflings-white.png
rename to lib/bootstrap/img/glyphicons-halflings-white.png
diff --git a/slingit/lib/bootstrap/img/glyphicons-halflings.png b/lib/bootstrap/img/glyphicons-halflings.png
similarity index 100%
rename from slingit/lib/bootstrap/img/glyphicons-halflings.png
rename to lib/bootstrap/img/glyphicons-halflings.png
diff --git a/slingit/lib/bootstrap/js/bootstrap.js b/lib/bootstrap/js/bootstrap.js
similarity index 100%
rename from slingit/lib/bootstrap/js/bootstrap.js
rename to lib/bootstrap/js/bootstrap.js
diff --git a/slingit/lib/bootstrap/js/bootstrap.min.js b/lib/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from slingit/lib/bootstrap/js/bootstrap.min.js
rename to lib/bootstrap/js/bootstrap.min.js
diff --git a/slingit/lib/bootstrap/js/jquery-1.9.1.min.js b/lib/bootstrap/js/jquery-1.9.1.min.js
similarity index 100%
rename from slingit/lib/bootstrap/js/jquery-1.9.1.min.js
rename to lib/bootstrap/js/jquery-1.9.1.min.js
diff --git a/slingit/page/default_page/default_page.php b/slingit/page/default_page/default_page.php
index c2f5397..d003cef 100644
--- a/slingit/page/default_page/default_page.php
+++ b/slingit/page/default_page/default_page.php
@@ -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(){
diff --git a/slingit/page/default_page/js/default_page.js b/slingit/page/default_page/js/default_page.js
index 7f322ea..fb963ae 100644
--- a/slingit/page/default_page/js/default_page.js
+++ b/slingit/page/default_page/js/default_page.js
@@ -1,4 +1,3 @@
 $(document).ready(function() {
       new SYSTEM('./api.php',1,'start');
-      init_start();
 });
\ No newline at end of file