show tags for articles, updated system reference, fixed paths

This commit is contained in:
Ulf Gebhardt 2016-02-12 04:55:24 +01:00
parent c0971f55d4
commit 1e9c73dcb2
10 changed files with 36 additions and 34 deletions

@ -1 +1 @@
Subproject commit 2d9d242a297bab7aa0f16a5e726f37892776d924
Subproject commit e93c2b151422b99ee98b3d7bc3c6e4e12ad76793

View File

@ -3,13 +3,18 @@ class article {
public static function preview($element = array()){
$element['published'] = date_format(new DateTime($element['time_create']), 'H:i d-m-Y');
$element['ago'] = \SYSTEM\time::time_ago_string(strtotime($element['time_create']));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'article/tpl/preview.tpl'), $element);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('article/tpl/preview.tpl'))->SERVERPATH(), $element);
}
public static function full($element = array()) {
$element['published'] = date_format(new DateTime($element['time_create']), 'H:i d-m-Y');
$element['ago'] = \SYSTEM\time::time_ago_string(strtotime($element['time_create']));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'article/tpl/article.tpl'), $element);
public static function full($id) {
$vars = \SYSTEM\PAGE\text::get_adv($id);
$tags = \SYSTEM\PAGE\text::get_tags($id,7);
$vars['tags'] = '';
foreach($tags as $tag){
$vars['tags'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('article/tpl/tag.tpl'))->SERVERPATH(), $tag);}
$vars['published'] = date_format(new DateTime($vars['time_create']), 'H:i d-m-Y');
$vars['ago'] = \SYSTEM\time::time_ago_string(strtotime($vars['time_create']));
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('article/tpl/article.tpl'))->SERVERPATH(), $vars);
}
}

View File

@ -8,13 +8,10 @@
<div style="clear: both;"></div>
<div style="border-top: solid 1px black; width: 100%;"></div>
<h2>${id}</h2>
<h5>Tags: ${tags}</h5>
<br>
${text}
<p style="float: right; font-size: 10pt; margin-top: 7px;">Veröffentlicht: ${published}</p>
<br>
<br>
<br>
<div class="fb-comments" data-href="http://www.neopolimatrix.eu/#!article;article.${id}" data-numposts="20" data-colorscheme="light"></div>
</div>
<br>
<br>

View File

@ -0,0 +1 @@
<a href="#!start;tag.${tag}" style="padding-left: 10px;">${tag}</a>

View File

@ -5,7 +5,6 @@ class default_article extends \SYSTEM\PAGE\Page {
$this->id = $id;}
public function html(){
$element = \SYSTEM\PAGE\text::get_adv($this->id);
return SYSTEM\PAGE\replace::replace(article::full($element), \SYSTEM\PAGE\text::tag('time'));
return SYSTEM\PAGE\replace::replace(article::full($this->id), \SYSTEM\PAGE\text::tag('time'));
}
}

View File

@ -2,6 +2,6 @@
class default_impressum extends \SYSTEM\PAGE\Page {
public function html(){
$vars = \SYSTEM\PAGE\text::tag('webcraft');
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_impressum/tpl/impressum.tpl'), $vars);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_impressum/tpl/impressum.tpl'))->SERVERPATH(), $vars);
}
}

View File

@ -4,7 +4,7 @@ class default_list extends \SYSTEM\PAGE\Page {
public function __construct($tag = null) {
$this->tag = $tag;}
public static function js(){
return array( \SYSTEM\WEBPATH(new PPAGE(),'default_list/js/default_list.js'));}
return array( new PPAGE('default_list/js/default_list.js'));}
public function html(){
$vars = array();
@ -14,6 +14,6 @@ class default_list extends \SYSTEM\PAGE\Page {
foreach($elements as $element){
$vars['list'] .= article::preview($element);}
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('time'));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/tpl/default_list.tpl'), $vars);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_list/tpl/default_list.tpl'))->SERVERPATH(), $vars);
}
}
}

View File

@ -1,18 +1,18 @@
<?php
class default_page extends \SYSTEM\PAGE\Page {
private 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_system::js()->WEBPATH()).
\SYSTEM\HTML\html::script(\LIB\lib_jqbootstrapvalidation::js()->WEBPATH()).
\SYSTEM\HTML\html::script((new PPAGE('default_page/js/default_page.js'))->WEBPATH());
}
private 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()).
\SYSTEM\HTML\html::link(\LIB\lib_animate::css()->WEBPATH()).
\SYSTEM\HTML\html::link(\LIB\lib_system::css()->WEBPATH()).
\SYSTEM\HTML\html::link((new PPAGE('default_page/css/default_page.css'))->WEBPATH());
}
public function html($_escaped_fragment_ = NULL){
@ -21,11 +21,11 @@ class default_page extends \SYSTEM\PAGE\Page {
if(!$_escaped_fragment_){
$vars['js'] = $this->js();}
$vars['css'] = $this->css();
$vars['content_header'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_header.tpl'));
$vars['content_menu'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_menu.tpl'));
$vars['content'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content.tpl'));
$vars['content_footer'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/content_footer.tpl'));
$vars['content_header'] = \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/content_header.tpl'))->SERVERPATH());
$vars['content_menu'] = \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/content_menu.tpl'))->SERVERPATH());
$vars['content'] = \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/content.tpl'))->SERVERPATH());
$vars['content_footer'] = \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/content_footer.tpl'))->SERVERPATH());
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('meta'));
return \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/tpl/default_page.tpl'), $vars);
return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/default_page.tpl'))->SERVERPATH(), $vars);
}
}

View File

@ -12,6 +12,6 @@ class default_search extends \SYSTEM\PAGE\Page {
foreach($elements as $element){
$vars['search'] .= article::preview($element);}
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('time'));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_search/tpl/search.tpl'), $vars);
return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_search/tpl/search.tpl'))->SERVERPATH(), $vars);
}
}

View File

@ -3,8 +3,8 @@ namespace SQL;
class DATA_YEMINY extends \SYSTEM\DB\QI {
public static function get_class(){return \get_class();}
public static function files_mysql(){
return array( \SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_api.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_page.sql'),
\SYSTEM\SERVERPATH(new \PSQL(),'/mysql/system_text.sql'));
return array( (new \PSQL('/mysql/system_api.sql'))->SERVERPATH(),
(new \PSQL('/mysql/system_page.sql'))->SERVERPATH(),
(new \PSQL('/mysql/system_text.sql'))->SERVERPATH());
}
}