From 6bd6494ad48c4894befed44e9c3f753c123aca5d Mon Sep 17 00:00:00 2001 From: maTh <1645099+math-GH@users.noreply.github.com> Date: Sun, 17 Mar 2024 22:49:12 +0100 Subject: fixed HTML:
+ (#6202) * legend tags cleaned * formgroup -> fieldset tag * add bookmarklet class * Update logs.phtml * Update logs.phtml * fixed log table text alignment --- app/views/configure/integration.phtml | 20 +- app/views/configure/system.phtml | 2 +- app/views/feed/add.phtml | 118 ++-- app/views/helpers/category/update.phtml | 395 +++++++------- app/views/helpers/configure/query.phtml | 214 ++++---- app/views/helpers/feed/update.phtml | 936 ++++++++++++++++---------------- app/views/index/logs.phtml | 86 ++- app/views/tag/update.phtml | 48 +- app/views/user/profile.phtml | 2 +- 9 files changed, 925 insertions(+), 896 deletions(-) (limited to 'app/views') diff --git a/app/views/configure/integration.phtml b/app/views/configure/integration.phtml index 973ee128f..7d4cfd765 100644 --- a/app/views/configure/integration.phtml +++ b/app/views/configure/integration.phtml @@ -13,7 +13,7 @@
update($share_options); ?> - +
name(true) ?> @@ -110,13 +110,11 @@ - +
- - - - +
+
@@ -132,7 +130,7 @@
- +
diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml index 809b869a9..bd1c91fd1 100644 --- a/app/views/configure/system.phtml +++ b/app/views/configure/system.phtml @@ -74,7 +74,7 @@
- +

diff --git a/app/views/feed/add.phtml b/app/views/feed/add.phtml index da3bcf844..ceec0d7b6 100644 --- a/app/views/feed/add.phtml +++ b/app/views/feed/add.phtml @@ -3,7 +3,7 @@ /** @var FreshRSS_View $this */ if ($this->feed !== null) { ?> -
+

load_ok) { ?> @@ -12,76 +12,82 @@ - - load_ok) { ?> -
- -
- +
+ + load_ok) { ?> +
+ +
+ +
-
- feed->description(); if ($desc != '') { ?> -
- -
- + feed->description(); if ($desc != '') { ?> +
+ +
+ +
-
- + -
- -
-
- - +
+ +
+
+ + +
-
- + -
- -
-
- - +
+ +
+
+ + +
+
+
-
-
-
-
- -
- +
+ +
+ +
-
+
- - feed->httpAuth(false); ?> -
- -
- -

+
+ + feed->httpAuth(false); ?> +
+ +
+ +

+
- -
-
- - +
+ +
+
+ + +
-
+
diff --git a/app/views/helpers/category/update.phtml b/app/views/helpers/category/update.phtml index b3f92b449..7c0105b5f 100644 --- a/app/views/helpers/category/update.phtml +++ b/app/views/helpers/category/update.phtml @@ -17,224 +17,231 @@ - - -
- -
- category->id() === FreshRSS_CategoryDAO::DEFAULTCATEGORYID ? 'readonly="readonly"' : '' - ?> /> +
+ +
+ +
+ category->id() === FreshRSS_CategoryDAO::DEFAULTCATEGORYID ? 'readonly="readonly"' : '' + ?> /> +
-
-
- -
- -

+
+ +
+ +

+
-
-
-
- - +
+
+ + +
-
+ category->isDefault()): ?> - -
- -
-
- - - -
-

-

-
-
-
-
- - - -
-
+
+ +
+ +
+
+ + + +
+

+

+
+
+
+
+ + + +
+
+
- -
- -
- -

+
+ +
+ +
+ +

+
-
-
-
- - +
+
+ + +
-
+ - - category->attributeArray('archiving'); - /** @var array<'default'?:bool,'keep_period'?:string,'keep_max'?:int,'keep_min'?:int,'keep_favourites'?:bool,'keep_labels'?:bool,'keep_unreads'?:bool>|null $archiving */ - if (empty($archiving)) { - $archiving = [ 'default' => true ]; - } else { - $archiving['default'] = false; - } - $volatile = [ - 'enable_keep_period' => false, - 'keep_period_count' => '3', - 'keep_period_unit' => 'P1M', - ]; - if (!empty($archiving['keep_period']) && is_string($archiving['keep_period'])) { - if (preg_match('/^PT?(?P\d+)[YMWDH]$/', $archiving['keep_period'], $matches)) { - $volatile['enable_keep_period'] = true; - $volatile['keep_period_count'] = $matches['count']; - $volatile['keep_period_unit'] = str_replace($matches['count'], '1', $archiving['keep_period']); +
+ + category->attributeArray('archiving'); + /** @var array<'default'?:bool,'keep_period'?:string,'keep_max'?:int,'keep_min'?:int,'keep_favourites'?:bool,'keep_labels'?:bool,'keep_unreads'?:bool>|null $archiving */ + if (empty($archiving)) { + $archiving = [ 'default' => true ]; + } else { + $archiving['default'] = false; + } + $volatile = [ + 'enable_keep_period' => false, + 'keep_period_count' => '3', + 'keep_period_unit' => 'P1M', + ]; + if (!empty($archiving['keep_period']) && is_string($archiving['keep_period'])) { + if (preg_match('/^PT?(?P\d+)[YMWDH]$/', $archiving['keep_period'], $matches)) { + $volatile['enable_keep_period'] = true; + $volatile['keep_period_count'] = $matches['count']; + $volatile['keep_period_unit'] = str_replace($matches['count'], '1', $archiving['keep_period']); + } + } + //Defaults + if (!isset($archiving['keep_max']) || !is_int($archiving['keep_max'])) { + $archiving['keep_max'] = 0; } - } - //Defaults - if (!isset($archiving['keep_max']) || !is_int($archiving['keep_max'])) { - $archiving['keep_max'] = 0; - } - if (!isset($archiving['keep_min']) || !is_int($archiving['keep_min'])) { - $archiving['keep_min'] = 50; - } - if (!isset($archiving['keep_favourites']) || !is_bool($archiving['keep_favourites'])) { - $archiving['keep_favourites'] = true; - } - if (!isset($archiving['keep_labels']) || !is_bool($archiving['keep_labels'])) { - $archiving['keep_labels'] = true; - } - if (!isset($archiving['keep_unreads']) || !is_bool($archiving['keep_unreads'])) { - $archiving['keep_unreads'] = false; - } - ?> + if (!isset($archiving['keep_min']) || !is_int($archiving['keep_min'])) { + $archiving['keep_min'] = 50; + } + if (!isset($archiving['keep_favourites']) || !is_bool($archiving['keep_favourites'])) { + $archiving['keep_favourites'] = true; + } + if (!isset($archiving['keep_labels']) || !is_bool($archiving['keep_labels'])) { + $archiving['keep_labels'] = true; + } + if (!isset($archiving['keep_unreads']) || !is_bool($archiving['keep_unreads'])) { + $archiving['keep_unreads'] = false; + } + ?> -

- -

+

+ +

-
- -
- +
+ +
+ +
-
-
diff --git a/app/views/helpers/configure/query.phtml b/app/views/helpers/configure/query.phtml index 49ffbad87..cce398542 100644 --- a/app/views/helpers/configure/query.phtml +++ b/app/views/helpers/configure/query.phtml @@ -22,120 +22,124 @@
- -
-
- - query->sharedUrlRss() !== ''): ?> - - -
-
- - query->sharedUrlOpml() !== ''): ?> -
    -
    • -
- +
+ +
+
+ + query->sharedUrlRss() !== ''): ?> + + +
+
+ + query->sharedUrlOpml() !== ''): ?> +
    +
    • +
+ +
+

+

-

-

-
-
-
- +
+
+ +
-
+ - -
- -
- -

+
+ +
+ +
+ +

+
-
-
- -
- - - - +
+ +
+ + + + +
-
-
- -
- +
+ +
+ +
-
-
- -
- +
+ +
+ +
-
-
-
- - +
+
+ + +
-
+
diff --git a/app/views/helpers/feed/update.phtml b/app/views/helpers/feed/update.phtml index 9d3aa59fa..ba91030bd 100644 --- a/app/views/helpers/feed/update.phtml +++ b/app/views/helpers/feed/update.phtml @@ -34,381 +34,390 @@ ?>
- -
- -
- -
-
-
- -
- +
+ +
+ +
+ +
-
-
- -
-
- - +
+ +
+
-
-
- -
-
- - +
+ +
+
+ + +
-
-
-
- -
- +
+ +
+
+ + +
+ +
-
-
- -
- - +
+ +
+ +
-
- -
- -
- - +
+ +
+ + +
-
- feed->pubSubHubbubEnabled()) { ?>
+
-
- -
-
- - - feed->id()); - } else { - $url = _url('feed', 'delete', 'id', $this->feed->id(), 'from', $from); - } - ?> - + feed->pubSubHubbubEnabled()) { ?> +
+
+ +
+
+ + +
+
+ + + feed->id()); + } else { + $url = _url('feed', 'delete', 'id', $this->feed->id(), 'from', $from); + } + ?> + +
-
+ - - feed->httpAuth(false); ?> -
- -
- -

+
+ + feed->httpAuth(false); ?> +
+ +
+ +

+
-
-
- -
-
- - +
+ +
+
+ + +
-
-
-
- - +
+
+ + +
-
+ - -
- -
- +
+ +
+ +
+ +
-
-
- -
- - +
+ +
+ + +
-
-
- -
- - +
+ +
+ + +
-
-
- -
- - +
+ +
+ + +
-
-
- -
- -

+
+ +
+ +

+
-
-
- -
- +
+ +
+ +
-
-
-
- - +
+
+ + +
-
- - + -
-
- - - - +
+ +
+
+ + + + +
-
- feed->attributeArray('archiving'); - /** @var array<'default'?:bool,'keep_period'?:string,'keep_max'?:int,'keep_min'?:int,'keep_favourites'?:bool,'keep_labels'?:bool,'keep_unreads'?:bool>|null $archiving */ - if (empty($archiving)) { - $archiving = [ 'default' => true ]; - } else { - $archiving['default'] = false; - } - $volatile = [ - 'enable_keep_period' => false, - 'keep_period_count' => '3', - 'keep_period_unit' => 'P1M', - ]; - if (!empty($archiving['keep_period']) && is_string($archiving['keep_period'])) { - if (preg_match('/^PT?(?P\d+)[YMWDH]$/', $archiving['keep_period'], $matches)) { - $volatile['enable_keep_period'] = true; - $volatile['keep_period_count'] = $matches['count']; - $volatile['keep_period_unit'] = str_replace($matches['count'], '1', $archiving['keep_period']); + feed->attributeArray('archiving'); + /** @var array<'default'?:bool,'keep_period'?:string,'keep_max'?:int,'keep_min'?:int,'keep_favourites'?:bool,'keep_labels'?:bool,'keep_unreads'?:bool>|null $archiving */ + if (empty($archiving)) { + $archiving = [ 'default' => true ]; + } else { + $archiving['default'] = false; + } + $volatile = [ + 'enable_keep_period' => false, + 'keep_period_count' => '3', + 'keep_period_unit' => 'P1M', + ]; + if (!empty($archiving['keep_period']) && is_string($archiving['keep_period'])) { + if (preg_match('/^PT?(?P\d+)[YMWDH]$/', $archiving['keep_period'], $matches)) { + $volatile['enable_keep_period'] = true; + $volatile['keep_period_count'] = $matches['count']; + $volatile['keep_period_unit'] = str_replace($matches['count'], '1', $archiving['keep_period']); + } + } + //Defaults + if (!isset($archiving['keep_max']) || !is_int($archiving['keep_max'])) { + $archiving['keep_max'] = 0; + } + if (!isset($archiving['keep_min']) || !is_int($archiving['keep_min'])) { + $archiving['keep_min'] = 50; + } + if (!isset($archiving['keep_favourites']) || !is_bool($archiving['keep_favourites'])) { + $archiving['keep_favourites'] = true; + } + if (!isset($archiving['keep_labels']) || !is_bool($archiving['keep_labels'])) { + $archiving['keep_labels'] = true; } - } - //Defaults - if (!isset($archiving['keep_max']) || !is_int($archiving['keep_max'])) { - $archiving['keep_max'] = 0; - } - if (!isset($archiving['keep_min']) || !is_int($archiving['keep_min'])) { - $archiving['keep_min'] = 50; - } - if (!isset($archiving['keep_favourites']) || !is_bool($archiving['keep_favourites'])) { - $archiving['keep_favourites'] = true; - } - if (!isset($archiving['keep_labels']) || !is_bool($archiving['keep_labels'])) { - $archiving['keep_labels'] = true; - } - if (!isset($archiving['keep_unreads']) || !is_bool($archiving['keep_unreads'])) { - $archiving['keep_unreads'] = false; - } - ?> - -

- -

- -
-
-
- + if (!isset($archiving['keep_unreads']) || !is_bool($archiving['keep_unreads'])) { + $archiving['keep_unreads'] = false; + } + ?> + +

+ +

+ +
+
+
+ +
-
-