diff --git a/lib/system b/lib/system index 45543a4..ab1f4a6 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 45543a45b8bd0f6277edf66b66bf88e8dc29f086 +Subproject commit ab1f4a62e8c4653b8f0663e5c1f83ac4e8a423b3 diff --git a/neopolimatrix/page/default_page/js/default_page.js b/neopolimatrix/page/default_page/js/default_page.js index 0997a70..62123d4 100644 --- a/neopolimatrix/page/default_page/js/default_page.js +++ b/neopolimatrix/page/default_page/js/default_page.js @@ -7,14 +7,14 @@ $(document).ready(function() { function search(){ $("#nav_search_btn").click(function(){ - $('#contentframe').load('./?page=search¶m='+$('#nav_search').val()); + system.load('search;param.'+$('#nav_search').val()); }); $(document).keypress(function(e) { var hasFocus = $('#nav_search').is(':focus'); if(e.which === 13 && hasFocus) { - $('#contentframe').load('./?page=search¶m='+$('#nav_search').val()); - } -}); + system.load('search;param.'+$('#nav_search').val()); + } + }); } function tabs(){ @@ -22,26 +22,5 @@ function tabs(){ $('#tabs_user_list li').each(function(){ $(this).removeClass('active');}); $(this).parent().addClass('active'); - //system.load('start;filter.'+$(this).attr('filter')); - //btn_element(); }); -} - -/*function btn_element(){ - $(".list_element").click(function(){ - system.load('article;article.'+$(this).attr('text_id')) - //load_element($(this).attr('text_id')); - }); -} - -function load_element(text_id){ - $('#contentframe').load('./?page=get_element&text_id=' + text_id, function(){ - }); -} - - -function load_list(filter){ - $('#contentframe').load('./?page=get_list&filter=' + filter, function(){ - btn_element(); - }); -}*/ \ No newline at end of file +} \ No newline at end of file diff --git a/neopolimatrix/page/default_search/default_search.php b/neopolimatrix/page/default_search/default_search.php index 7564ec4..6debedd 100644 --- a/neopolimatrix/page/default_search/default_search.php +++ b/neopolimatrix/page/default_search/default_search.php @@ -8,15 +8,16 @@ class default_search extends \SYSTEM\PAGE\Page { public function html(){ $vars = array(); + $vars['title'] = $this->param; $vars['search'] = ''; - $elements = \DBD\NEOPOLIMATRIX_GENERATE_ELEMENTLIST_FULLTEXT_SEARCH::QA(array('%'.$this->param.'%','%'.$this->param.'%')); + $elements = \SYSTEM\PAGE\text::search($this->param, 'neopolimatrix'); foreach($elements as $element){ $element['title'] = $element['id']; - $element['published'] = date_format(new DateTime($element['timestamp']), 'H:i d-m-Y'); - $element['ago'] = \SYSTEM\time::time_ago_string(strtotime($element['timestamp'])); + $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['title'] = $this->param; + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('time')); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_search/tpl/search.tpl'), $vars); } } \ No newline at end of file diff --git a/neopolimatrix/page/default_search/tpl/element.tpl b/neopolimatrix/page/default_search/tpl/element.tpl index 56fcdbc..02f23f0 100644 --- a/neopolimatrix/page/default_search/tpl/element.tpl +++ b/neopolimatrix/page/default_search/tpl/element.tpl @@ -1,10 +1,10 @@
Author: ${author}
-Veröffentlicht: ${timestamp}
+Author: ${author_name}
+Veröffentlicht: ${ago}