fixed search click on article, fully implemented state system, cleanup, removed double code

This commit is contained in:
Ulf Gebhardt 2015-09-06 04:43:33 +02:00
parent 82a512b074
commit 6b9daa6a16
16 changed files with 26 additions and 64 deletions

View File

@ -2,5 +2,4 @@
require_once dirname(__FILE__).'/path/autoload.inc';
require_once dirname(__FILE__).'/page/autoload.inc';
require_once dirname(__FILE__).'/files/autoload.inc';
require_once dirname(__FILE__).'/dbd/autoload.inc';
require_once dirname(__FILE__).'/api/autoload.inc';

View File

@ -1,3 +0,0 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/db/','DBD');
\SYSTEM\autoload::registerFolder(dirname(__FILE__).'/tbl/','DBD');

View File

@ -1,8 +0,0 @@
<?php
namespace DBD;
class smaLi extends \SYSTEM\DB\DBInfoMYS {
public function __construct() {
parent::__construct('DB1859981', 'U1859981', 'Dack3lbuT', 'rdbms.strato.de');}
}

View File

@ -1,9 +0,0 @@
<?php
namespace DBD;
class locale_string extends \SYSTEM\DBD\system_locale_string {
const VALUE_CATEGORY_MAINPAGE = 100;
}

View File

@ -0,0 +1,15 @@
<?php
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);
}
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);
}
}

View File

@ -0,0 +1,2 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');

View File

@ -1,4 +1,4 @@
<button class="btn btn-default" id="backbtn">zurück</button>
<button class="btn btn-default" onclick="system.back();">zurück</button>
<br>
<br>
<div class="list_element" text_id="${id}" style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px; text-align: justify;">
@ -13,5 +13,5 @@ ${text}
<br>
<br>
<br>
<div class="fb-comments" data-href="http://www.neopolimatrix.eu/#article;article.${id}" data-numposts="20" data-colorscheme="light"></div>
<div class="fb-comments" data-href="http://www.neopolimatrix.eu/#!article;article.${id}" data-numposts="20" data-colorscheme="light"></div>
</div>

View File

@ -1,7 +1,6 @@
<div class ="list_element" text_id="${id}" style="">
<div class="element_hover article" text_id="${id}" style="border-bottom: 1px black solid; text-align: justify;">
<div class ="list_element" onclick="system.load('article;article.${id}')">
<div class="element_hover article" style="border-bottom: 1px black solid; text-align: justify;">
<p style="float: left; font-size: 10pt; margin-top: 7px;">Author: <i>${author_name}</i></p>
<p style="float: right; font-size: 10pt; margin-top: 7px;">${ago}</p>
<div style="clear: both;"></div>
<div style="border-top: solid 1px black; width: 100%;"></div>

View File

@ -1,5 +1,6 @@
<?php
\SYSTEM\autoload::registerFolder(dirname(__FILE__),'');
require_once dirname(__FILE__).'/article/autoload.inc';
require_once dirname(__FILE__).'/default_page/autoload.inc';
require_once dirname(__FILE__).'/default_list/autoload.inc';
require_once dirname(__FILE__).'/default_article/autoload.inc';

View File

@ -7,12 +7,7 @@ class default_article extends \SYSTEM\PAGE\Page {
return array( \SYSTEM\WEBPATH(new PPAGE(),'default_article/js/default_article.js'));}
public function html(){
$vars = array();
$element = \SYSTEM\PAGE\text::get_adv($this->id);
$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']));
$vars['text'] = SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_article/tpl/element.tpl'), $element);
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('time'));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_article/tpl/default_article.tpl'), $vars);
return SYSTEM\PAGE\replace::replace(article::full($element), \SYSTEM\PAGE\text::tag('time'));
}
}

View File

@ -1,11 +1,3 @@
function init_article(){
FB.XFBML.parse(document.body);
back();
}
function back(){
$('#backbtn').click(function(){
system.back();
});
}

View File

@ -31,10 +31,7 @@ class default_list extends \SYSTEM\PAGE\Page {
$vars['list'] = '';
$elements = \SYSTEM\PAGE\text::tag_adv($this->tag ? $this->tag : 'neopolimatrix');
foreach($elements as $element){
$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']));
$vars['list'] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/tpl/element.tpl'), $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);
}

View File

@ -1,5 +1,2 @@
function init_start(){
$(".list_element").click(function(){
system.load('article;article.'+$(this).attr('text_id'));
});
function init_start(){
}

View File

@ -12,11 +12,7 @@ class default_search extends \SYSTEM\PAGE\Page {
$vars['search'] = '';
$elements = \SYSTEM\PAGE\text::search($this->param, 'neopolimatrix');
foreach($elements as $element){
$element['title'] = $element['id'];
$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']));
$vars['search'] .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_search/tpl/element.tpl'), $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);
}

View File

@ -1,10 +0,0 @@
<div style="width: 750px; margin: auto; margin-bottom: 50px; text-align: justify;">
<p style="float: left; font-size: 10pt; margin-top: 7px;">Author: <i>${author_name}</i></p>
<p style="float: right; font-size: 10pt; margin-top: 7px;">Veröffentlicht: ${ago}</p>
<div style="clear: both;"></div>
<div style="border-top: solid 1px black; width: 100%;"></div>
<h2>${title}</h2>
<br>
${text}
<br>
</div>