neopolimatrix updated system reference, back buttons

This commit is contained in:
Naeltard 2015-01-27 01:06:09 +01:00
parent acc8e7d971
commit 9cac37ded0
8 changed files with 39 additions and 8 deletions

View File

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

View File

@ -1,12 +1,11 @@
<button class="btn btn-default">zurück</button><br><br> <button class="btn btn-default" id="backbtn">zurück</button><br><br>
<div class="list_element" text_id="${tag_id}" style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px;"> <div class="list_element" text_id="${tag_id}" style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px;">
<p style="float: left; font-size: 10pt; margin-top: 7px;">Author: <i>${author}</i></p> <p style="float: left; font-size: 10pt; margin-top: 7px;">Author: <i>${author}</i></p>
<p style="float: right; font-size: 10pt; margin-top: 7px;">${ago}</p> <p style="float: right; font-size: 10pt; margin-top: 7px;">${ago}</p>
<div style="clear: both;"></div> <div style="clear: both;"></div>
<div style="border-top: solid 1px black; width: 100%;"></div> <div style="border-top: solid 1px black; width: 100%;"></div>
<h2>${title}</h2> <h2>${title}</h2>
<br> <br>
${deDE} ${deDE}
<p style="float: right; font-size: 10pt; margin-top: 7px;">Veröffentlicht: ${published}</p> <p style="float: right; font-size: 10pt; margin-top: 7px;">Veröffentlicht: ${published}</p>
<br> <br>

View File

@ -32,6 +32,29 @@ class default_list extends \SYSTEM\PAGE\Page {
} }
private function switch_list_title($filter){
switch($filter){
case 1:
return 'Neuheiten - Hier erscheinen alle neuen Artikel auf dem Blog';
case 2:
return 'Überwachungsstaat';
case 3:
return 'Ungerechtigkeiten';
case 4:
return 'Filz und Vetternwirtschaft';
case 5:
return 'Dein Freund und Helfer';
case 6:
return 'Demokratie';
case 7:
return 'Foes of Freedom';
case 8:
return '';
default:
return '';}
}
private static function time_elapsed_string($ptime){ private static function time_elapsed_string($ptime){
$etime = time() - $ptime; $etime = time() - $ptime;
if ($etime < 1){ if ($etime < 1){
@ -66,7 +89,8 @@ class default_list extends \SYSTEM\PAGE\Page {
} }
public function html(){ public function html(){
$vars = array(); $vars = array();
$vars['title'] = $this->switch_list_title($this->filter);
$vars['list'] = $this->generate_list(); $vars['list'] = $this->generate_list();
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/tpl/default_list.tpl'), $vars); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/tpl/default_list.tpl'), $vars);
} }

View File

@ -1 +1,2 @@
<div style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px; text-align: left;"><h4>${title}</h4></div>
${list} ${list}

View File

@ -14,7 +14,6 @@ function impressum(){
function search(){ function search(){
$("#nav_search_btn").click(function(){ $("#nav_search_btn").click(function(){
alert($('#nav_search').val());
$('#contentframe').load('./?page=search&param='+$('#nav_search').val()); $('#contentframe').load('./?page=search&param='+$('#nav_search').val());
}); });
} }

View File

@ -6,7 +6,6 @@ class default_search extends \SYSTEM\PAGE\Page {
var $param = null; var $param = null;
public function __construct($param) { public function __construct($param) {
new SYSTEM\LOG\INFO($param);
$this->param = $param; $this->param = $param;
} }
@ -43,6 +42,7 @@ class default_search extends \SYSTEM\PAGE\Page {
public function html(){ public function html(){
$vars = array(); $vars = array();
$vars['search'] = $this->generate_list(); $vars['search'] = $this->generate_list();
$vars['title'] = $this->param;
$vars = array_merge($vars, \SYSTEM\locale::getStrings(101)); $vars = array_merge($vars, \SYSTEM\locale::getStrings(101));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_search/tpl/search.tpl'), $vars); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_search/tpl/search.tpl'), $vars);
} }

View File

@ -1 +1,2 @@
<div style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px; text-align: left;">du hast gesucht nach: ${title}</div>
${search} ${search}

2
system

@ -1 +1 @@
Subproject commit 18a6cd5cdfc2e6a1be71d0d1861c7a0775f3ea8d Subproject commit dd3393ba7c9c5f7df76cde3a00b11d6361d1e897