From c435f492da6a124c3be267bda45153f0e4ca4c01 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Wed, 18 Sep 2019 11:50:37 +0200 Subject: [PATCH] fixed floating on mobile version of the person/project submenus --- .../page/default_page/css/default_page.scss | 3 +- .../page/default_page/default_page.php | 38 +++++++------------ .../page/default_page/tpl/content_row.tpl | 3 +- .../default_page/tpl/default_page.tpl.test | 19 ++++++++++ .../tpl/{person_details.tpl => person.tpl} | 12 +++++- .../page/default_page/tpl/person_img.tpl | 10 ----- .../tpl/{project_details.tpl => project.tpl} | 12 +++++- .../page/default_page/tpl/project_img.tpl | 10 ----- 8 files changed, 58 insertions(+), 49 deletions(-) create mode 100644 wecker_manufaktur/page/default_page/tpl/default_page.tpl.test rename wecker_manufaktur/page/default_page/tpl/{person_details.tpl => person.tpl} (56%) delete mode 100644 wecker_manufaktur/page/default_page/tpl/person_img.tpl rename wecker_manufaktur/page/default_page/tpl/{project_details.tpl => project.tpl} (64%) delete mode 100644 wecker_manufaktur/page/default_page/tpl/project_img.tpl diff --git a/wecker_manufaktur/page/default_page/css/default_page.scss b/wecker_manufaktur/page/default_page/css/default_page.scss index ec9d6d5..0f1426e 100644 --- a/wecker_manufaktur/page/default_page/css/default_page.scss +++ b/wecker_manufaktur/page/default_page/css/default_page.scss @@ -221,7 +221,8 @@ strong { } .project{ - padding-bottom: $distance_big; + padding-top: $distance_xlarge; + padding-bottom: $distance_medium; img { object-fit: cover; width: $distance_huge; diff --git a/wecker_manufaktur/page/default_page/default_page.php b/wecker_manufaktur/page/default_page/default_page.php index d8bb925..bea1ad1 100644 --- a/wecker_manufaktur/page/default_page/default_page.php +++ b/wecker_manufaktur/page/default_page/default_page.php @@ -21,9 +21,8 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { private static function getPersons(){ $result = ''; - $column_counter = 0; - $_content_imgs = ''; - $_content_details = ''; + $column_counter = 0; + $content = ''; $persons = \SQL\SELECT_PERSONS_VISIBLE::QQ(); $person_badges = \SQL\SELECT_BADGES_VISIBLE::QA(array(\SAI\saimod_project::BADGE_TYPE_PERSON_ABILITIES)); // This part we filter phpside due to performance. @@ -46,24 +45,20 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { } $row['projects'] = substr($row['projects'],0,-3); - $_content_imgs .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/person_img.tpl'))->SERVERPATH(),$row); - $_content_details .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/person_details.tpl'))->SERVERPATH(),$row); + $content .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/person.tpl'))->SERVERPATH(),$row); // Insert full row and start a new row if($column_counter++ === 2){ $result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/content_row.tpl'))->SERVERPATH(), - array( '_content_imgs' => $_content_imgs, - '_content_details' => $_content_details)); - $column_counter = 0; - $_content_imgs = ''; - $_content_details = ''; + array( 'content' => $content)); + $column_counter = 0; + $content = ''; } } // Insert incomplete rows if($column_counter != 0){ $result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/content_row.tpl'))->SERVERPATH(), - array( '_content_imgs' => $_content_imgs, - '_content_details' => $_content_details)); + array( 'content' => $content)); } return $result; @@ -72,9 +67,8 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { private static function getProjects(){ $result = ''; - $column_counter = 0; - $_content_imgs = ''; - $_content_details = ''; + $column_counter = 0; + $content = ''; $projects = \SQL\SELECT_PROJECTS_VISIBLE::QQ(); $project_focus = \SQL\SELECT_BADGES_VISIBLE::QA(array(\SAI\saimod_project::BADGE_TYPE_PROJECT_FOCUS)); // This part we filter phpside due to performance. @@ -100,24 +94,20 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { $row['persons'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/project_person.tpl'))->SERVERPATH(),$person); } - $_content_imgs .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/project_img.tpl'))->SERVERPATH(),$row); - $_content_details .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/project_details.tpl'))->SERVERPATH(),$row); + $content .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/project.tpl'))->SERVERPATH(),$row); // Insert full row and start a new row if($column_counter++ === 2){ $result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/content_row.tpl'))->SERVERPATH(), - array( '_content_imgs' => $_content_imgs, - '_content_details' => $_content_details)); - $column_counter = 0; - $_content_imgs = ''; - $_content_details = ''; + array( 'content' => $content)); + $column_counter = 0; + $content = ''; } } // Insert incomplete rows if($column_counter != 0){ $result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_page/tpl/content_row.tpl'))->SERVERPATH(), - array( '_content_imgs' => $_content_imgs, - '_content_details' => $_content_details)); + array( 'content' => $content)); } return $result; diff --git a/wecker_manufaktur/page/default_page/tpl/content_row.tpl b/wecker_manufaktur/page/default_page/tpl/content_row.tpl index e7450d6..7af76d4 100644 --- a/wecker_manufaktur/page/default_page/tpl/content_row.tpl +++ b/wecker_manufaktur/page/default_page/tpl/content_row.tpl @@ -1,6 +1,5 @@
- ${_content_imgs} - ${_content_details} + ${content}
\ No newline at end of file diff --git a/wecker_manufaktur/page/default_page/tpl/default_page.tpl.test b/wecker_manufaktur/page/default_page/tpl/default_page.tpl.test new file mode 100644 index 0000000..a887af9 --- /dev/null +++ b/wecker_manufaktur/page/default_page/tpl/default_page.tpl.test @@ -0,0 +1,19 @@ + + + ${css} + + +
+
+
A
+
AD
+
B
+
BD
+
C
+
CD
+
D
+
DD
+
+
+ + \ No newline at end of file diff --git a/wecker_manufaktur/page/default_page/tpl/person_details.tpl b/wecker_manufaktur/page/default_page/tpl/person.tpl similarity index 56% rename from wecker_manufaktur/page/default_page/tpl/person_details.tpl rename to wecker_manufaktur/page/default_page/tpl/person.tpl index 37ffc92..1c9fe07 100644 --- a/wecker_manufaktur/page/default_page/tpl/person_details.tpl +++ b/wecker_manufaktur/page/default_page/tpl/person.tpl @@ -1,4 +1,14 @@ -
+ +
diff --git a/wecker_manufaktur/page/default_page/tpl/person_img.tpl b/wecker_manufaktur/page/default_page/tpl/person_img.tpl deleted file mode 100644 index a6dd6cb..0000000 --- a/wecker_manufaktur/page/default_page/tpl/person_img.tpl +++ /dev/null @@ -1,10 +0,0 @@ - \ No newline at end of file diff --git a/wecker_manufaktur/page/default_page/tpl/project_details.tpl b/wecker_manufaktur/page/default_page/tpl/project.tpl similarity index 64% rename from wecker_manufaktur/page/default_page/tpl/project_details.tpl rename to wecker_manufaktur/page/default_page/tpl/project.tpl index 0dd19a1..32b530b 100644 --- a/wecker_manufaktur/page/default_page/tpl/project_details.tpl +++ b/wecker_manufaktur/page/default_page/tpl/project.tpl @@ -1,4 +1,14 @@ -
diff --git a/wecker_manufaktur/page/default_page/tpl/project_img.tpl b/wecker_manufaktur/page/default_page/tpl/project_img.tpl deleted file mode 100644 index 8b7af6f..0000000 --- a/wecker_manufaktur/page/default_page/tpl/project_img.tpl +++ /dev/null @@ -1,10 +0,0 @@ - \ No newline at end of file