diff --git a/.htaccess b/.htaccess deleted file mode 100644 index 55d4aa4..0000000 --- a/.htaccess +++ /dev/null @@ -1,3 +0,0 @@ -RewriteEngine On -RewriteCond %{HTTP_HOST} !^www\.slingit\.org [NC] -RewriteRule ^(.*)$ http://www.slingit.org/$1 [R=301,L] \ No newline at end of file diff --git a/lib/system b/lib/system index 6d88b37..54aaf1a 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 6d88b37a4744b2b3dcadb2a86ad1afe74ef7f24d +Subproject commit 54aaf1a1d271300ab8a28fb46ccfa6f8b78ea20f diff --git a/lib/webtorrent b/lib/webtorrent index 07f0685..46b3655 160000 --- a/lib/webtorrent +++ b/lib/webtorrent @@ -1 +1 @@ -Subproject commit 07f0685cbf3ec8a4ddcb9ebac7b8f4343d6787e8 +Subproject commit 46b3655927eefb4a18fbbfd547013863ccdaed4b diff --git a/nbproject/project.properties b/nbproject/project.properties index 368ab2f..058a09d 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,4 +1,5 @@ auxiliary.org-netbeans-modules-php-smarty.smarty-framework=true +browser.reload.on.save=true include.path=${php.global.include.path} php.version=PHP_55 source.encoding=UTF-8 diff --git a/slingit/page/autoload.inc b/slingit/page/autoload.inc index 01b097d..80a8ecb 100644 --- a/slingit/page/autoload.inc +++ b/slingit/page/autoload.inc @@ -1,8 +1,6 @@ SERVERPATH(), $vars); } public static function js(){ - return array( \SYSTEM\WEBPATH(new PPAGE(),'default_about/js/default_about.js')); - } + return array(new PPAGE('default_about/js/default_about.js'));} + public static function css(){return array();} } \ No newline at end of file diff --git a/slingit/page/default_impressum/default_impressum.php b/slingit/page/default_impressum/default_impressum.php index aa38337..1882798 100644 --- a/slingit/page/default_impressum/default_impressum.php +++ b/slingit/page/default_impressum/default_impressum.php @@ -1,11 +1,15 @@ SERVERPATH(), $vars); } public static function js(){ - return array( \SYSTEM\WEBPATH(new PPAGE(),'default_impressum/js/default_impressum.js')); - } + return array(new PPAGE('default_impressum/js/default_impressum.js'));} + public static function css(){return array();} } \ No newline at end of file diff --git a/slingit/page/default_page/css/default_page.css b/slingit/page/default_page/css/default_page.css index 5785c3f..ea9104e 100644 --- a/slingit/page/default_page/css/default_page.css +++ b/slingit/page/default_page/css/default_page.css @@ -7,9 +7,6 @@ body{} margin: auto; margin-top: 15px; margin-bottom: 15px; - - background: url(http://www.slingit.org/api.php?call=files&cat=img&id=headbanner.png) no-repeat; - background-size: contain; } #content { diff --git a/slingit/page/default_page/default_page.php b/slingit/page/default_page/default_page.php index 8b56892..9ac4f88 100644 --- a/slingit/page/default_page/default_page.php +++ b/slingit/page/default_page/default_page.php @@ -1,16 +1,16 @@ WEBPATH()). + \SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()). + \SYSTEM\HTML\html::script((new \PLIB('webtorrent/webtorrent.min.js'))->WEBPATH()). + \SYSTEM\HTML\html::script(\LIB\lib_system::js()->WEBPATH()). + \SYSTEM\HTML\html::script((new \PPAGE('default_page/js/default_page.js'))->WEBPATH()); } - private static function css(){ - return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()). - \SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new \PPAGE(),'default_page/css/default_page.css')); + public static function css(){ + return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)). + \SYSTEM\HTML\html::link((new \PPAGE('default_page/css/default_page.css'))->WEBPATH()); } public function html($_escaped_fragment_ = null){ @@ -19,7 +19,7 @@ class default_page extends \SYSTEM\PAGE\Page { if(!$_escaped_fragment_){ $vars['js'] = self::js();} $vars['css'] = self::css(); - $vars['langswitcher'] = \SYSTEM\SAI\saimod_sys_langswitcher::lang_menu(); - return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new \PPAGE(),'default_page/tpl/default_page.tpl'), $vars); + $vars['langswitcher'] = \SYSTEM\SAI\default_page::lang_menu(); + return \SYSTEM\PAGE\replace::replaceFile((new \PPAGE('default_page/tpl/default_page.tpl'))->SERVERPATH(), $vars); } } \ No newline at end of file diff --git a/slingit/page/default_page/tpl/default_page.tpl b/slingit/page/default_page/tpl/default_page.tpl index 8987e90..6327da7 100644 --- a/slingit/page/default_page/tpl/default_page.tpl +++ b/slingit/page/default_page/tpl/default_page.tpl @@ -7,9 +7,15 @@ SlingiT + ${css} ${js} - +