diff --git a/neopolimatrix/page/default_article/js/default_article.js b/neopolimatrix/page/default_article/js/default_article.js
index 596ab6e..c5b3502 100644
--- a/neopolimatrix/page/default_article/js/default_article.js
+++ b/neopolimatrix/page/default_article/js/default_article.js
@@ -1,4 +1,11 @@
function init_article(){
-
FB.XFBML.parse(document.body);
+ back();
+}
+
+function back(){
+ $('#backbtn').click(function(){
+ system.back();
+ });
+
}
\ No newline at end of file
diff --git a/neopolimatrix/page/default_article/tpl/element.tpl b/neopolimatrix/page/default_article/tpl/element.tpl
index f20d9c4..9b0f33d 100644
--- a/neopolimatrix/page/default_article/tpl/element.tpl
+++ b/neopolimatrix/page/default_article/tpl/element.tpl
@@ -1,12 +1,11 @@
-
+
Author: ${author}
-
${ago}
${title}
-
+
${deDE}
Veröffentlicht: ${published}
diff --git a/neopolimatrix/page/default_list/default_list.php b/neopolimatrix/page/default_list/default_list.php
index 8acf870..9953d90 100644
--- a/neopolimatrix/page/default_list/default_list.php
+++ b/neopolimatrix/page/default_list/default_list.php
@@ -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){
$etime = time() - $ptime;
if ($etime < 1){
@@ -66,7 +89,8 @@ class default_list extends \SYSTEM\PAGE\Page {
}
public function html(){
- $vars = array();
+ $vars = array();
+ $vars['title'] = $this->switch_list_title($this->filter);
$vars['list'] = $this->generate_list();
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/tpl/default_list.tpl'), $vars);
}
diff --git a/neopolimatrix/page/default_list/tpl/default_list.tpl b/neopolimatrix/page/default_list/tpl/default_list.tpl
index 08494bf..7dbbcb3 100644
--- a/neopolimatrix/page/default_list/tpl/default_list.tpl
+++ b/neopolimatrix/page/default_list/tpl/default_list.tpl
@@ -1 +1,2 @@
+
${title}
${list}
diff --git a/neopolimatrix/page/default_page/js/default_page.js b/neopolimatrix/page/default_page/js/default_page.js
index 5c015a5..0210f97 100644
--- a/neopolimatrix/page/default_page/js/default_page.js
+++ b/neopolimatrix/page/default_page/js/default_page.js
@@ -14,7 +14,6 @@ function impressum(){
function search(){
$("#nav_search_btn").click(function(){
- alert($('#nav_search').val());
$('#contentframe').load('./?page=search¶m='+$('#nav_search').val());
});
}
diff --git a/neopolimatrix/page/default_search/default_search.php b/neopolimatrix/page/default_search/default_search.php
index 945fe2e..5dbac20 100644
--- a/neopolimatrix/page/default_search/default_search.php
+++ b/neopolimatrix/page/default_search/default_search.php
@@ -6,7 +6,6 @@ class default_search extends \SYSTEM\PAGE\Page {
var $param = null;
public function __construct($param) {
- new SYSTEM\LOG\INFO($param);
$this->param = $param;
}
@@ -43,6 +42,7 @@ class default_search extends \SYSTEM\PAGE\Page {
public function html(){
$vars = array();
$vars['search'] = $this->generate_list();
+ $vars['title'] = $this->param;
$vars = array_merge($vars, \SYSTEM\locale::getStrings(101));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_search/tpl/search.tpl'), $vars);
}
diff --git a/neopolimatrix/page/default_search/tpl/search.tpl b/neopolimatrix/page/default_search/tpl/search.tpl
index e7e3138..ebb4a91 100644
--- a/neopolimatrix/page/default_search/tpl/search.tpl
+++ b/neopolimatrix/page/default_search/tpl/search.tpl
@@ -1 +1,2 @@
+
du hast gesucht nach: ${title}
${search}
\ No newline at end of file
diff --git a/system b/system
index 18a6cd5..dd3393b 160000
--- a/system
+++ b/system
@@ -1 +1 @@
-Subproject commit 18a6cd5cdfc2e6a1be71d0d1861c7a0775f3ea8d
+Subproject commit dd3393ba7c9c5f7df76cde3a00b11d6361d1e897