diff --git a/.htaccess b/.htaccess index 3f78c44..b64f5d0 100644 --- a/.htaccess +++ b/.htaccess @@ -1,3 +1,6 @@ RewriteEngine On -RewriteCond %{HTTP_HOST} !^www\.yeminy\.org [NC] -RewriteRule ^(.*)$ http://www.yeminy.org/$1 [R=301,L] \ No newline at end of file +RewriteRule ^(.*)/fonts/fontawesome-webfont(.*)$ lib/system/lib/font_awesome/lib/fonts/fontawesome-webfont$2 [L] +RewriteRule ^sai$ sai.php$1 [L] + +RewriteRule ^(.*)/files/([^/]+)/([^/]+)$ api.php?call=files&cat=$2&id=$3 [L] +RewriteRule ^cache/([^/]+)/([^/]+)$ api.php?call=cache&id=$1&ident=$2 [L] \ No newline at end of file diff --git a/api.php b/api.php index de2e785..4c0a2d9 100644 --- a/api.php +++ b/api.php @@ -1,9 +1,5 @@ html(); \ No newline at end of file +echo (new SYSTEM\SAI\sai_gui())->html(); \ No newline at end of file diff --git a/setup.php b/setup.php index 6d926bc..8636f5e 100644 --- a/setup.php +++ b/setup.php @@ -1,8 +1,4 @@ id = $id;} + + public static function title(){ + return null;} + public static function meta(){ + return array();} + + public static function js(){ + return array();} + public static function css(){ + return array();} public function html(){ return SYSTEM\PAGE\replace::replace(article::full($this->id), \SYSTEM\PAGE\text::tag('time')); diff --git a/yeminy/page/default_impressum/default_impressum.php b/yeminy/page/default_impressum/default_impressum.php index ea01ff4..9a33aee 100644 --- a/yeminy/page/default_impressum/default_impressum.php +++ b/yeminy/page/default_impressum/default_impressum.php @@ -1,5 +1,13 @@ SERVERPATH(), $vars); diff --git a/yeminy/page/default_list/default_list.php b/yeminy/page/default_list/default_list.php index 9d80403..a205edf 100644 --- a/yeminy/page/default_list/default_list.php +++ b/yeminy/page/default_list/default_list.php @@ -1,11 +1,23 @@ tag = $tag;} + + public static function title(){ + return null; + } + public static function meta(){ + return array(); + } + public static function js(){ return array( new PPAGE('default_list/js/default_list.js'));} + public static function css(){ + return array(); + } + public function html(){ $vars = array(); $vars['title'] = $this->tag ? ucfirst($this->tag) : 'Neuheiten'; diff --git a/yeminy/page/default_page/default_page.php b/yeminy/page/default_page/default_page.php index d1f8370..5ea75de 100644 --- a/yeminy/page/default_page/default_page.php +++ b/yeminy/page/default_page/default_page.php @@ -1,6 +1,6 @@ WEBPATH()). \SYSTEM\HTML\html::script(\LIB\lib_bootstrap::js()->WEBPATH()). \SYSTEM\HTML\html::script(\LIB\lib_system::js()->WEBPATH()). @@ -8,7 +8,7 @@ class default_page extends \SYSTEM\PAGE\Page { \SYSTEM\HTML\html::script((new PPAGE('default_page/js/default_page.js'))->WEBPATH()); } - private function css(){ + public static function css(){ return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH()). \SYSTEM\HTML\html::link(\LIB\lib_animate::css()->WEBPATH()). \SYSTEM\HTML\html::link(\LIB\lib_system::css()->WEBPATH()).