updated system reference, fixed paths to fix systems new standart

This commit is contained in:
Naeltard 2016-01-31 01:53:05 +01:00
parent 8088166c0b
commit 1b8575ca06
23 changed files with 40 additions and 9654 deletions

@ -1 +1 @@
Subproject commit 94cf44f3054fdc8369242c4fda318d1282193d64
Subproject commit ad53e4e2a10f0ac23735c55c09be1fed1f3dd471

View File

@ -9,7 +9,7 @@ auxiliary.org-netbeans-modules-php-smarty.smarty-framework=true
ignore.path=
include.path=\
${php.global.include.path}
php.version=PHP_53
php.version=PHP_55
source.encoding=UTF-8
src.dir=.
tags.asp=false

View File

@ -1,6 +0,0 @@
<?php
//SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/','DBD');
SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl/','DBD');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA');
//$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED');

View File

@ -1,6 +0,0 @@
<?php
namespace DBD;
class locale_string extends \SYSTEM\DBD\system_locale_string {
const CATEGORY_REDESTOFF_TEXT = 43;
}

View File

@ -2,7 +2,7 @@
class default_artist extends \SYSTEM\PAGE\Page {
var $id = null;
public static function js(){
return array(\SYSTEM\WEBPATH(new PPAGE(),'default_artist/js/default_artist.js'));}
return array(new PPAGE('default_artist/js/default_artist.js'));}
public function __construct($id) {
$this->id = $id;}
@ -15,7 +15,7 @@ class default_artist extends \SYSTEM\PAGE\Page {
$element['artist_releases'] = \SYSTEM\PAGE\text::get($this->id.'_releases');
$element['artist_fb'] = \SYSTEM\PAGE\text::get($this->id.'_fb');
$element['artist_additional'] = \SYSTEM\PAGE\text::get($this->id.'_additional');
$element['IMG_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/img/');
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_artist/tpl/artist.tpl'), $element);
$element['IMG_PATH'] = (new PPAGE('default_page/img/'))->WEBPATH(false);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_artist/tpl/artist.tpl'))->SERVERPATH(), $element);
}
}

View File

@ -1,19 +1,8 @@
<?php
class default_download extends SYSTEM\PAGE\Page {
private function js(){
return '<script type="text/javascript" language="JavaScript" src="http://code.jquery.com/jquery.js"></script>'.
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/default_page.js').'"></script>';
}
public function html($_escaped_fragment_ = NULL){
public function html(){
$vars = array();
$vars['js'] = '';
if(!$_escaped_fragment_){
$vars['js'] = $this->js();}
$vars['IMG_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/img/');
$vars['BT_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/bootstrap/');
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_download/tpl/download.tpl'), $vars);
$vars['IMG_PATH'] = (new PPAGE('default_page/img/'))->WEBPATH(false);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_download/tpl/download.tpl'))->SERVERPATH(), $vars);
}
}

View File

@ -1,10 +1,7 @@
<?php
class default_impressum extends SYSTEM\PAGE\Page {
public function html() {
$vars["redestoff_impressum"] = \SYSTEM\PAGE\text::get('impressum');
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_impressum/impressum.tpl'), $vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_impressum/impressum.tpl'))->SERVERPATH(), $vars);
}
}

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2,17 +2,21 @@
class default_page extends SYSTEM\PAGE\Page {
private static function css(){
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()).
\SYSTEM\HTML\html::link(\LIB\lib_animate::css()).
\SYSTEM\HTML\html::link(\LIB\lib_system::css()).
\SYSTEM\HTML\html::link(\SYSTEM\WEBPATH(new PPAGE(),'default_page/css/default_page.css'));
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)).
//\SYSTEM\HTML\html::link(\LIB\lib_animate::css()->WEBPATH()).
\SYSTEM\HTML\html::link(\LIB\lib_font_awesome::css()->WEBPATH(false)).
\SYSTEM\HTML\html::link(\SYSTEM\CACHE\cache_css::url(
array( \LIB\lib_system::css(),
new PPAGE('default_page/css/default_page.css')
)));
}
private static function js(){
return \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()).
\SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()).
\SYSTEM\HTML\html::script(\LIB\lib_system::js()).
\SYSTEM\HTML\html::script(\LIB\lib_jqbootstrapvalidation::js()).
\SYSTEM\HTML\html::script(\SYSTEM\WEBPATH(new PPAGE(),'default_page/js/default_page.js'));
return \SYSTEM\HTML\html::script(\LIB\lib_jquery::js()->WEBPATH()).
\SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()).
\SYSTEM\HTML\html::script(\LIB\lib_jqbootstrapvalidation::js()->WEBPATH()).
\SYSTEM\HTML\html::script(\SYSTEM\CACHE\cache_js::url(
array( \LIB\lib_system::js(),
new PPAGE('default_page/js/default_page.js'))));
}
@ -20,8 +24,7 @@ class default_page extends SYSTEM\PAGE\Page {
$vars = array();
$vars['css'] = self::css();
$vars['js'] = $_escaped_fragment_ ? '' : self::js();
$vars['IMG_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/img/');
$vars['BT_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/bootstrap/');
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/redestoff.tpl'), $vars);
$vars['IMG_PATH'] = (new PPAGE('default_page/img/'))->WEBPATH(false);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/redestoff.tpl'))->SERVERPATH(), $vars);
}
}

View File

@ -4,10 +4,8 @@
<title>redestoff</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="utf-8">
<link href="${BT_PATH}css/bootstrap.min.css" rel="stylesheet" media="screen">
${css}
${js}
</head>
<body style="background: url(${IMG_PATH}new_bg.gif)no-repeat; background-size: cover; background-attachment: fixed">
<div id="fb-root"></div>

View File

@ -1,19 +1,8 @@
<?php
class default_shop extends SYSTEM\PAGE\Page {
private function js(){
return '<script type="text/javascript" language="JavaScript" src="http://code.jquery.com/jquery.js"></script>'.
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/default_page.js').'"></script>';
}
public function html($_escaped_fragment_ = NULL){
public function html(){
$vars = array();
$vars['js'] = '';
if(!$_escaped_fragment_){
$vars['js'] = $this->js();}
$vars['IMG_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/img/');
$vars['BT_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/bootstrap/');
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_shop/tpl/shop.tpl'), $vars);
$vars['IMG_PATH'] = (new PPAGE('default_page/img/'))->WEBPATH(false);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_shop/tpl/shop.tpl'))->SERVERPATH(), $vars);
}
}

View File

@ -3,11 +3,10 @@
class default_start extends SYSTEM\PAGE\Page {
public static function js(){
return array( \SYSTEM\WEBPATH(new PPAGE(),'default_start/js/default_start.js'));}
return array( new PPAGE('default_start/js/default_start.js'));}
public function html(){
$vars = array();
$vars['IMG_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/img/');
$vars['BT_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/bootstrap/');
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/start.tpl'), $vars);
$vars['IMG_PATH'] = (new PPAGE('default_page/img/'))->WEBPATH(false);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_start/tpl/start.tpl'))->SERVERPATH(), $vars);
}
}

View File

@ -1,19 +1,9 @@
<?php
class default_videos extends SYSTEM\PAGE\Page {
private function js(){
return '<script type="text/javascript" language="JavaScript" src="http://code.jquery.com/jquery.js"></script>'.
'<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/default_page.js').'"></script>';
}
public function html($_escaped_fragment_ = NULL){
public function html(){
$vars = array();
$vars['js'] = '';
if(!$_escaped_fragment_){
$vars['js'] = $this->js();}
$vars['IMG_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/img/');
$vars['BT_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/bootstrap/');
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_videos/tpl/videos.tpl'), $vars);
$vars['IMG_PATH'] = (new PPAGE('default_page/img/'))->WEBPATH(false);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_videos/tpl/videos.tpl'))->SERVERPATH(), $vars);
}
}

5
redestoff/path/PLIB.php Normal file
View File

@ -0,0 +1,5 @@
<?php
class PLIB extends \SYSTEM\PATH {
public function __construct($subpath = '') {
parent::__construct(new \SYSTEM\PROOT(), 'lib/', $subpath);}
}

View File

@ -1,5 +1,5 @@
<?php
class PPAGE extends \SYSTEM\PATH {
public static function getPath(){
return \SYSTEM\C_ROOT.'redestoff/page/'.\SYSTEM\C_SUBPATH;}
public function __construct($subpath = '') {
parent::__construct(new \SYSTEM\PROOT(), 'redestoff/page/', $subpath);}
}