imp: Remove user menu and alerts from Turbo cache

This avoids "flashes" when coming back from e.g. the preferences page.
flusio · Oct 7, 2022 · 9f2534c · 9f2534c
1 parent 87e5e9c
commit 9f2534c
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9 deletions.
diff --git a/src/views/_layouts/connected.phtml b/src/views/_layouts/connected.phtml
@@ -130,7 +130,11 @@
                             </span>
                         </summary>
 
-                        <nav class="popup__container popup__container--large popup__container--left" role="menu">
+                        <nav
+                            class="popup__container popup__container--large popup__container--left"
+                            role="menu"
+                            data-turbo-cache="false"
+                        >
                             <div class="popup__title"><?= protect($current_user->username) ?></div>
 
                             <a
@@ -260,6 +264,7 @@
             aria-modal="true"
             aria-hidden="true"
             tabindex="-1"
+            data-turbo-cache="false"
         >
             <section
                 class="modal__box"

diff --git a/src/views/_layouts/connected_blocked.phtml b/src/views/_layouts/connected_blocked.phtml
@@ -89,7 +89,11 @@
                             </span>
                         </summary>
 
-                        <nav class="popup__container popup__container--large popup__container--left" role="menu">
+                        <nav
+                            class="popup__container popup__container--large popup__container--left"
+                            role="menu"
+                            data-turbo-cache="false"
+                        >
                             <div class="popup__title"><?= protect($current_user->username) ?></div>
 
                             <a

diff --git a/src/views/_layouts/not_connected.phtml b/src/views/_layouts/not_connected.phtml
@@ -174,6 +174,7 @@
             aria-modal="true"
             aria-hidden="true"
             tabindex="-1"
+            data-turbo-cache="false"
         >
             <section
                 class="modal__box"

diff --git a/src/views/alerts/_error.phtml b/src/views/alerts/_error.phtml
@@ -1,5 +1,5 @@
 <?php if ($message): ?>
-    <div class="alert alert--error" role="alert">
+    <div class="alert alert--error" role="alert" data-turbo-cache="false">
         <div class="alert__title"><?= _('Error') ?></div>
 
         <p class="alert__message">

diff --git a/src/views/alerts/_info.phtml b/src/views/alerts/_info.phtml
@@ -1,5 +1,5 @@
 <?php if ($message): ?>
-    <div class="alert alert--info" role="alert">
+    <div class="alert alert--info" role="alert" data-turbo-cache="false">
         <div class="alert__title"><?= _('Info') ?></div>
 
         <p class="alert__message">

diff --git a/src/views/alerts/_success.phtml b/src/views/alerts/_success.phtml
@@ -1,5 +1,5 @@
 <?php if ($message): ?>
-    <div class="alert alert--success" role="alert">
+    <div class="alert alert--success" role="alert" data-turbo-cache="false">
         <div class="alert__title"><?= _('Success') ?></div>
 
         <p class="alert__message">

diff --git a/src/views/news/index.phtml b/src/views/news/index.phtml
@@ -89,12 +89,12 @@
             </details>
         </div>
     <?php else: ?>
+        <p class="section__intro">
+            <?= _('Fill the news with…') ?>
+        </p>
+
         <?php if ($no_news): ?>
             <?= $this->include('alerts/_info.phtml', ['message' => no_news_sentence()]) ?>
-        <?php else: ?>
-            <p class="section__intro">
-                <?= _('Fill the news with…') ?>
-            </p>
         <?php endif; ?>
 
         <form method="post" action="<?= url('fill news') ?>">