diff options
| author | 2021-12-03 00:57:32 +0100 | |
|---|---|---|
| committer | 2021-12-03 00:57:32 +0100 | |
| commit | a54aa19dc7f8cd344cdfb199ee94c01e0b90becc (patch) | |
| tree | bcbfa7efbefaa459accf71dafc02f210e965bc28 | |
| parent | 00dbde68fbaf7da68ccf191c33f2de88d3603aa8 (diff) | |
Fix: double main tags (#4014)
* replace div with main
* include the slider into main
* format source
* add close icon for the extension slider
* replace div with main
* Update shortcut.phtml
* fixed the nits
33 files changed, 105 insertions, 101 deletions
diff --git a/app/install.php b/app/install.php index cd2845fd2..402de91a3 100644 --- a/app/install.php +++ b/app/install.php @@ -678,7 +678,7 @@ if (_t('gen.dir') === 'rtl') { </div> </header> -<main id="global"> +<div id="global"> <nav class="nav nav-list aside"> <div class="nav-header"><?= _t('install.steps') ?></div> <ol> @@ -716,7 +716,7 @@ if (_t('gen.dir') === 'rtl') { </ol> </nav> - <div class="post"> + <main class="post"> <h1><?= _t('install.title') ?>: <?= _t('install.step', STEP + 1) ?></h1> <?php switch (STEP) { @@ -741,8 +741,8 @@ if (_t('gen.dir') === 'rtl') { break; } ?> - </div> -</main> + </main> +</div> <script src="../scripts/install.js?<?= @filemtime(PUBLIC_PATH . '/scripts/install.js') ?>"></script> </body> </html> diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index c5c1d22ff..5cf3e3ae0 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -48,7 +48,7 @@ if (_t('gen.dir') === 'rtl') { $this->partial('header'); ?> -<main id="global"> +<div id="global"> <?php flush(); if (isset($this->callbackBeforeFeeds)) { @@ -56,7 +56,7 @@ if (_t('gen.dir') === 'rtl') { } $this->render(); ?> -</main> +</div> <?php $msg = ''; diff --git a/app/views/auth/formLogin.phtml b/app/views/auth/formLogin.phtml index 05a73f39e..e61aaf922 100644 --- a/app/views/auth/formLogin.phtml +++ b/app/views/auth/formLogin.phtml @@ -1,4 +1,4 @@ -<div class="prompt"> +<main class="prompt"> <h1><?= _t('gen.auth.login') ?></h1> <?php if (!max_registrations_reached()) { ?> @@ -39,4 +39,4 @@ </form> <p><a href="<?= _url('index', 'about') ?>"><?= _t('gen.freshrss.about') ?></a></p> -</div> +</main> diff --git a/app/views/auth/index.phtml b/app/views/auth/index.phtml index 0c7b0a816..9c9cd1eaa 100644 --- a/app/views/auth/index.phtml +++ b/app/views/auth/index.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -77,4 +77,4 @@ </div> </div> </form> -</div> +</main> diff --git a/app/views/auth/register.phtml b/app/views/auth/register.phtml index 3300896e6..7eb2af12f 100644 --- a/app/views/auth/register.phtml +++ b/app/views/auth/register.phtml @@ -1,4 +1,4 @@ -<div class="prompt"> +<main class="prompt"> <h1><?= _t('gen.auth.registration') ?></h1> <form method="post" action="<?= _url('user', 'create') ?>"> @@ -66,4 +66,4 @@ </form> <p><a href="<?= _url('index', 'about') ?>"><?= _t('gen.freshrss.about') ?></a></p> -</div> +</main> diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml index 88b980cd4..fd56c8dde 100644 --- a/app/views/configure/archiving.phtml +++ b/app/views/configure/archiving.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -162,4 +162,4 @@ </div> </div> <?php endif; ?> -</div> +</main> diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml index 1ce4be5cd..96f93a27f 100644 --- a/app/views/configure/display.phtml +++ b/app/views/configure/display.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -209,4 +209,4 @@ </div> </div> </form> -</div> +</main> diff --git a/app/views/configure/integration.phtml b/app/views/configure/integration.phtml index 02a0b6f32..9bd7257ee 100644 --- a/app/views/configure/integration.phtml +++ b/app/views/configure/integration.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -77,4 +77,4 @@ </div> </div> </form> -</div> +</main> diff --git a/app/views/configure/queries.phtml b/app/views/configure/queries.phtml index 2939e068b..6de606639 100644 --- a/app/views/configure/queries.phtml +++ b/app/views/configure/queries.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -56,16 +56,17 @@ </div> <?php } ?> </form> -</div> -<?php $class = $this->displaySlider ? ' class="active"' : ''; ?> -<a href="#" id="close-slider"<?= $class ?>> - <?= _i('close') ?> -</a> -<div id="slider"<?= $class ?>> -<?php - if (isset($this->query)) { - $this->renderHelper('configure/query'); - } -?> -</div> + <?php $class = $this->displaySlider ? ' class="active"' : ''; ?> + <a href="#" id="close-slider"<?= $class ?>> + <?= _i('close') ?> + </a> + <div id="slider"<?= $class ?>> + <?php + if (isset($this->query)) { + $this->renderHelper('configure/query'); + } + ?> + </div> + +</main> diff --git a/app/views/configure/reading.phtml b/app/views/configure/reading.phtml index e19a14067..da4e104a4 100644 --- a/app/views/configure/reading.phtml +++ b/app/views/configure/reading.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -256,4 +256,4 @@ </div> </form> -</div> +</main> diff --git a/app/views/configure/shortcut.phtml b/app/views/configure/shortcut.phtml index b04689d2a..ee671740e 100644 --- a/app/views/configure/shortcut.phtml +++ b/app/views/configure/shortcut.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -243,4 +243,4 @@ </div> </div> </form> -</div> +</main> diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml index 251ffa03a..fa9e11ce2 100644 --- a/app/views/configure/system.phtml +++ b/app/views/configure/system.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -92,4 +92,4 @@ </div> </div> </form> -</div> +</main> diff --git a/app/views/error/index.phtml b/app/views/error/index.phtml index 7ef2219dc..98473cc83 100644 --- a/app/views/error/index.phtml +++ b/app/views/error/index.phtml @@ -1,4 +1,4 @@ -<div class="post"> +<main class="post"> <div class="alert alert-error"> <h1 class="alert-head"><?= $this->code ?></h1> <p> @@ -12,4 +12,4 @@ <?php } ?> </p> </div> -</div> +</main> diff --git a/app/views/extension/index.phtml b/app/views/extension/index.phtml index cd5ccec48..b9ae7a92c 100644 --- a/app/views/extension/index.phtml +++ b/app/views/extension/index.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -66,14 +66,17 @@ </table> </div> <?php } ?> -</div> -<?php $class = isset($this->extension) ? ' class="active"' : ''; ?> -<a href="#" id="close-slider"<?= $class ?>></a> -<div id="slider"<?= $class ?>> -<?php - if (isset($this->extension)) { - $this->renderHelper('extension/configure'); - } -?> -</div> + <?php $class = isset($this->extension) ? ' class="active"' : ''; ?> + <a href="#" id="close-slider"<?= $class ?>> + <?= _i('close') ?> + </a> + <div id="slider"<?= $class ?>> + <?php + if (isset($this->extension)) { + $this->renderHelper('extension/configure'); + } + ?> + </div> + +</main> diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml index 2c9c13345..55cfe0845 100644 --- a/app/views/feed/add.phtml +++ b/app/views/feed/add.phtml @@ -1,5 +1,5 @@ <?php if ($this->feed) { ?> -<div class="post"> +<main class="post"> <h1><?= _t('sub.feed.add') ?></h1> <?php if (!$this->load_ok) { ?> @@ -88,5 +88,5 @@ </div> </div> </form> -</div> +</main> <?php } ?> diff --git a/app/views/importExport/index.phtml b/app/views/importExport/index.phtml index 9e852996f..69e10ea27 100644 --- a/app/views/importExport/index.phtml +++ b/app/views/importExport/index.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_subscription'); ?> -<div class="post "> +<main class="post "> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -69,4 +69,4 @@ </div> </form> <?php } ?> -</div> +</main> diff --git a/app/views/index/about.phtml b/app/views/index/about.phtml index fedf6ff0b..cd8cfcade 100644 --- a/app/views/index/about.phtml +++ b/app/views/index/about.phtml @@ -2,7 +2,7 @@ <?php $this->partial('aside_configure'); ?> <?php } ?> -<div class="post content"> +<main class="post content"> <?php if (FreshRSS_Auth::hasAccess()) {?> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> @@ -28,4 +28,4 @@ <h2><?= _t('index.about.credits') ?></h2> <p><?= _t('index.about.credits_content') ?></p> -</div> +</main> diff --git a/app/views/index/logs.phtml b/app/views/index/logs.phtml index c2b940e5c..bcdc5b073 100644 --- a/app/views/index/logs.phtml +++ b/app/views/index/logs.phtml @@ -1,4 +1,4 @@ -<div class="post content"> +<main class="post content"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -27,4 +27,4 @@ <?php } else { ?> <p class="alert alert-warn"><?= _t('index.log.empty') ?></p> <?php } ?> -</div> +</main> diff --git a/app/views/index/tos.phtml b/app/views/index/tos.phtml index 38dd0add6..f8240ed29 100644 --- a/app/views/index/tos.phtml +++ b/app/views/index/tos.phtml @@ -1,4 +1,4 @@ -<div class="post content"> +<main class="post content"> <?php if ($this->can_register) { ?> <a href="<?= _url('auth', 'register') ?>"> <?= _t('gen.action.back') ?> @@ -10,4 +10,4 @@ <?php } ?> <?= $this->terms_of_service ?> -</div> +</main> diff --git a/app/views/stats/idle.phtml b/app/views/stats/idle.phtml index a8dea1a6f..8efaef5e9 100644 --- a/app/views/stats/idle.phtml +++ b/app/views/stats/idle.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_subscription'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -50,4 +50,4 @@ <span class="alert-head"><?= _t('admin.stats.no_idle') ?></span> </p> <?php } ?> -</div> +</main> diff --git a/app/views/stats/index.phtml b/app/views/stats/index.phtml index dff20041d..26e3f0dbc 100644 --- a/app/views/stats/index.phtml +++ b/app/views/stats/index.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_subscription'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -118,6 +118,6 @@ </div> </div> </div> -</div> +</main> <script src="../scripts/statsWithChartjs.js?<?= @filemtime(PUBLIC_PATH . '/scripts/statsWithChartjs.js') ?>"></script> diff --git a/app/views/stats/repartition.phtml b/app/views/stats/repartition.phtml index 2cf65b3fb..86cc1b6bc 100644 --- a/app/views/stats/repartition.phtml +++ b/app/views/stats/repartition.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_subscription'); ?> -<div class="post "> +<main class="post "> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -102,6 +102,6 @@ </div> </div> </div> -</div> +</main> <script src="../scripts/statsWithChartjs.js?<?= @filemtime(PUBLIC_PATH . '/scripts/statsWithChartjs.js') ?>"></script> diff --git a/app/views/subscription/add.phtml b/app/views/subscription/add.phtml index 04add0b4f..5eff9c5d1 100644 --- a/app/views/subscription/add.phtml +++ b/app/views/subscription/add.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_subscription'); ?> -<div class="post drop-section"> +<main class="post drop-section"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -123,4 +123,4 @@ </div> </div> </form> -</div> +</main> diff --git a/app/views/subscription/bookmarklet.phtml b/app/views/subscription/bookmarklet.phtml index 8d00a29b5..90c349c0b 100644 --- a/app/views/subscription/bookmarklet.phtml +++ b/app/views/subscription/bookmarklet.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_subscription'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -15,4 +15,4 @@ <h2><?= _t('sub.api.title') ?></h2> <p><?= _t('sub.api.documentation') ?></p> <kbd><?= Minz_Url::display(array('c' => 'feed', 'a' => 'add'), 'html', true) ?>&url_rss=%s</kbd> -</div>
\ No newline at end of file +</main> diff --git a/app/views/subscription/index.phtml b/app/views/subscription/index.phtml index fe28ae45d..a8bc9ae27 100644 --- a/app/views/subscription/index.phtml +++ b/app/views/subscription/index.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_subscription'); ?> -<div class="post drop-section"> +<main class="post drop-section"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -73,18 +73,18 @@ </ul> </div> -</div> + <?php $class = $this->displaySlider ? ' class="active"' : ''; ?> + <a href="#" id="close-slider"<?= $class ?>> + <?= _i('close') ?> + </a> + <div id="slider"<?= $class ?>> + <?php + if (isset($this->feed)) { + $this->renderHelper('feed/update'); + } elseif (isset($this->category)) { + $this->renderHelper('category/update'); + } + ?> + </div> -<?php $class = $this->displaySlider ? ' class="active"' : ''; ?> -<a href="#" id="close-slider"<?= $class ?>> - <?= _i('close') ?> -</a> -<div id="slider"<?= $class ?>> -<?php - if (isset($this->feed)) { - $this->renderHelper('feed/update'); - } elseif (isset($this->category)) { - $this->renderHelper('category/update'); - } -?> -</div> +</main> diff --git a/app/views/tag/index.phtml b/app/views/tag/index.phtml index eb6eefdb1..e538f96e2 100644 --- a/app/views/tag/index.phtml +++ b/app/views/tag/index.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_subscription'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -80,4 +80,4 @@ </div> </div> </form> -</div> +</main> diff --git a/app/views/update/apply.phtml b/app/views/update/apply.phtml index b52a31c5b..b96b3f07f 100644 --- a/app/views/update/apply.phtml +++ b/app/views/update/apply.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -8,4 +8,4 @@ <h1><?= _t('admin.update') ?></h1> <?php ask_info_update(); ?> -</div> +</main> diff --git a/app/views/update/checkInstall.phtml b/app/views/update/checkInstall.phtml index 8bca4cace..0e324de4a 100644 --- a/app/views/update/checkInstall.phtml +++ b/app/views/update/checkInstall.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -38,4 +38,4 @@ <?php } ?> */ ?> -</div> +</main> diff --git a/app/views/update/index.phtml b/app/views/update/index.phtml index 1d5c2f5cb..359e35bea 100644 --- a/app/views/update/index.phtml +++ b/app/views/update/index.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -47,4 +47,4 @@ <?php if ($this->update_to_apply) { ?> <a class="btn btn-important" href="<?= _url('update', 'apply') ?>"><?= _t('admin.update.apply') ?></a> <?php } ?> -</div> +</main> diff --git a/app/views/user/details.phtml b/app/views/user/details.phtml index e6271704c..6de1a6097 100644 --- a/app/views/user/details.phtml +++ b/app/views/user/details.phtml @@ -4,7 +4,7 @@ <?php $isAdmin = $this->details['is_admin']; ?> <?php $enabled = $this->details['enabled']; ?> -<div class="post"> +<main class="post"> <a href="<?= _url('user', 'manage'); ?>"><?= _t('admin.user.back_to_manage'); ?></a> <h1><?= $this->username ?><?php if ($isAdmin) echo ' ― ', _t('admin.user.admin'); ?></h1> @@ -84,4 +84,4 @@ <div> </div> </form> -</div> +</main> diff --git a/app/views/user/manage.phtml b/app/views/user/manage.phtml index 3da4cf299..ae66e4b2f 100644 --- a/app/views/user/manage.phtml +++ b/app/views/user/manage.phtml @@ -1,6 +1,6 @@ <?php $this->partial('aside_configure'); ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -108,4 +108,4 @@ </tbody> </table> </div> -</div> +</main> diff --git a/app/views/user/profile.phtml b/app/views/user/profile.phtml index a7f38e69d..39b138c78 100644 --- a/app/views/user/profile.phtml +++ b/app/views/user/profile.phtml @@ -4,7 +4,7 @@ } ?> -<div class="post"> +<main class="post"> <div class="link-back-wrapper"> <a class="link-back" href="<?= _url('index', 'index') ?>"><?= _t('gen.action.back_to_rss_feeds') ?></a> </div> @@ -133,4 +133,4 @@ </div> </form> <?php } ?> -</div> +</main> diff --git a/app/views/user/validateEmail.phtml b/app/views/user/validateEmail.phtml index e525b1b6b..31c19f738 100644 --- a/app/views/user/validateEmail.phtml +++ b/app/views/user/validateEmail.phtml @@ -1,4 +1,4 @@ -<div class="post"> +<main class="post"> <p> <?= _t('user.email.validation.need_to', FreshRSS_Context::$system_conf->title) ?> </p> @@ -19,4 +19,4 @@ <?= _t('user.email.validation.change_email', _url('user', 'profile')) ?> </small> </p> -</div> +</main> |
