diff --git a/index.php b/index.php index 093ea24..9d22170 100644 --- a/index.php +++ b/index.php @@ -9,5 +9,5 @@ require_once 'config.php'; \SYSTEM\system::register_errorhandler_dbwriter(); \SYSTEM\system::register_errorhandler_jsonoutput(); -echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_neopolimatrix', array_merge($_POST,$_GET), 1, false, true)->html(); +echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_neopolimatrix', array_merge($_POST,$_GET), 1, true, true)->html(); new \SYSTEM\LOG\COUNTER("Page was called sucessfully."); \ No newline at end of file diff --git a/nbproject/project.properties b/nbproject/project.properties index d37ef95..3d9b81a 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -1,3 +1,4 @@ +auxiliary.org-netbeans-modules-php-smarty.smarty-framework=true include.path=${php.global.include.path} php.version=PHP_54 source.encoding=UTF-8 diff --git a/neopolimatrix/page/default_article/tpl/element.tpl b/neopolimatrix/page/default_article/tpl/element.tpl index 9b0f33d..9afd05e 100644 --- a/neopolimatrix/page/default_article/tpl/element.tpl +++ b/neopolimatrix/page/default_article/tpl/element.tpl @@ -1,5 +1,5 @@

-
+

Author: ${author}

${ago}

diff --git a/neopolimatrix/page/default_list/default_list.php b/neopolimatrix/page/default_list/default_list.php index 9953d90..e455163 100644 --- a/neopolimatrix/page/default_list/default_list.php +++ b/neopolimatrix/page/default_list/default_list.php @@ -35,7 +35,7 @@ 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'; + return 'Neuheiten'; case 2: return 'Überwachungsstaat'; case 3: diff --git a/neopolimatrix/page/default_list/tpl/default_list.tpl b/neopolimatrix/page/default_list/tpl/default_list.tpl index 7dbbcb3..6dda25d 100644 --- a/neopolimatrix/page/default_list/tpl/default_list.tpl +++ b/neopolimatrix/page/default_list/tpl/default_list.tpl @@ -1,2 +1,5 @@ -

${title}

+
+

${title}

+
+
${list} diff --git a/neopolimatrix/page/default_list/tpl/element.tpl b/neopolimatrix/page/default_list/tpl/element.tpl index 7a708c6..701198a 100644 --- a/neopolimatrix/page/default_list/tpl/element.tpl +++ b/neopolimatrix/page/default_list/tpl/element.tpl @@ -1,4 +1,5 @@ -
+
+

Author: ${author}

${ago}

@@ -9,4 +10,6 @@ ${deDE}

Veröffentlicht: ${published}


+
+
Weiterlesen...
\ No newline at end of file diff --git a/neopolimatrix/page/default_page/css/default_page.css b/neopolimatrix/page/default_page/css/default_page.css index 6293c05..dbbb797 100644 --- a/neopolimatrix/page/default_page/css/default_page.css +++ b/neopolimatrix/page/default_page/css/default_page.css @@ -15,6 +15,42 @@ body{ margin: 0 auto; } -.list_element:hover { - background-color: #EEE; +.list_element{ + width: 750px; + margin: auto; + margin-bottom: 50px; + padding: 20px; + border: white solid 1px; } + +.list_element:hover{ +/* background-color: #EEE;*/ + border: #005fb3 solid 1px; +} + + +.article { + position: relative; +} + +.article:after { + position: absolute; + bottom: 0; + left: 0; + height: 100%; + width: 100%; + content: ""; + background: linear-gradient(to top, + rgba(255,255,255, 1) 1%, + rgba(255,255,255, 0) 20% + ); + pointer-events: none; /* so the text is still selectable */ +} + + +.element_hover{ + max-height: 400px; + overflow-y: hidden; +} + + diff --git a/neopolimatrix/page/default_page/js/default_page.js b/neopolimatrix/page/default_page/js/default_page.js index 0210f97..b205370 100644 --- a/neopolimatrix/page/default_page/js/default_page.js +++ b/neopolimatrix/page/default_page/js/default_page.js @@ -1,5 +1,5 @@ $(document).ready(function() { - new SYSTEM('./api.php',1,'start;filter.8'); + new SYSTEM('./api.php',1,'start;filter.1'); tabs(); impressum(); search(); @@ -15,7 +15,13 @@ function impressum(){ function search(){ $("#nav_search_btn").click(function(){ $('#contentframe').load('./?page=search¶m='+$('#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()); + } +}); } function tabs(){ diff --git a/neopolimatrix/page/default_page/tpl/default_page.tpl b/neopolimatrix/page/default_page/tpl/default_page.tpl index 5944176..840cc38 100644 --- a/neopolimatrix/page/default_page/tpl/default_page.tpl +++ b/neopolimatrix/page/default_page/tpl/default_page.tpl @@ -7,7 +7,7 @@ ${css} ${js} - +