From a54aa19dc7f8cd344cdfb199ee94c01e0b90becc Mon Sep 17 00:00:00 2001 From: maTh Date: Fri, 3 Dec 2021 00:57:32 +0100 Subject: 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 --- app/install.php | 8 ++++---- app/layout/layout.phtml | 4 ++-- app/views/auth/formLogin.phtml | 4 ++-- app/views/auth/index.phtml | 4 ++-- app/views/auth/register.phtml | 4 ++-- app/views/configure/archiving.phtml | 4 ++-- app/views/configure/display.phtml | 4 ++-- app/views/configure/integration.phtml | 4 ++-- app/views/configure/queries.phtml | 27 ++++++++++++++------------- app/views/configure/reading.phtml | 4 ++-- app/views/configure/shortcut.phtml | 4 ++-- app/views/configure/system.phtml | 4 ++-- app/views/error/index.phtml | 4 ++-- app/views/extension/index.phtml | 25 ++++++++++++++----------- app/views/feed/add.phtml | 4 ++-- app/views/importExport/index.phtml | 4 ++-- app/views/index/about.phtml | 4 ++-- app/views/index/logs.phtml | 4 ++-- app/views/index/tos.phtml | 4 ++-- app/views/stats/idle.phtml | 4 ++-- app/views/stats/index.phtml | 4 ++-- app/views/stats/repartition.phtml | 4 ++-- app/views/subscription/add.phtml | 4 ++-- app/views/subscription/bookmarklet.phtml | 4 ++-- app/views/subscription/index.phtml | 30 +++++++++++++++--------------- app/views/tag/index.phtml | 4 ++-- app/views/update/apply.phtml | 4 ++-- app/views/update/checkInstall.phtml | 4 ++-- app/views/update/index.phtml | 4 ++-- app/views/user/details.phtml | 4 ++-- app/views/user/manage.phtml | 4 ++-- app/views/user/profile.phtml | 4 ++-- app/views/user/validateEmail.phtml | 4 ++-- 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') { -
+
-
+

:

-
-
+ + 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'); ?> -
+
callbackBeforeFeeds)) { @@ -56,7 +56,7 @@ if (_t('gen.dir') === 'rtl') { } $this->render(); ?> -
+ +

@@ -39,4 +39,4 @@

- +
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 @@ partial('aside_configure'); ?> -
+
@@ -77,4 +77,4 @@
- + 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 @@ -
+

@@ -66,4 +66,4 @@

-
+ 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 @@ partial('aside_configure'); ?> -
+
@@ -162,4 +162,4 @@
- + 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 @@ partial('aside_configure'); ?> -
+
@@ -209,4 +209,4 @@
- + 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 @@ partial('aside_configure'); ?> -
+
@@ -77,4 +77,4 @@
- + 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 @@ partial('aside_configure'); ?> -
+
@@ -56,16 +56,17 @@
- -displaySlider ? ' class="active"' : ''; ?> -> - - -
> -query)) { - $this->renderHelper('configure/query'); - } -?> -
+ displaySlider ? ' class="active"' : ''; ?> + > + + +
> + query)) { + $this->renderHelper('configure/query'); + } + ?> +
+ + 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 @@ partial('aside_configure'); ?> -
+
@@ -256,4 +256,4 @@
- + 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 @@ partial('aside_configure'); ?> -
+
@@ -243,4 +243,4 @@
- + 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 @@ partial('aside_configure'); ?> -
+
@@ -92,4 +92,4 @@
- + 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 @@ -
+

code ?>

@@ -12,4 +12,4 @@

-
+ 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 @@ partial('aside_configure'); ?> -
+
@@ -66,14 +66,17 @@
- -extension) ? ' class="active"' : ''; ?> -> -
> -extension)) { - $this->renderHelper('extension/configure'); - } -?> -
+ extension) ? ' class="active"' : ''; ?> + > + + +
> + extension)) { + $this->renderHelper('extension/configure'); + } + ?> +
+ + 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 @@ feed) { ?> -
+

load_ok) { ?> @@ -88,5 +88,5 @@
- + 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 @@ partial('aside_subscription'); ?> -
+
@@ -69,4 +69,4 @@
- + 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 @@ partial('aside_configure'); ?> -
+
+
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 @@ -
+
@@ -27,4 +27,4 @@

-
+ 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 @@ -
+
can_register) { ?> @@ -10,4 +10,4 @@ terms_of_service ?> -
+ 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 @@ partial('aside_subscription'); ?> -
+
@@ -50,4 +50,4 @@

-
+ 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 @@ partial('aside_subscription'); ?> -
+
@@ -118,6 +118,6 @@
- + 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 @@ partial('aside_subscription'); ?> -
+
@@ -102,6 +102,6 @@
- + 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 @@ partial('aside_subscription'); ?> -
+
@@ -123,4 +123,4 @@
- + 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 @@ partial('aside_subscription'); ?> -
+
@@ -15,4 +15,4 @@

'feed', 'a' => 'add'), 'html', true) ?>&url_rss=%s -
\ No newline at end of file + 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 @@ partial('aside_subscription'); ?> -
+
@@ -73,18 +73,18 @@
- + displaySlider ? ' class="active"' : ''; ?> + > + + +
> + feed)) { + $this->renderHelper('feed/update'); + } elseif (isset($this->category)) { + $this->renderHelper('category/update'); + } + ?> +
-displaySlider ? ' class="active"' : ''; ?> -> - - -
> -feed)) { - $this->renderHelper('feed/update'); - } elseif (isset($this->category)) { - $this->renderHelper('category/update'); - } -?> -
+ 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 @@ partial('aside_subscription'); ?> -
+
@@ -80,4 +80,4 @@
- + 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 @@ partial('aside_configure'); ?> -
+
@@ -8,4 +8,4 @@

-
+ 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 @@ partial('aside_configure'); ?> -
+
@@ -38,4 +38,4 @@ */ ?> -
+ 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 @@ partial('aside_configure'); ?> -
+
@@ -47,4 +47,4 @@ update_to_apply) { ?> -
+ 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 @@ details['is_admin']; ?> details['enabled']; ?> -
+

username ?>

@@ -84,4 +84,4 @@
-
+ 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 @@ partial('aside_configure'); ?> -
+
@@ -108,4 +108,4 @@
- + 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 @@ } ?> -
+
@@ -133,4 +133,4 @@
- + 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 @@ -
+

title) ?>

@@ -19,4 +19,4 @@

-
+ -- cgit v1.2.3