From f5ef53b53c86c4b106720f869c65902e1b4b3abe Mon Sep 17 00:00:00 2001 From: marko Date: Sat, 22 Apr 2023 12:06:25 +0200 Subject: [PATCH] updated to materialize2 --- homepage/participo/css/participo.css | 4 ++ homepage/participo/events.js | 4 +- homepage/participo/events.php | 67 ++++++++++--------- homepage/participo/lib/participoLib/event.php | 15 +++-- homepage/participo/sidenav.php | 44 ++++++------ submodules/materialize | 2 +- 6 files changed, 76 insertions(+), 60 deletions(-) diff --git a/homepage/participo/css/participo.css b/homepage/participo/css/participo.css index 897e3a9..6fc9c57 100644 --- a/homepage/participo/css/participo.css +++ b/homepage/participo/css/participo.css @@ -46,3 +46,7 @@ h3 { h6 { font-size: 1.1rem; } + +ul.sidenav li { + list-style-type: none; +} diff --git a/homepage/participo/events.js b/homepage/participo/events.js index e5893f0..5999bc8 100644 --- a/homepage/participo/events.js +++ b/homepage/participo/events.js @@ -19,6 +19,7 @@ function initSelects() { var selectElements = document.querySelectorAll('select'); // var selectInstances = M.FormSelect.init(selectElements, {}); + console.log('initSelect'); } // Init SideNav menu @@ -33,7 +34,8 @@ function initModals() { var modalElements = document.querySelectorAll('.modal'); // var modalInstances = M.Modal.init(modalElements, { - 'onOpenEnd': initSelects + // @todo Temporary disabled. Normally the selects need to be init after the modal shows. MaterializeCss 2 seems to change this. + // 'onOpenEnd': initSelects }); }; diff --git a/homepage/participo/events.php b/homepage/participo/events.php index 816959f..5a40f56 100644 --- a/homepage/participo/events.php +++ b/homepage/participo/events.php @@ -3,44 +3,47 @@ require_once 'events.inc.php'; ?> - - - - - + + + - - + + - <?php echo($meta['title']); ?> - + + - - + <?php echo($meta['title']); ?> + - + + - -
- - -
+ - -
-

Eingeschriebene Starter

- + +
+ + +
-

Übersicht anstehender Events

- - + +
+

Eingeschriebene Starter

+ -

Detailansicht kommender Wettkämpfe

- asHtmlCard()); - }?> -
- - - +

Übersicht anstehender Events

+ + + +

Detailansicht kommender Wettkämpfe

+ asHtmlCard()); + }?> +
+ + + + \ No newline at end of file diff --git a/homepage/participo/lib/participoLib/event.php b/homepage/participo/lib/participoLib/event.php index 7d71195..88417e6 100644 --- a/homepage/participo/lib/participoLib/event.php +++ b/homepage/participo/lib/participoLib/event.php @@ -150,7 +150,7 @@ class Event . $this->getHtmlStarterList(); $kids = participo::getKids(); $modal .= '
'; - $modal .= '
Deadline zum Eintragen: ' . $this->deadline->format('Y-m-d') . '
'; + $modal .= '
Deadline zum Eintragen: ' . $this->deadline->format('Y-m-d') . '
'; $today = new DateTime(); if ( @@ -164,6 +164,7 @@ class Event $modal .= '
Es ist leider zu spät noch jemanden einzutragen!
'; } $modal .= '
'; + $modal .= '' . // end modal-content '
' . @@ -295,8 +296,8 @@ class Event public function getHtmlAddStarterForm($user, $options = []) { $defaults = [ - 'formClass' => 'card col s12 m6 l3', - 'inputClass' => 'input-field', + 'formClass' => 's12 m6 xl3', + 'inputClass' => 'input-field col s12', 'buttonClass' => 'btn' ]; @@ -305,18 +306,20 @@ class Event $returnToUrl = $options['returnToUrl'] ?? urlencode(getCurPagesUrl()); $key = isset($_SESSION['apiKey']) ? $_SESSION['apiKey'] : null; + $selectId = 'form-selectType-event-' . $this->id . '-user-' . $user->getId(); + $form = '
' . '' . '' . '' - . '
' - . '' . '' . '' . '' . '' - . '' . '
' . '' . '
'; diff --git a/homepage/participo/sidenav.php b/homepage/participo/sidenav.php index 9cff98f..1701837 100644 --- a/homepage/participo/sidenav.php +++ b/homepage/participo/sidenav.php @@ -1,22 +1,26 @@ - - - menu + +menu + \ No newline at end of file diff --git a/submodules/materialize b/submodules/materialize index 4463268..0ada13a 160000 --- a/submodules/materialize +++ b/submodules/materialize @@ -1 +1 @@ -Subproject commit 4463268d489e9ad40d0b98efbcf9cbda6570d076 +Subproject commit 0ada13a85236807de24182765574b2362dddd46d