From 228d7adfdb90c3fdd179f80fbfde565eb06e0cec Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Thu, 15 Jun 2023 12:47:47 +0200
Subject: Fix slider views (#5469)

* Fix slider titles
And fix full-page view of category configuration.
FIx https://github.com/FreshRSS/FreshRSS/pull/5449#issuecomment-1590021947

* Fix user queries and user management
Implement https://github.com/FreshRSS/FreshRSS/pull/5469#issuecomment-1591957935
---
 app/views/configure/query.phtml       | 5 ++++-
 app/views/subscription/category.phtml | 6 +++++-
 app/views/subscription/feed.phtml     | 2 +-
 app/views/user/details.phtml          | 3 +++
 4 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'app/views')

diff --git a/app/views/configure/query.phtml b/app/views/configure/query.phtml
index 316583bac..9284ae94e 100644
--- a/app/views/configure/query.phtml
+++ b/app/views/configure/query.phtml
@@ -1,6 +1,9 @@
-<?php /** @var FreshRSS_View $this */ ?>
 <?php
+/** @var FreshRSS_View $this */
 
+if (!Minz_Request::paramBoolean('ajax')) {
+	$this->partial('aside_configure');
+}
 if ($this->query) {
 	$this->renderHelper('configure/query');
 }
diff --git a/app/views/subscription/category.phtml b/app/views/subscription/category.phtml
index 90de4e11b..0b63ebc17 100644
--- a/app/views/subscription/category.phtml
+++ b/app/views/subscription/category.phtml
@@ -1,5 +1,9 @@
-<?php /** @var FreshRSS_View $this */ ?>
 <?php
+/** @var FreshRSS_View $this */
+
+if (!Minz_Request::paramBoolean('ajax')) {
+	$this->partial('aside_subscription');
+}
 if ($this->category) {
 	$this->renderHelper('category/update');
 }
diff --git a/app/views/subscription/feed.phtml b/app/views/subscription/feed.phtml
index c93b7fc58..e361cff39 100644
--- a/app/views/subscription/feed.phtml
+++ b/app/views/subscription/feed.phtml
@@ -1,5 +1,5 @@
-<?php /** @var FreshRSS_View $this */ ?>
 <?php
+/** @var FreshRSS_View $this */
 
 if (!Minz_Request::paramBoolean('ajax')) {
 	$this->partial('aside_subscription');
diff --git a/app/views/user/details.phtml b/app/views/user/details.phtml
index 3387584eb..a2a560a65 100644
--- a/app/views/user/details.phtml
+++ b/app/views/user/details.phtml
@@ -1,5 +1,8 @@
 <?php
 	/** @var FreshRSS_View $this */
+	if (!Minz_Request::paramBoolean('ajax')) {
+		$this->partial('aside_configure');
+	}
 ?>
 
 <?php $isDefault = $this->details['is_default']; ?>
-- 
cgit v1.2.3