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/helpers/category/update.phtml | 33 +++++++++++++++++++++++----------
 1 file changed, 23 insertions(+), 10 deletions(-)

(limited to 'app/views/helpers')

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>
-- 
cgit v1.2.3