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>

2 files changed, 44 insertions, 26 deletions

diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml
index a2ab7a938..085b49aa6 100644
--- a/app/views/helpers/category/update.phtml
+++ b/app/views/helpers/category/update.phtml
@@ -7,6 +7,7 @@
 
 	<form method="post" action="<?= _url('subscription', 'category', 'id', $this->category->id()) ?>" autocomplete="off">
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
+
 		<legend><?= _t('sub.category.information') ?></legend>
 		<div class="form-group">
 			<label class="group-name" for="name"><?= _t('sub.category.title') ?></label>
@@ -28,16 +29,8 @@
 		<div class="form-group form-actions">
 			<div class="group-controls">
 				<button class="btn btn-important"><?= _t('gen.action.submit') ?></button>
-				<button class="btn btn-attention confirm"
-					data-str-confirm="<?= _t('gen.js.confirm_action_feed_cat') ?>"
-					formaction="<?= _url('category', 'empty', 'id', $this->category->id()) ?>"
-					formmethod="post"><?= _t('gen.action.empty') ?></button>
-				<?php if (!$this->category->isDefault()): ?>
-				<button class="btn btn-attention confirm"
-					data-str-confirm="<?= _t('gen.js.confirm_action_feed_cat') ?>"
-					formaction="<?= _url('category', 'delete', 'id', $this->category->id()) ?>"
-					formmethod="post"><?= _t('gen.action.remove') ?></button>
-				<?php endif;?>
+				<button type="reset" class="btn"><?= _t('gen.action.cancel') ?></button>
+				
 			</div>
 		</div>
 
@@ -165,5 +158,25 @@
 				<button type="reset" class="btn"><?= _t('gen.action.cancel') ?></button>
 			</div>
 		</div>
+
+		<?php if (!$this->category->isDefault()): ?>
+		<p class="alert alert-warn">
+			<?= _t('sub.feed.moved_category_deleted', $this->default_category->name()) ?>
+		</p>
+		<?php endif;?>
+		<div class="form-group form-actions">
+			<div class="group-controls">
+				<button class="btn btn-attention confirm"
+					data-str-confirm="<?= _t('gen.js.confirm_action_feed_cat') ?>"
+					formaction="<?= _url('category', 'empty', 'id', $this->category->id()) ?>"
+					formmethod="post"><?= _t('gen.action.empty') ?></button>
+				<?php if (!$this->category->isDefault()): ?>
+				<button class="btn btn-attention confirm"
+					data-str-confirm="<?= _t('gen.js.confirm_action_feed_cat') ?>"
+					formaction="<?= _url('category', 'delete', 'id', $this->category->id()) ?>"
+					formmethod="post"><?= _t('gen.action.remove') ?></button>
+				<?php endif;?>
+			</div>
+		</div>
 	</form>
 </div>
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"' : ''; ?>