From 9712e4d888420a348c10157b2d3293848c02fde8 Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
Date: Sat, 11 Sep 2021 18:22:26 +0200
Subject: Headline structure improvement (#3830)

* header: h1 deleted - full logo included

* template: config - display

* WIP

* shortcut configs. added fieldset. do not display the border by default

* system.phtml

* subscription: add feed or category

* wip

* wip

* Update bookmarklet.phtml

* Update archiving.phtml

* Update queries.phtml

* Update profile.phtml

* Update manage.phtml

* auth+update

* Update template.rtl.css

* fixed FreshRSS logo (Theme: Mapco)

* Update mapco.rtl.css

* Update _layout.scss

* fixed FreshRSS logo (theme: Dark)

* fix: FreshRSS logo (Theme: BlueLagoon)

* fix: FreshRSS logo (Theme: Ansum)

* fixed: FreshRSS logo (Theme: Alternative Dark)

* fix: FreshRSS logo (Theme: Pafat)

* fix: FreshRSS logo (Theme: Screwdriver)

* fix: FreshRSS logo (theme: Swage)

* Minor lint

* little fix: FreshRSS logo (Theme: Origine)

* Fix: FreshRSS logo (Theme: Origine Compact)

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
---
 app/views/subscription/add.phtml         | 8 ++++----
 app/views/subscription/bookmarklet.phtml | 1 +
 app/views/subscription/index.phtml       | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'app/views/subscription')

diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml
index 70b9267aa..65279bfc5 100644
--- a/app/views/subscription/add.phtml
+++ b/app/views/subscription/add.phtml
@@ -5,9 +5,9 @@
 		<a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
 	</div>
 
-	
+	<h1><?= _t('sub.menu.add') ?></h1>
+	<h2><?= _t('sub.title.add_category') ?></h2>
 	<form action="<?= _url('category', 'create') ?>" method="post">
-		<legend><?= _t('sub.title.add_category') ?></legend>
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 		<div class="form-group">
 			<label class="group-name" for="new-category"><?= _t('sub.category') ?></label>
@@ -23,9 +23,9 @@
 		</div>
 	</form>
 
-	
+	<h2><?= _t('sub.title.add_feed') ?></h2>
 	<form id="add_rss" method="post" action="<?= _url('feed', 'add') ?>" autocomplete="off">
-		<legend><?= _t('sub.title.add_feed') ?></legend>
+		
 		<input type="hidden" name="_csrf" value="<?= FreshRSS_Auth::csrfToken() ?>" />
 
 		<div class="form-group">
diff --git a/app/views/subscription/bookmarklet.phtml b/app/views/subscription/bookmarklet.phtml
index 8fd55de31..8d00a29b5 100644
--- a/app/views/subscription/bookmarklet.phtml
+++ b/app/views/subscription/bookmarklet.phtml
@@ -5,6 +5,7 @@
 		<a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
 	</div>
 
+	<h1><?= _t('sub.menu.subscription_tools') ?></h1>
 	<h2><?= _t('sub.bookmarklet.title') ?></h2>
 	<p><a class="btn btn-important"
 		href="javascript:(function(){var%20url%20=%20location.href;var%20otherWindow=window.open('about:blank','_blank');otherWindow.opener=null;otherWindow.location='<?=
diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml
index ff0684a9f..9cbac1bbb 100644
--- a/app/views/subscription/index.phtml
+++ b/app/views/subscription/index.phtml
@@ -5,7 +5,7 @@
 		<a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a>
 	</div>
 
-	<h2><?= _t('sub.title') ?></h2>
+	<h1><?= _t('sub.title') ?></h1>
 
 	<p class="alert alert-warn">
 		<?= _t('sub.feed.moved_category_deleted', $this->default_category->name()) ?>
-- 
cgit v1.2.3