From 495a7867f9b89fd7593df3b918851ca5e978d63b Mon Sep 17 00:00:00 2001 From: Naeltard Date: Thu, 29 Jan 2015 01:11:04 +0100 Subject: [PATCH 1/4] various late commits system ajax for google: first prototype working js optimization --- index.php | 2 +- .../page/default_list/default_list.php | 2 +- .../page/default_list/tpl/default_list.tpl | 5 +++- .../page/default_page/js/default_page.js | 2 +- .../page/default_page/tpl/default_page.tpl | 23 ++++++++----------- .../page/default_search/tpl/search.tpl | 5 +++- system | 2 +- 7 files changed, 22 insertions(+), 19 deletions(-) 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/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_page/js/default_page.js b/neopolimatrix/page/default_page/js/default_page.js index 0210f97..3ba4be3 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(); diff --git a/neopolimatrix/page/default_page/tpl/default_page.tpl b/neopolimatrix/page/default_page/tpl/default_page.tpl index 5944176..82a0c6c 100644 --- a/neopolimatrix/page/default_page/tpl/default_page.tpl +++ b/neopolimatrix/page/default_page/tpl/default_page.tpl @@ -31,30 +31,27 @@
Blog   - Impressum + Impressum
- - - +

Nach Themen

-
- test +
diff --git a/neopolimatrix/page/default_search/tpl/search.tpl b/neopolimatrix/page/default_search/tpl/search.tpl index ebb4a91..f74d6a0 100644 --- a/neopolimatrix/page/default_search/tpl/search.tpl +++ b/neopolimatrix/page/default_search/tpl/search.tpl @@ -1,2 +1,5 @@ -
du hast gesucht nach: ${title}
+
+

du hast gesucht nach: ${title}

+
+
${search} \ No newline at end of file diff --git a/system b/system index dd3393b..5ebb40d 160000 --- a/system +++ b/system @@ -1 +1 @@ -Subproject commit dd3393ba7c9c5f7df76cde3a00b11d6361d1e897 +Subproject commit 5ebb40d49d315440680f19430f3d50790736ba0b From 71f6f2d32a0f90d0559a3e57bb16ec00eca445fc Mon Sep 17 00:00:00 2001 From: Naeltard Date: Thu, 29 Jan 2015 14:38:05 +0100 Subject: [PATCH 2/4] list --- .../page/default_list/tpl/element.tpl | 5 ++- .../page/default_page/css/default_page.css | 32 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/neopolimatrix/page/default_list/tpl/element.tpl b/neopolimatrix/page/default_list/tpl/element.tpl index 7a708c6..328e9cf 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..5f5af10 100644 --- a/neopolimatrix/page/default_page/css/default_page.css +++ b/neopolimatrix/page/default_page/css/default_page.css @@ -16,5 +16,37 @@ body{ } .list_element:hover { + background-color: white; +} + + +.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) 10%, + rgba(255,255,255, 0) 20% + ); + pointer-events: none; /* so the text is still selectable */ +} + + +.element_hover{ + max-height: 400px; + overflow-y: hidden; +} +.element_hover:hover { + background: white; +} + +element_shadow:hover{ background-color: #EEE; } From 87da3bd1c3f714f1e8b30cc11286d4319c278e50 Mon Sep 17 00:00:00 2001 From: rylon Date: Fri, 20 Feb 2015 04:53:33 +0100 Subject: [PATCH 3/4] neopolimatrix search on enter --- nbproject/project.properties | 1 + neopolimatrix/page/default_page/js/default_page.js | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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_page/js/default_page.js b/neopolimatrix/page/default_page/js/default_page.js index 3ba4be3..b205370 100644 --- a/neopolimatrix/page/default_page/js/default_page.js +++ b/neopolimatrix/page/default_page/js/default_page.js @@ -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(){ From b03cf8945f1e846f17e204676e8c14dc27dc59c9 Mon Sep 17 00:00:00 2001 From: Naeltard Date: Thu, 26 Feb 2015 11:51:13 +0100 Subject: [PATCH 4/4] minor fix --- .../page/default_article/tpl/element.tpl | 2 +- .../page/default_list/tpl/element.tpl | 6 ++--- .../page/default_page/css/default_page.css | 22 +++++++++++-------- .../page/default_page/tpl/default_page.tpl | 2 +- .../page/default_search/tpl/element.tpl | 2 +- 5 files changed, 19 insertions(+), 15 deletions(-) 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/tpl/element.tpl b/neopolimatrix/page/default_list/tpl/element.tpl index 328e9cf..701198a 100644 --- a/neopolimatrix/page/default_list/tpl/element.tpl +++ b/neopolimatrix/page/default_list/tpl/element.tpl @@ -1,5 +1,5 @@ -
-
+
+

Author: ${author}

${ago}

@@ -11,5 +11,5 @@ ${deDE}

Veröffentlicht: ${published}


-
Weiterlesen...
+
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 5f5af10..dbbb797 100644 --- a/neopolimatrix/page/default_page/css/default_page.css +++ b/neopolimatrix/page/default_page/css/default_page.css @@ -15,8 +15,17 @@ body{ margin: 0 auto; } -.list_element:hover { - background-color: white; +.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; } @@ -32,7 +41,7 @@ body{ width: 100%; content: ""; background: linear-gradient(to top, - rgba(255,255,255, 1) 10%, + rgba(255,255,255, 1) 1%, rgba(255,255,255, 0) 20% ); pointer-events: none; /* so the text is still selectable */ @@ -43,10 +52,5 @@ body{ max-height: 400px; overflow-y: hidden; } -.element_hover:hover { - background: white; -} -element_shadow:hover{ - background-color: #EEE; -} + diff --git a/neopolimatrix/page/default_page/tpl/default_page.tpl b/neopolimatrix/page/default_page/tpl/default_page.tpl index 82a0c6c..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} - +