diff --git a/neopolimatrix/dbd/qq/NEOPOLIMATRIX_GENERATE_ELEMENTLIST.php b/neopolimatrix/dbd/qq/NEOPOLIMATRIX_GENERATE_ELEMENTLIST.php index ac1ff15..c54e6e2 100644 --- a/neopolimatrix/dbd/qq/NEOPOLIMATRIX_GENERATE_ELEMENTLIST.php +++ b/neopolimatrix/dbd/qq/NEOPOLIMATRIX_GENERATE_ELEMENTLIST.php @@ -7,5 +7,5 @@ class NEOPOLIMATRIX_GENERATE_ELEMENTLIST extends \SYSTEM\DB\QP { //pg '', //mys -'SELECT * FROM system_locale_string LEFT JOIN system_locale_string_tag_strings ON (system_locale_string.id = system_locale_string_tag_strings.id) WHERE tag_string like ?;' +'SELECT * FROM system_locale_string LEFT JOIN system_locale_string_tag_strings ON (system_locale_string.id = system_locale_string_tag_strings.id) WHERE tag_string like ? ORDER by timestamp DESC;' );}} \ No newline at end of file diff --git a/neopolimatrix/dbd/qq/NEOPOLIMATRIX_GENERATE_ELEMENTLIST_FULLTEXT_SEARCH.php b/neopolimatrix/dbd/qq/NEOPOLIMATRIX_GENERATE_ELEMENTLIST_FULLTEXT_SEARCH.php new file mode 100644 index 0000000..39d223a --- /dev/null +++ b/neopolimatrix/dbd/qq/NEOPOLIMATRIX_GENERATE_ELEMENTLIST_FULLTEXT_SEARCH.php @@ -0,0 +1,11 @@ +generate_list(); - new SYSTEM\LOG\INFO(print_r($vars['content']), TRUE); + $vars['list'] = $this->generate_list(); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_list/default_list.tpl'), $vars); } } diff --git a/neopolimatrix/page/default_list/default_list.tpl b/neopolimatrix/page/default_list/default_list.tpl index 934b349..08494bf 100644 --- a/neopolimatrix/page/default_list/default_list.tpl +++ b/neopolimatrix/page/default_list/default_list.tpl @@ -1,2 +1 @@ -${content} -test \ No newline at end of file +${list} diff --git a/neopolimatrix/page/default_list/element.tpl b/neopolimatrix/page/default_list/element.tpl index b95fb14..f4a8dbb 100644 --- a/neopolimatrix/page/default_list/element.tpl +++ b/neopolimatrix/page/default_list/element.tpl @@ -1,4 +1,4 @@ -
+

Author: ${author}

Veröffentlicht: ${timestamp}

diff --git a/neopolimatrix/page/default_page/css/default_page.css b/neopolimatrix/page/default_page/css/default_page.css index f9aa851..6293c05 100644 --- a/neopolimatrix/page/default_page/css/default_page.css +++ b/neopolimatrix/page/default_page/css/default_page.css @@ -6,7 +6,7 @@ body{ text-align: center; margin: 0; padding: 0; - padding-top: 50px; + padding-top: 10px; } #main_container{ @@ -15,17 +15,6 @@ body{ margin: 0 auto; } -#header_container{ - width: 70%; +.list_element:hover { + background-color: #EEE; } - -#header_left{ - font-size: 25pt; - float: left; -} - -#header_right{ - - float: right; -} - diff --git a/neopolimatrix/page/default_page/default_page.tpl b/neopolimatrix/page/default_page/default_page.tpl index 32a320e..d3922ed 100644 --- a/neopolimatrix/page/default_page/default_page.tpl +++ b/neopolimatrix/page/default_page/default_page.tpl @@ -8,24 +8,27 @@ ${js} -

Neo-PoliMatrix

+
+ +
+
Blog   - Impressum + Impressum
-
+
-
-
- ${content} +
diff --git a/neopolimatrix/page/default_page/js/content.js b/neopolimatrix/page/default_page/js/content.js index b6812f9..fc364e6 100644 --- a/neopolimatrix/page/default_page/js/content.js +++ b/neopolimatrix/page/default_page/js/content.js @@ -1,11 +1,26 @@ +$(document).ready(function() { + tabs(); + search(); + load_list(1); +}); - - $(document).ready(function() { - $("#tabs_user_list a").click(function(){ +function search(){ + $("#btn_impressum").click(function(){ + alert('abc'); + $('#contentframe').load('./?page=impressum', function(){ + + }); + $(this).tab('show'); + }); +} + +function tabs(){ + $("#tabs_user_list a").click(function(){ load_list($(this).attr('filter')); $(this).tab('show'); - }); -}); + }); +} + function load_list(filter){ $('#contentframe').load('./?page=get_list&filter=' + filter, function(){ diff --git a/neopolimatrix/page/impressum/impressum.php b/neopolimatrix/page/impressum/impressum.php new file mode 100644 index 0000000..1f4bbc8 --- /dev/null +++ b/neopolimatrix/page/impressum/impressum.php @@ -0,0 +1,17 @@ + + ${Impressum} +
diff --git a/neopolimatrix/page/page_neopolimatrix.php b/neopolimatrix/page/page_neopolimatrix.php index 0e3010c..607e5fd 100644 --- a/neopolimatrix/page/page_neopolimatrix.php +++ b/neopolimatrix/page/page_neopolimatrix.php @@ -5,4 +5,9 @@ class page_neopolimatrix extends \SYSTEM\API\api_default { public static function page_get_list($filter){ return new default_list($filter);} + + public static function page_impressum(){ + return new impressum();} + + } \ No newline at end of file