From 3623a5421df8198651d8e8a9d676f0661c307cf9 Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
Date: Tue, 19 Oct 2021 15:08:32 +0200
Subject: enhancement subscription management page (#3893)

* wip

* wip2

* i18n

* Update app/views/helpers/category/update.phtml

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>

* fixed box layout

* Revert "i18n"

This reverts commit a2e4d8ace661df806997a8310f069a67d71910f4.

* i18n

This reverts commit 55236930cfc7165ff883ea2a9538d3502b8922eb.

Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
---
 app/views/subscription/index.phtml | 37 +++++++++++++++++++++----------------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'app/views/subscription/index.phtml')

diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index 0d58b5436..fe28ae45d 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -7,25 +7,28 @@
 
 	<h1><?= _t('sub.title') ?></h1>
 
-	<p class="alert alert-warn">
-		<?= _t('sub.feed.moved_category_deleted', $this->default_category->name()) ?>
-	</p>
-
-	<p class="alert alert-warn">
-		<?= _t('sub.add', _url('subscription', 'add')) ?>
-	</p>
-
 	<?php if ($this->onlyFeedsWithError): ?>
-	<p class="alert alert-warn">
+	<div class="link-showAllFeeds-wrapper">
+		<a href="<?= _url('subscription', 'index') ?>">← <?= _t('sub.feed.show.all') ?></a>
+	</div>
+		<p class="alert alert-warn">
 		<?= _t('sub.feed.showing.error') ?>
 	</p>
+	
 	<?php endif; ?>
 
+	<?php if (!$this->onlyFeedsWithError && $this->signalError){ ?>
+		<div>
+			<a class="btn" href="<?= _url('subscription', 'index', 'error', 1) ?>"><?= _i('look') ?> <?= _t('sub.feed.show.error') ?></a>
+		</div>
+	<?php } ?>
+
 	<form id="controller-category" method="post" aria-hidden="true">
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 	</form>
 
 	<?php
+		$signalError = false;
 		foreach ($this->categories as $cat) {
 			$feeds = $cat->feeds();
 	?>
@@ -57,17 +60,19 @@
 			?>
 			<li class="item feed disabled" dropzone="move"><div class="alert-warn"><?= _t('sub.category.empty') ?></div></li>
 			<?php } ?>
+			<li class="item feed">✚ <a href="<?= _url('subscription', 'add') ?>"><?= _t('sub.feed.add') ?></a></li>
 		</ul>
 	</div>
 	<?php } ?>
 
-	<ul>
-		<?php if ($this->onlyFeedsWithError): ?>
-		<li><a href="<?= _url('subscription', 'index') ?>"><?= _t('sub.feed.show.all') ?></a></li>
-		<?php else: ?>
-		<li><a href="<?= _url('subscription', 'index', 'error', 1) ?>"><?= _t('sub.feed.show.error') ?></a></li>
-		<?php endif; ?>
-	</ul>
+	<div class="box visible-semi">
+		<div class="box-title">
+			✚ <a href="<?= _url('subscription', 'add') ?>"><?= _t('sub.category.add') ?></a>
+		</div>
+		<ul class="box-content">
+		</ul>
+	</div>
+
 </div>
 
 <?php $class = $this->displaySlider ? ' class="active"' : ''; ?>
-- 
cgit v1.2.3