From b5c4e99cb1a2e5bb5cf6d38192d677843b1acd80 Mon Sep 17 00:00:00 2001 From: winter Date: Thu, 20 Mar 2025 22:17:38 +0000 Subject: fix various htmx navigation / page reloads also i added a UserAccount::setPassword because i felt like it --- templates/mobilepane_left.php | 29 ++++++++++++++++------------- templates/mobilepane_right.php | 9 ++++++--- templates/skeleton.php | 20 +++++++++----------- 3 files changed, 31 insertions(+), 27 deletions(-) (limited to 'templates') diff --git a/templates/mobilepane_left.php b/templates/mobilepane_left.php index 83e9e4a..6af4664 100644 --- a/templates/mobilepane_left.php +++ b/templates/mobilepane_left.php @@ -14,7 +14,7 @@ $settings = GlobalSettings::getInstance(); -
+ -
- __('timeline.home.shortName'), - '/feed/global' => __('timeline.global.shortName'), - '/feed/local' => __('timeline.local.shortName'), - ]; - call_template('navigation/header_links', ['links' => $links]); +
+
+ __('timeline.home.shortName'), + '/feed/global' => __('timeline.global.shortName'), + '/feed/local' => __('timeline.local.shortName'), + ]; + call_template('navigation/header_links', ['links' => $links]); - call_template('note/write_form', ['actor' => $user->actor]); - call_template('navigation/left_side'); - ?> -

+ call_template('note/write_form', ['actor' => $user->actor]); + call_template('navigation/left_side'); + ?> +

+
diff --git a/templates/mobilepane_right.php b/templates/mobilepane_right.php index 02749ac..f1cf46a 100644 --- a/templates/mobilepane_right.php +++ b/templates/mobilepane_right.php @@ -13,7 +13,7 @@ $settings = GlobalSettings::getInstance(); -
+ -
- UserAccount::requireByCurrentSession()]); ?> +
+
+ UserAccount::requireByCurrentSession()]); ?> +
diff --git a/templates/skeleton.php b/templates/skeleton.php index c9e28c5..f4963da 100644 --- a/templates/skeleton.php +++ b/templates/skeleton.php @@ -7,7 +7,7 @@ $settings = GlobalSettings::getInstance(); $fullTitle = $pageTitle . ' — ' . $settings->get('instance.name'); -$loadPartialPage = isset($_SERVER['HTTP_HX_REQUEST']); +$loadPartialPage ??= isset($_SERVER['HTTP_HX_REQUEST']) && !isset($_GET['fl']); if ($loadPartialPage) { echo '' . htmlspecialchars($fullTitle) . ''; goto skipStart; @@ -46,12 +46,11 @@ if ($loadPartialPage) { -
- -