From ab0285b0aa05574ae864bef590ffd6ea36f0c50a Mon Sep 17 00:00:00 2001
From: maTh <math-home@web.de>
Date: Wed, 21 Jul 2021 22:42:04 +0200
Subject: Add HTML5 tags (#3651)

* use HTML5 tags #3643

added some HTML5 tags: header, main, nav

* <main> into <div>

as dicussed in the PR.
Todo: check side effects (f.e. threepaneview extension)

* fixed whitespace with tabs

* fixed more whitespaces with tabs

it was not my fault, but I fixed it

* added empty lines as wished

* Update app/views/index/global.phtml

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>

* Update app/views/index/global.phtml

* Update app/views/index/global.phtml

* Update app/views/index/global.phtml

* Update app/views/index/global.phtml

* Update app/views/index/global.phtml

* Update app/views/index/global.phtml

Co-authored-by: Alexandre Alapetite <alexandre@alapetite.fr>
Co-authored-by: Frans de Jonge <fransdejonge@gmail.com>
---
 app/views/index/global.phtml | 4 ++--
 app/views/index/normal.phtml | 8 ++++----
 app/views/index/reader.phtml | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'app/views/index')

diff --git a/app/views/index/global.phtml b/app/views/index/global.phtml
index e286d0946..4323e3849 100644
--- a/app/views/index/global.phtml
+++ b/app/views/index/global.phtml
@@ -9,7 +9,7 @@
 	}
 ?>
 
-<div id="stream" class="global<?= $class ?>">
+<main id="stream" class="global<?= $class ?>">
 <?php
 	$params = Minz_Request::fetchGET();
 	unset($params['c']);
@@ -50,7 +50,7 @@
 		}
 	}
 ?>
-</div>
+</main>
 
 <div id="overlay">
 	<a class="close" href="#"><?= _i('close') ?></a>
diff --git a/app/views/index/normal.phtml b/app/views/index/normal.phtml
index 3077d79f2..418c44111 100644
--- a/app/views/index/normal.phtml
+++ b/app/views/index/normal.phtml
@@ -14,7 +14,7 @@ $content_width = FreshRSS_Context::$user_conf->content_width;
 $today = @strtotime('today');
 ?>
 
-<div id="stream" class="normal<?= $hidePosts ? ' hide_posts' : '' ?>">
+<main id="stream" class="normal<?= $hidePosts ? ' hide_posts' : '' ?>">
 	<div id="new-article">
 		<a href="<?= Minz_Url::display(Minz_Request::currentRequest()) ?>"><?= _t('gen.js.new_article'); /* TODO: move string in JS*/ ?></a>
 	</div><?php
@@ -110,14 +110,14 @@ $today = @strtotime('today');
 	if ($nbEntries > 0):
 		call_user_func($this->callbackBeforePagination, $this, $nbEntries, $lastEntry);
 		$this->renderHelper('pagination');
-?></div><?php
+?></main><?php
 	else:
 		ob_end_clean();	//Discard the articles headers, as we have no articles
 ?>
-<div id="stream" class="prompt alert alert-warn normal">
+<main id="stream" class="prompt alert alert-warn normal">
 	<h2><?= _t('index.feed.empty') ?></h2>
 	<a href="<?= _url('subscription', 'add') ?>"><?= _t('index.feed.add') ?></a><br /><br />
-</div>
+</main>
 <?php endif; ?>
 
 <?php if ($nbEntries > 0 && FreshRSS_Context::$user_conf->show_nav_buttons) $this->partial('nav_entries'); ?>
diff --git a/app/views/index/reader.phtml b/app/views/index/reader.phtml
index 0b1288ae6..8183a67e7 100644
--- a/app/views/index/reader.phtml
+++ b/app/views/index/reader.phtml
@@ -7,8 +7,8 @@ call_user_func($this->callbackBeforeEntries, $this);
 $lazyload = FreshRSS_Context::$user_conf->lazyload;
 $content_width = FreshRSS_Context::$user_conf->content_width;
 ?>
+<main id="stream" class="reader">
 
-<div id="stream" class="reader">
 	<div id="new-article">
 		<a href="<?= Minz_Url::display(Minz_Request::currentRequest()) ?>"><?= _t('gen.js.new_article'); /* TODO: move string in JS*/ ?></a>
 	</div><?php
@@ -76,12 +76,12 @@ $content_width = FreshRSS_Context::$user_conf->content_width;
 	if ($nbEntries > 0):
 		call_user_func($this->callbackBeforePagination, $this, $nbEntries, $lastEntry);
 		$this->renderHelper('pagination');
-?></div><?php
+?></main><?php
 	else:
 		ob_end_clean();	//Discard the articles headers, as we have no articles
 ?>
-<div id="stream" class="prompt alert alert-warn reader">
+<main id="stream" class="prompt alert alert-warn reader">
 	<h2><?= _t('index.feed.empty') ?></h2>
 	<a href="<?= _url('subscription', 'add') ?>"><?= _t('index.feed.add') ?></a><br /><br />
-</div>
+</main>
 <?php endif; ?>
-- 
cgit v1.2.3