Merge branch '646-new-cat-system' into dev

10 files changed, 191 insertions, 93 deletions

diff --git a/app/views/configure/categorize.phtml b/app/views/configure/categorize.phtml
deleted file mode 100644
index 23d1c9fa1..000000000
--- a/app/views/configure/categorize.phtml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php $this->partial ('aside_feed'); ?>
-
-<div class="post">
-	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo Minz_Translate::t ('back_to_rss_feeds'); ?></a>
-
-	<form method="post" action="<?php echo _url ('configure', 'categorize'); ?>">
-		<legend><?php echo Minz_Translate::t ('categories_management'); ?></legend>
-
-		<p class="alert alert-warn"><?php echo Minz_Translate::t ('feeds_moved_category_deleted', $this->defaultCategory->name ()); ?></p>
-
-		<?php $i = 0; foreach ($this->categories as $cat) { $i++; ?>
-		<div class="form-group">
-			<label class="group-name" for="cat_<?php echo $cat->id (); ?>">
-				<?php echo Minz_Translate::t ('category_number', $i); ?>
-			</label>
-			<div class="group-controls">
-				<div class="stick">
-					<input type="text" id="cat_<?php echo $cat->id (); ?>" name="categories[]" value="<?php echo $cat->name (); ?>" />
-
-					<?php if ($cat->nbFeed () > 0) { ?>
-					<a class="btn" href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id ()); ?>">
-						<?php echo _i('link'); ?>
-					</a>
-					<button formaction="<?php echo _url('feed', 'delete', 'id', $cat->id (), 'type', 'category'); ?>"
-					        class="btn btn-attention confirm"
-					        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
-					        type="submit"><?php echo _t('ask_empty'); ?></button>
-					<?php } ?>
-				</div>
-				(<?php echo Minz_Translate::t ('number_feeds', $cat->nbFeed ()); ?>)
-
-				<?php if ($cat->id () === $this->defaultCategory->id ()) { ?>
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('can_not_be_deleted'); ?>
-				<?php } ?>
-
-				<input type="hidden" name="ids[]" value="<?php echo $cat->id (); ?>" />
-			</div>
-		</div>
-		<?php } ?>
-
-		<div class="form-group">
-			<label class="group-name" for="new_category"><?php echo Minz_Translate::t ('add_category'); ?></label>
-			<div class="group-controls">
-				<input type="text" id="new_category" name="new_category" placeholder="<?php echo Minz_Translate::t ('new_category'); ?>" />
-			</div>
-		</div>
-
-		<div class="form-group form-actions">
-			<div class="group-controls">
-				<button type="submit" class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button type="reset" class="btn"><?php echo Minz_Translate::t ('cancel'); ?></button>
-			</div>
-		</div>
-	</form>
-</div>
diff --git a/app/views/configure/feed.phtml b/app/views/helpers/feed/update.phtml
index e96a28739..4a6425c45 100644
--- a/app/views/configure/feed.phtml
+++ b/app/views/helpers/feed/update.phtml
@@ -1,40 +1,37 @@
-<?php $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->feed->id ()); ?>"><?php echo Minz_Translate::t ('filter'); ?></a> -->
 
-	<h1><?php echo $this->flux->name (); ?></h1>
-	<?php echo $this->flux->description (); ?>
+	<h1><?php echo $this->feed->name (); ?></h1>
+	<?php echo $this->feed->description (); ?>
 
-	<?php $nbEntries = $this->flux->nbEntries (); ?>
+	<?php $nbEntries = $this->feed->nbEntries (); ?>
 
-	<?php if ($this->flux->inError ()) { ?>
+	<?php if ($this->feed->inError ()) { ?>
 	<p class="alert alert-error"><span class="alert-head"><?php echo Minz_Translate::t ('damn'); ?></span> <?php echo Minz_Translate::t ('feed_in_error'); ?></p>
 	<?php } elseif ($nbEntries === 0) { ?>
 	<p class="alert alert-warn"><?php echo Minz_Translate::t ('feed_empty'); ?></p>
 	<?php } ?>
 
-	<form method="post" action="<?php echo _url ('configure', 'feed', 'id', $this->flux->id ()); ?>" autocomplete="off">
+	<form method="post" action="<?php echo _url ('subscription', 'feed', 'id', $this->feed->id ()); ?>" autocomplete="off">
 		<legend><?php echo Minz_Translate::t ('informations'); ?></legend>
 		<div class="form-group">
 			<label class="group-name" for="name"><?php echo Minz_Translate::t ('title'); ?></label>
 			<div class="group-controls">
-				<input type="text" name="name" id="name" class="extend" value="<?php echo $this->flux->name () ; ?>" />
+				<input type="text" name="name" id="name" class="extend" value="<?php echo $this->feed->name () ; ?>" />
 			</div>
 		</div>
 		<div class="form-group">
 			<label class="group-name" for="description"><?php echo Minz_Translate::t ('feed_description'); ?></label>
 			<div class="group-controls">
-				<textarea name="description" id="description"><?php echo htmlspecialchars($this->flux->description(), ENT_NOQUOTES, 'UTF-8'); ?></textarea>
+				<textarea name="description" id="description"><?php echo htmlspecialchars($this->feed->description(), ENT_NOQUOTES, 'UTF-8'); ?></textarea>
 			</div>
 		</div>
 		<div class="form-group">
 			<label class="group-name" for="website"><?php echo Minz_Translate::t ('website_url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
-					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->flux->website (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->flux->website (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
+					<input type="text" name="website" id="website" class="extend" value="<?php echo $this->feed->website (); ?>" />
+					<a class="btn" target="_blank" href="<?php echo $this->feed->website (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
 				</div>
 			</div>
 		</div>
@@ -42,11 +39,11 @@
 			<label class="group-name" for="url"><?php echo Minz_Translate::t ('feed_url'); ?></label>
 			<div class="group-controls">
 				<div class="stick">
-					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->flux->url (); ?>" />
-					<a class="btn" target="_blank" href="<?php echo $this->flux->url (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
+					<input type="text" name="url" id="url" class="extend" value="<?php echo $this->feed->url (); ?>" />
+					<a class="btn" target="_blank" href="<?php echo $this->feed->url (); ?>"><?php echo FreshRSS_Themes::icon('link'); ?></a>
 				</div>
 
-				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->flux->url (); ?>"><?php echo Minz_Translate::t ('feed_validator'); ?></a>
+				<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url (); ?>"><?php echo Minz_Translate::t ('feed_validator'); ?></a>
 			</div>
 		</div>
 		<div class="form-group">
@@ -54,7 +51,7 @@
 			<div class="group-controls">
 				<select name="category" id="category">
 				<?php foreach ($this->categories as $cat) { ?>
-				<option value="<?php echo $cat->id (); ?>"<?php echo $cat->id ()== $this->flux->category () ? ' selected="selected"' : ''; ?>>
+				<option value="<?php echo $cat->id (); ?>"<?php echo $cat->id ()== $this->feed->category () ? ' selected="selected"' : ''; ?>>
 					<?php echo $cat->name (); ?>
 				</option>
 				<?php } ?>
@@ -65,14 +62,14 @@
 			<label class="group-name" for="priority"><?php echo Minz_Translate::t ('show_in_all_flux'); ?></label>
 			<div class="group-controls">
 				<label class="checkbox" for="priority">
-					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->flux->priority () > 0 ? ' checked="checked"' : ''; ?> />
+					<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->feed->priority () > 0 ? ' checked="checked"' : ''; ?> />
 					<?php echo Minz_Translate::t ('yes'); ?>
 				</label>
 			</div>
 		</div>
 		<div class="form-group">
 			<div class="group-controls">
-				<a href="<?php echo _url('stats', 'repartition', 'id', $this->flux->id()); ?>">
+				<a href="<?php echo _url('stats', 'repartition', 'id', $this->feed->id()); ?>">
 					<?php echo _i('stats'); ?> <?php echo _t('stats'); ?>
 				</a>
 			</div>
@@ -82,7 +79,7 @@
 				<button class="btn btn-important"><?php echo _t('save'); ?></button>
 				<button class="btn btn-attention confirm"
 				        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
-				        formaction="<?php echo _url('feed', 'delete', 'id', $this->flux->id ()); ?>"
+				        formaction="<?php echo _url('feed', 'delete', 'id', $this->feed->id ()); ?>"
 				        formmethod="post"><?php echo _t('delete'); ?></button>
 			</div>
 		</div>
@@ -93,7 +90,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="text" value="<?php echo _t('number_articles', $nbEntries); ?>" disabled="disabled" />
-					<a class="btn" href="<?php echo _url('feed', 'actualize', 'id', $this->flux->id ()); ?>">
+					<a class="btn" href="<?php echo _url('feed', 'actualize', 'id', $this->feed->id ()); ?>">
 						<?php echo _i('refresh'); ?> <?php echo _t('actualize'); ?>
 					</a>
 				</div>
@@ -104,7 +101,7 @@
 			<div class="group-controls">
 				<select class="number" name="keep_history" id="keep_history" required="required"><?php
 					foreach (array('' => '', -2 => Minz_Translate::t('by_default'), 0 => '0', 10 => '10', 50 => '50', 100 => '100', 500 => '500', 1000 => '1 000', 5000 => '5 000', 10000 => '10 000', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . ($this->flux->keepHistory() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
+						echo '<option value="' . $v . ($this->feed->keepHistory() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
 					}
 				?></select>
 			</div>
@@ -119,13 +116,13 @@
 					                36000 => '10h', 43200 => '12h', 64800 => '18h',
 					                86400 => '1d', 129600 => '1.5d', 172800 => '2d', 259200 => '3d', 345600 => '4d', 432000 => '5d', 518400 => '6d',
 					                604800 => '1wk', 1209600 => '2wk', 1814400 => '3wk', 2419200 => '4wk', 2629744 => '1mo', -1 => '∞') as $v => $t) {
-						echo '<option value="' . $v . ($this->flux->ttl() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
-						if ($this->flux->ttl() == $v) {
+						echo '<option value="' . $v . ($this->feed->ttl() === $v ? '" selected="selected' : '') . '">' . $t . '</option>';
+						if ($this->feed->ttl() == $v) {
 							$found = true;
 						}
 					}
 					if (!$found) {
-						echo '<option value="' . intval($this->flux->ttl()) . '" selected="selected">' . intval($this->flux->ttl()) . 's</option>';
+						echo '<option value="' . intval($this->feed->ttl()) . '" selected="selected">' . intval($this->feed->ttl()) . 's</option>';
 					}
 				?></select>
 			</div>
@@ -133,12 +130,12 @@
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button class="btn btn-important"><?php echo Minz_Translate::t ('save'); ?></button>
-				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->flux->id ()))); ?>"><?php echo Minz_Translate::t ('truncate'); ?></button>
+				<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->feed->id ()))); ?>"><?php echo Minz_Translate::t ('truncate'); ?></button>
 			</div>
 		</div>
 
 		<legend><?php echo Minz_Translate::t ('login_configuration'); ?></legend>
-		<?php $auth = $this->flux->httpAuth (false); ?>
+		<?php $auth = $this->feed->httpAuth (false); ?>
 		<div class="form-group">
 			<label class="group-name" for="http_user"><?php echo Minz_Translate::t ('http_username'); ?></label>
 			<div class="group-controls">
@@ -163,7 +160,7 @@
 		<div class="form-group">
 			<label class="group-name" for="path_entries"><?php echo Minz_Translate::t ('css_path_on_website'); ?></label>
 			<div class="group-controls">
-				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->flux->pathEntries (); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" />
+				<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries (); ?>" placeholder="<?php echo Minz_Translate::t ('blank_to_disable'); ?>" />
 				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo Minz_Translate::t ('retrieve_truncated_feeds'); ?>
 			</div>
 		</div>
@@ -176,7 +173,3 @@
 		</div>
 	</form>
 </div>
-
-<?php } else { ?>
-<div class="alert alert-warn"><span class="alert-head"><?php echo Minz_Translate::t ('no_selected_feed'); ?></span> <?php echo Minz_Translate::t ('think_to_add'); ?></div>
-<?php } ?>
diff --git a/app/views/helpers/view/global_view.phtml b/app/views/helpers/view/global_view.phtml
index 72bcf4c73..5e4cad01a 100644
--- a/app/views/helpers/view/global_view.phtml
+++ b/app/views/helpers/view/global_view.phtml
@@ -48,6 +48,6 @@
 <?php } else { ?>
 <div id="stream" class="prompt alert alert-warn global">
 	<h2><?php echo _t('no_feed_to_display'); ?></h2>
-	<a href="<?php echo _url('configure', 'feed'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
+	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
 </div>
 <?php } ?>
diff --git a/app/views/helpers/view/normal_view.phtml b/app/views/helpers/view/normal_view.phtml
index 6d9789f8d..e469edf58 100644
--- a/app/views/helpers/view/normal_view.phtml
+++ b/app/views/helpers/view/normal_view.phtml
@@ -186,6 +186,6 @@ if (!empty($this->entries)) {
 <?php } else { ?>
 <div id="stream" class="prompt alert alert-warn normal">
 	<h2><?php echo _t('no_feed_to_display'); ?></h2>
-	<a href="<?php echo _url('configure', 'feed'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
+	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
 </div>
 <?php } ?>
diff --git a/app/views/helpers/view/reader_view.phtml b/app/views/helpers/view/reader_view.phtml
index c80dca519..413094239 100644
--- a/app/views/helpers/view/reader_view.phtml
+++ b/app/views/helpers/view/reader_view.phtml
@@ -39,6 +39,6 @@ if (!empty($this->entries)) {
 <?php } else { ?>
 <div id="stream" class="prompt alert alert-warn reader">
 	<h2><?php echo _t('no_feed_to_display'); ?></h2>
-	<a href="<?php echo _url('configure', 'feed'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
+	<a href="<?php echo _url('subscription', 'index'); ?>"><?php echo _t('think_to_add'); ?></a><br /><br />
 </div>
 <?php } ?>
diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml
index 35371faca..36c0eab4e 100644
--- a/app/views/importExport/index.phtml
+++ b/app/views/importExport/index.phtml
@@ -1,4 +1,4 @@
-<?php $this->partial('aside_feed'); ?>
+<?php $this->partial('aside_subscription'); ?>
 
 <div class="post ">
 	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml
index 6f3d4a117..75cba1081 100644
--- a/app/views/stats/idle.phtml
+++ b/app/views/stats/idle.phtml
@@ -25,7 +25,7 @@
 				<li class="item">
 					<div class="stick">
 						<a class="btn" href="<?php echo _url('index', 'index', 'get', 'f_' . $feed['id']); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
-						<a class="btn" href="<?php echo _url('configure', 'feed', 'id', $feed['id']); ?>"><?php echo _i('configure'); ?> <?php echo _t('administration'); ?></a>
+						<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $feed['id']); ?>"><?php echo _i('configure'); ?> <?php echo _t('administration'); ?></a>
 						<button class="btn btn-attention confirm" form="form-delete" formaction="<?php echo _url('feed', 'delete', 'id', $feed['id'], 'r', $current_url); ?>"><?php echo _t('delete'); ?></button>
 					</div>
 				</li>
diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml
index 750a3ffdc..a181ae251 100644
--- a/app/views/stats/repartition.phtml
+++ b/app/views/stats/repartition.phtml
@@ -24,7 +24,7 @@
 	</select>
 
 	<?php if ($this->feed) {?>
-		<a class="btn" href="<?php echo _url('configure', 'feed', 'id', $this->feed->id()); ?>">
+		<a class="btn" href="<?php echo _url('subscription', 'index', 'id', $this->feed->id()); ?>">
 			<?php echo _i('configure'); ?> <?php echo _t('administration'); ?>
 		</a>
 	<?php }?>
diff --git a/app/views/subscription/feed.phtml b/app/views/subscription/feed.phtml
new file mode 100644
index 000000000..48a401c4a
--- /dev/null
+++ b/app/views/subscription/feed.phtml
@@ -0,0 +1,15 @@
+<?php
+
+if (!Minz_Request::param('ajax')) {
+	$this->partial('aside_subscription');
+}
+
+if ($this->feed) {
+	$this->renderHelper('feed/update');
+} else {
+?>
+<div class="alert alert-warn">
+	<span class="alert-head"><?php echo _t('no_selected_feed'); ?></span>
+	<?php echo _t('think_to_add'); ?>
+</div>
+<?php } ?>
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
new file mode 100644
index 000000000..577ddd972
--- /dev/null
+++ b/app/views/subscription/index.phtml
@@ -0,0 +1,145 @@
+<?php $this->partial('aside_subscription'); ?>
+
+<div class="post">
+	<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
+
+	<h2><?php echo _t('subscription_management'); ?></h2>
+
+	<form id="add_rss" method="post" action="<?php echo _url('feed', 'add'); ?>" autocomplete="off">
+		<div class="stick">
+			<input type="url" name="url_rss" class="extend" placeholder="<?php echo _t('add_rss_feed'); ?>" />
+			<div class="dropdown">
+				<div id="dropdown-cat" class="dropdown-target"></div>
+
+				<a class="dropdown-toggle btn" href="#dropdown-cat"><?php echo _i('down'); ?></a>
+				<ul class="dropdown-menu">
+					<li class="dropdown-close"><a href="#close">❌</a></li>
+
+					<li class="dropdown-header"><?php echo _t('category'); ?></li>
+
+					<li class="input">
+						<select name="category" id="category">
+						<?php foreach ($this->categories as $cat) { ?>
+						<option value="<?php echo $cat->id(); ?>"<?php echo $cat->id() == 1 ? ' selected="selected"' : ''; ?>>
+							<?php echo $cat->name(); ?>
+						</option>
+						<?php } ?>
+						<option value="nc"><?php echo _t('new_category'); ?></option>
+						</select>
+					</li>
+
+					<li class="input" style="display:none">
+						<input type="text" name="new_category[name]" id="new_category_name" autocomplete="off" placeholder="<?php echo _t('new_category'); ?>" />
+					</li>
+
+					<li class="separator"></li>
+
+					<li class="dropdown-header"><?php echo _t('http_authentication'); ?></li>
+					<li class="input">
+						<input type="text" name="http_user" id="http_user_add" autocomplete="off" placeholder="<?php echo _t('username'); ?>" />
+					</li>
+					<li class="input">
+						<input type="password" name="http_pass" id="http_pass_add" autocomplete="off" placeholder="<?php echo _t('password'); ?>" />
+					</li>
+				</ul>
+			</div>
+			<button class="btn" type="submit"><?php echo _i('add'); ?></button>
+		</div>
+	</form>
+
+	<p class="alert alert-warn">
+		<?php echo _t('feeds_moved_category_deleted', $this->default_category->name()); ?>
+	</p>
+
+	<div class="box">
+		<div class="box-title"><label for="new-category"><?php echo _t('add_category'); ?></label></div>
+
+		<ul class="box-content box-content-centered">
+			<form action="<?php echo _url('category', 'create'); ?>" method="post">
+				<li class="item"><input type="text" id="new-category" name="new-category" placeholder="<?php echo _t('new_category'); ?>" /></li>
+				<li class="item"><button class="btn btn-important" type="submit"><?php echo _t('submit'); ?></button></li>
+			</form>
+		</ul>
+	</div>
+
+	<form id="controller-category" method="post" style="display: none;"></form>
+
+	<?php
+		foreach ($this->categories as $cat) {
+			$feeds = $cat->feeds();
+	?>
+	<div class="box">
+		<div class="box-title">
+			<form action="<?php echo _url('category', 'update', 'id', $cat->id()); ?>" method="post">
+				<input type="text" name="name" value="<?php echo $cat->name(); ?>" />
+
+				<div class="dropdown">
+					<div id="dropdown-cat-<?php echo $cat->id(); ?>" class="dropdown-target"></div>
+
+					<a class="dropdown-toggle btn" href="#dropdown-cat-<?php echo $cat->id(); ?>"><?php echo _i('down'); ?></a>
+					<ul class="dropdown-menu">
+						<li class="dropdown-close"><a href="#close">❌</a></li>
+
+						<li class="item"><a href="<?php echo _url('index', 'index', 'get', 'c_' . $cat->id()); ?>"><?php echo _t('filter'); ?></a></li>
+
+						<?php
+							$no_feed = empty($feeds);
+							$is_default = ($cat->id() === $this->default_category->id());
+
+							if (!$no_feed || !$is_default) {
+						?>
+						<li class="separator"></li>
+						<?php } if (!$no_feed) { ?>
+						<li class="item">
+							<button class="as-link confirm"
+							        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
+							        type="submit"
+							        form="controller-category"
+							        formaction="<?php echo _url('category', 'empty', 'id', $cat->id()); ?>">
+							        <?php echo _t('ask_empty'); ?></button>
+						</li>
+						<?php } if (!$is_default) { ?>
+						<li class="item">
+							<button class="as-link confirm"
+							        data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
+							        type="submit"
+							        form="controller-category"
+							        formaction="<?php echo _url('category', 'delete', 'id', $cat->id()); ?>">
+							        <?php echo _t('delete'); ?></button>
+						</li>
+						<?php } ?>
+					</ul>
+				</div>
+			</form>
+		</div>
+
+		<ul class="box-content">
+			<?php if (!empty($feeds)) { ?>
+			<?php
+					foreach ($feeds as $feed) {
+						$error = $feed->inError() ? ' error' : '';
+						$empty = $feed->nbEntries() == 0 ? ' empty' : '';
+			?>
+			<li class="item<?php echo $error, $empty; ?>">
+				<a class="configure open-slider" href="<?php echo _url('subscription', 'feed', 'id', $feed->id()); ?>"><?php echo _i('configure'); ?></a>
+				<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <?php echo $feed->name(); ?>
+			</li>
+			<?php 	}
+				} else {
+			?>
+			<li class="item"><?php echo _t('category_empty'); ?></li>
+			<?php } ?>
+		</ul>
+	</div>
+	<?php } ?>
+</div>
+
+<?php $class = isset($this->feed) ? ' class="active"' : ''; ?>
+<a href="#" id="close-slider"<?php echo $class; ?>></a>
+<div id="slider"<?php echo $class; ?>>
+<?php
+	if (isset($this->feed)) {
+		$this->renderHelper('feed/update');
+	}
+?>
+</div>