From 7481887db746fd2d6eefab021776b8abd4076429 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Wed, 1 Oct 2014 10:06:04 +0200
Subject: Load feed configuration on the same page

Need improvements

See https://github.com/marienfressinaud/FreshRSS/issues/646
---
 app/Controllers/configureController.php | 4 ++++
 app/views/configure/categorize.phtml    | 5 ++++-
 app/views/configure/feed.phtml          | 8 ++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'app')

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index a7def6d9a..dd7a0a441 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -90,6 +90,10 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 	 * Default values are empty strings unless specified.
 	 */
 	public function feedAction() {
+		if (Minz_Request::param('ajax')) {
+			$this->view->_useLayout(false);
+		}
+
 		$catDAO = new FreshRSS_CategoryDAO();
 		$this->view->categories = $catDAO->listCategories(false);
 
diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
index 8f77f9724..008dc8c98 100644
--- a/app/views/configure/categorize.phtml
+++ b/app/views/configure/categorize.phtml
@@ -73,7 +73,7 @@
 						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
 			?>
 			<li class="item<?php echo $error, $empty; ?>">
-				<a class="configure" href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
+				<a class="configure open-slider" href="<?php echo _url('configure', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
 				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?>
 			</li>
 			<?php 	}
@@ -85,3 +85,6 @@
 	</div>
 	<?php } ?>
 </div>
+
+<div id="slider">
+</div>
diff --git a/app/views/configure/feed.phtml b/app/views/configure/feed.phtml
index e96a28739..f58ac65af 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/configure/feed.phtml
@@ -1,8 +1,12 @@
-<?php $this->partial ('aside_feed'); ?>
+<?php
+	if (!Minz_Request::param('ajax')) {
+		$this->partial('aside_feed');
+	}
+?>
 
 <?php if ($this->flux) { ?>
 <div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a> <?php echo Minz_Translate::t ('or'); ?> <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $this->flux->id ()); ?>"><?php echo Minz_Translate::t ('filter'); ?></a>
+	<!-- <a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a> <?php echo Minz_Translate::t ('or'); ?> <a href="<?php echo _url ('index', 'index', 'get', 'f_' . $this->flux->id ()); ?>"><?php echo Minz_Translate::t ('filter'); ?></a> -->
 
 	<h1><?php echo $this->flux->name (); ?></h1>
 	<?php echo $this->flux->description (); ?>
-- 
cgit v1.2.3