From 2d52fa1046faf1b8d81304e35fc24a7874315e6e Mon Sep 17 00:00:00 2001 From: Yassine Doghri Date: Thu, 12 Oct 2023 15:52:20 +0000 Subject: [PATCH] fix: reorder podcast form fields + extract sync feeds to its own form - update fields' styling - update icons contents --- app/Helpers/components_helper.php | 2 +- app/Resources/icons/account-circle.svg | 7 +-- app/Resources/icons/add-box.svg | 7 +-- app/Resources/icons/add.svg | 7 +-- app/Resources/icons/alert.svg | 7 +-- app/Resources/icons/arrow-left.svg | 7 +-- app/Resources/icons/arrow-right.svg | 7 +-- app/Resources/icons/at.svg | 7 +-- app/Resources/icons/bold.svg | 7 +-- app/Resources/icons/bookmark.svg | 6 -- app/Resources/icons/calendar.svg | 7 +-- app/Resources/icons/caret-down.svg | 7 +-- app/Resources/icons/caret-right.svg | 7 +-- app/Resources/icons/chat.svg | 7 +-- app/Resources/icons/check.svg | 7 +-- app/Resources/icons/chevron-left.svg | 7 +-- app/Resources/icons/chevron-right.svg | 7 +-- app/Resources/icons/clapperboard.svg | 7 +-- app/Resources/icons/clipboard.svg | 7 +-- app/Resources/icons/close.svg | 7 +-- app/Resources/icons/cloud-off.svg | 7 +-- app/Resources/icons/dashboard.svg | 7 +-- app/Resources/icons/database.svg | 7 +-- app/Resources/icons/delete-bin.svg | 7 +-- app/Resources/icons/disc.svg | 7 +-- app/Resources/icons/download.svg | 7 +-- app/Resources/icons/edit.svg | 7 +-- app/Resources/icons/error-warning.svg | 4 +- app/Resources/icons/exchange-dollar.svg | 7 +-- app/Resources/icons/external-link.svg | 7 +-- app/Resources/icons/eye.svg | 7 +-- app/Resources/icons/file-copy.svg | 7 +-- app/Resources/icons/file-download.svg | 7 +-- app/Resources/icons/folder-user.svg | 7 +-- app/Resources/icons/forbid.svg | 7 +-- app/Resources/icons/group.svg | 7 +-- app/Resources/icons/heading.svg | 7 +-- app/Resources/icons/heart.svg | 7 +-- app/Resources/icons/history.svg | 5 +- app/Resources/icons/home-gear.svg | 7 +-- app/Resources/icons/image-add.svg | 7 +-- app/Resources/icons/information.svg | 5 +- app/Resources/icons/italic.svg | 7 +-- app/Resources/icons/line-chart.svg | 7 +-- app/Resources/icons/link.svg | 7 +-- app/Resources/icons/list-ordered.svg | 7 +-- app/Resources/icons/list-unordered.svg | 7 +-- app/Resources/icons/loader.svg | 7 +-- app/Resources/icons/lock-unlock.svg | 7 +-- app/Resources/icons/lock.svg | 7 +-- app/Resources/icons/loop-left.svg | 1 + app/Resources/icons/map-pin.svg | 7 +-- app/Resources/icons/markdown.svg | 7 +-- app/Resources/icons/menu.svg | 7 +-- app/Resources/icons/mic.svg | 7 +-- app/Resources/icons/more.svg | 7 +-- app/Resources/icons/movie.svg | 7 +-- app/Resources/icons/notification-bell.svg | 6 -- app/Resources/icons/notification.svg | 1 + app/Resources/icons/pages.svg | 7 +-- app/Resources/icons/pause.svg | 7 +-- app/Resources/icons/play-circle.svg | 7 +-- app/Resources/icons/play.svg | 2 +- app/Resources/icons/question.svg | 7 +-- app/Resources/icons/quote.svg | 7 +-- app/Resources/icons/refresh.svg | 7 +-- app/Resources/icons/repeat.svg | 7 +-- app/Resources/icons/rocket-tilted.svg | 7 +-- app/Resources/icons/rss.svg | 7 +-- app/Resources/icons/scales.svg | 7 +-- app/Resources/icons/search.svg | 7 +-- app/Resources/icons/send-plane.svg | 7 +-- app/Resources/icons/settings.svg | 7 +-- app/Resources/icons/shield-user.svg | 5 +- app/Resources/icons/sort.svg | 7 +-- app/Resources/icons/timer.svg | 7 +-- app/Resources/icons/upload-cloud.svg | 7 +-- app/Resources/icons/user-add.svg | 7 +-- app/Resources/icons/user-follow.svg | 7 +-- app/Resources/icons/volume-high.svg | 7 +-- app/Resources/icons/volume-low.svg | 7 +-- app/Resources/icons/volume-mute.svg | 7 +-- app/Resources/icons/warning.svg | 6 -- app/Views/Components/Forms/Field.php | 7 ++- app/Views/Components/Forms/Input.php | 8 ++- app/Views/Components/Forms/Label.php | 4 +- app/Views/Components/Forms/MultiSelect.php | 2 +- app/Views/Components/Forms/Select.php | 2 +- modules/Admin/Config/Routes.php | 4 +- modules/Admin/Controllers/AboutController.php | 2 +- .../Controllers/EpisodePersonController.php | 2 +- .../Controllers/PodcastPersonController.php | 2 +- modules/Admin/Language/ar/Podcast.php | 2 - .../Admin/Language/ar/PodcastNavigation.php | 2 +- modules/Admin/Language/br/Podcast.php | 2 - .../Admin/Language/br/PodcastNavigation.php | 2 +- modules/Admin/Language/ca/Podcast.php | 2 - .../Admin/Language/ca/PodcastNavigation.php | 2 +- modules/Admin/Language/da/Podcast.php | 2 - .../Admin/Language/da/PodcastNavigation.php | 2 +- modules/Admin/Language/de/Podcast.php | 2 - .../Admin/Language/de/PodcastNavigation.php | 2 +- modules/Admin/Language/el/Podcast.php | 2 - .../Admin/Language/el/PodcastNavigation.php | 2 +- modules/Admin/Language/en/Breadcrumb.php | 1 + modules/Admin/Language/en/Podcast.php | 5 +- .../Admin/Language/en/PodcastNavigation.php | 3 +- modules/Admin/Language/es/Podcast.php | 2 - .../Admin/Language/es/PodcastNavigation.php | 2 +- .../Admin/Language/fa/PodcastNavigation.php | 2 +- modules/Admin/Language/fr/Podcast.php | 2 - .../Admin/Language/fr/PodcastNavigation.php | 2 +- modules/Admin/Language/fr2/Podcast.php | 2 - .../Admin/Language/fr2/PodcastNavigation.php | 2 +- modules/Admin/Language/fr_CA/Podcast.php | 2 - .../Language/fr_CA/PodcastNavigation.php | 2 +- modules/Admin/Language/fr_trad/Podcast.php | 2 - .../Language/fr_trad/PodcastNavigation.php | 2 +- modules/Admin/Language/gd/Podcast.php | 2 - .../Admin/Language/gd/PodcastNavigation.php | 2 +- modules/Admin/Language/gl/Podcast.php | 2 - .../Admin/Language/gl/PodcastNavigation.php | 2 +- modules/Admin/Language/id/Podcast.php | 2 - .../Admin/Language/id/PodcastNavigation.php | 2 +- modules/Admin/Language/it/Podcast.php | 2 - .../Admin/Language/it/PodcastNavigation.php | 2 +- modules/Admin/Language/ja/Podcast.php | 2 - .../Admin/Language/ja/PodcastNavigation.php | 2 +- modules/Admin/Language/ko/Podcast.php | 2 - .../Admin/Language/ko/PodcastNavigation.php | 2 +- modules/Admin/Language/nl/Podcast.php | 2 - .../Admin/Language/nl/PodcastNavigation.php | 2 +- .../Language/nn-NO/PodcastNavigation.php | 2 +- modules/Admin/Language/oc/Podcast.php | 2 - .../Admin/Language/oc/PodcastNavigation.php | 2 +- modules/Admin/Language/pl/Podcast.php | 2 - .../Admin/Language/pl/PodcastNavigation.php | 2 +- .../Language/pt-BR/PodcastNavigation.php | 2 +- modules/Admin/Language/pt/Podcast.php | 2 - .../Admin/Language/pt/PodcastNavigation.php | 2 +- modules/Admin/Language/ro/Podcast.php | 2 - .../Admin/Language/ro/PodcastNavigation.php | 2 +- modules/Admin/Language/ru/Podcast.php | 2 - .../Admin/Language/ru/PodcastNavigation.php | 2 +- modules/Admin/Language/sk/Podcast.php | 2 - .../Admin/Language/sk/PodcastNavigation.php | 2 +- modules/Admin/Language/sr_Latn/Podcast.php | 2 - .../Language/sr_Latn/PodcastNavigation.php | 2 +- modules/Admin/Language/sv/Podcast.php | 2 - .../Admin/Language/sv/PodcastNavigation.php | 2 +- modules/Admin/Language/uk/Podcast.php | 2 - .../Admin/Language/uk/PodcastNavigation.php | 2 +- .../Language/zh-Hans/PodcastNavigation.php | 2 +- modules/Auth/Config/Routes.php | 2 +- .../Controllers/ContributorController.php | 6 +- modules/Fediverse/Config/Routes.php | 2 +- modules/PodcastImport/Config/Routes.php | 6 +- .../Controllers/PodcastImportController.php | 31 ++++++++-- .../Language/ar/PodcastImport.php | 1 - .../Language/br/PodcastImport.php | 1 - .../Language/ca/PodcastImport.php | 1 - .../Language/da/PodcastImport.php | 1 - .../Language/de/PodcastImport.php | 1 - .../Language/el/PodcastImport.php | 1 - .../Language/en/PodcastImport.php | 7 ++- .../Language/es/PodcastImport.php | 1 - .../Language/fa/PodcastImport.php | 1 - .../Language/fr/PodcastImport.php | 1 - .../Language/fr2/PodcastImport.php | 1 - .../Language/fr_CA/PodcastImport.php | 1 - .../Language/gd/PodcastImport.php | 1 - .../Language/gl/PodcastImport.php | 1 - .../Language/id/PodcastImport.php | 1 - .../Language/it/PodcastImport.php | 1 - .../Language/ja/PodcastImport.php | 1 - .../Language/ko/PodcastImport.php | 1 - .../Language/nl/PodcastImport.php | 1 - .../Language/nn-NO/PodcastImport.php | 1 - .../Language/oc/PodcastImport.php | 1 - .../Language/pl/PodcastImport.php | 1 - .../Language/pt-BR/PodcastImport.php | 1 - .../Language/pt/PodcastImport.php | 1 - .../Language/ro/PodcastImport.php | 1 - .../Language/ru/PodcastImport.php | 1 - .../Language/sk/PodcastImport.php | 1 - .../Language/sr_Latn/PodcastImport.php | 1 - .../Language/sv/PodcastImport.php | 1 - .../Language/uk/PodcastImport.php | 1 - .../Language/zh-Hans/PodcastImport.php | 1 - modules/PremiumPodcasts/Config/Routes.php | 8 +-- .../Controllers/SubscriptionController.php | 6 +- .../Language/ar/Subscription.php | 2 +- .../Language/br/Subscription.php | 2 +- .../Language/ca/Subscription.php | 2 +- .../Language/da/Subscription.php | 2 +- .../Language/el/Subscription.php | 2 +- .../Language/en/Subscription.php | 2 +- .../Language/fa/Subscription.php | 2 +- .../Language/fr2/Subscription.php | 2 +- .../Language/fr_CA/Subscription.php | 2 +- .../Language/fr_trad/Subscription.php | 2 +- .../Language/gl/Subscription.php | 2 +- .../Language/id/Subscription.php | 2 +- .../Language/it/Subscription.php | 2 +- .../Language/ja/Subscription.php | 2 +- .../Language/ko/Subscription.php | 2 +- .../Language/nn-NO/Subscription.php | 2 +- .../Language/oc/Subscription.php | 2 +- .../Language/pt-BR/Subscription.php | 2 +- .../Language/pt/Subscription.php | 2 +- .../Language/ru/Subscription.php | 2 +- .../Language/sk/Subscription.php | 2 +- .../Language/sr_Latn/Subscription.php | 2 +- .../Language/uk/Subscription.php | 2 +- themes/cp_admin/_partials/_nav_header.php | 2 +- .../contributor/{add.php => create.php} | 0 themes/cp_admin/import/podcast_queue.php | 3 +- themes/cp_admin/import/podcast_sync.php | 24 ++++++++ themes/cp_admin/podcast/_sidebar.php | 2 +- themes/cp_admin/podcast/create.php | 59 ++++++++++--------- themes/cp_admin/podcast/edit.php | 44 +++++++------- themes/cp_admin/{ => settings}/about.php | 0 .../subscription/{add.php => create.php} | 4 +- themes/cp_admin/subscription/list.php | 2 +- themes/cp_app/_admin_navbar.php | 2 +- 225 files changed, 292 insertions(+), 699 deletions(-) delete mode 100755 app/Resources/icons/bookmark.svg create mode 100644 app/Resources/icons/loop-left.svg delete mode 100644 app/Resources/icons/notification-bell.svg create mode 100644 app/Resources/icons/notification.svg delete mode 100644 app/Resources/icons/warning.svg rename themes/cp_admin/contributor/{add.php => create.php} (100%) create mode 100644 themes/cp_admin/import/podcast_sync.php rename themes/cp_admin/{ => settings}/about.php (100%) rename themes/cp_admin/subscription/{add.php => create.php} (82%) diff --git a/app/Helpers/components_helper.php b/app/Helpers/components_helper.php index 08018f78..eaec82c9 100644 --- a/app/Helpers/components_helper.php +++ b/app/Helpers/components_helper.php @@ -136,7 +136,7 @@ if (! function_exists('publication_pill')) { $customClass . '">' . $label . - ($publicationStatus === 'with_podcast' ? '' : '') . + ($publicationStatus === 'with_podcast' ? '' : '') . ''; } } diff --git a/app/Resources/icons/account-circle.svg b/app/Resources/icons/account-circle.svg index c825dc5a..110027bd 100644 --- a/app/Resources/icons/account-circle.svg +++ b/app/Resources/icons/account-circle.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/add-box.svg b/app/Resources/icons/add-box.svg index 5a6fd80c..f4b1942f 100755 --- a/app/Resources/icons/add-box.svg +++ b/app/Resources/icons/add-box.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/add.svg b/app/Resources/icons/add.svg index 8f3f5a20..4fed9cd0 100755 --- a/app/Resources/icons/add.svg +++ b/app/Resources/icons/add.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/alert.svg b/app/Resources/icons/alert.svg index 7dd74af7..ba526a18 100755 --- a/app/Resources/icons/alert.svg +++ b/app/Resources/icons/alert.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/arrow-left.svg b/app/Resources/icons/arrow-left.svg index d10d02b5..29f6b7d0 100644 --- a/app/Resources/icons/arrow-left.svg +++ b/app/Resources/icons/arrow-left.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/arrow-right.svg b/app/Resources/icons/arrow-right.svg index f46779f7..6fc0e9d5 100644 --- a/app/Resources/icons/arrow-right.svg +++ b/app/Resources/icons/arrow-right.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/at.svg b/app/Resources/icons/at.svg index 80191b5f..6a14a65b 100644 --- a/app/Resources/icons/at.svg +++ b/app/Resources/icons/at.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/bold.svg b/app/Resources/icons/bold.svg index b5fb5947..8502e2f5 100644 --- a/app/Resources/icons/bold.svg +++ b/app/Resources/icons/bold.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/bookmark.svg b/app/Resources/icons/bookmark.svg deleted file mode 100755 index d3bde5f3..00000000 --- a/app/Resources/icons/bookmark.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/app/Resources/icons/calendar.svg b/app/Resources/icons/calendar.svg index fe9bf8d9..91497005 100644 --- a/app/Resources/icons/calendar.svg +++ b/app/Resources/icons/calendar.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/caret-down.svg b/app/Resources/icons/caret-down.svg index e2138c8d..54e5fe04 100644 --- a/app/Resources/icons/caret-down.svg +++ b/app/Resources/icons/caret-down.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/caret-right.svg b/app/Resources/icons/caret-right.svg index 346cb156..e3079866 100644 --- a/app/Resources/icons/caret-right.svg +++ b/app/Resources/icons/caret-right.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/chat.svg b/app/Resources/icons/chat.svg index 594b1503..316f488d 100755 --- a/app/Resources/icons/chat.svg +++ b/app/Resources/icons/chat.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/check.svg b/app/Resources/icons/check.svg index a28368fc..a195ed05 100644 --- a/app/Resources/icons/check.svg +++ b/app/Resources/icons/check.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/chevron-left.svg b/app/Resources/icons/chevron-left.svg index 6d82f7ba..087efae4 100644 --- a/app/Resources/icons/chevron-left.svg +++ b/app/Resources/icons/chevron-left.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/chevron-right.svg b/app/Resources/icons/chevron-right.svg index f33dff5e..48dcbb05 100644 --- a/app/Resources/icons/chevron-right.svg +++ b/app/Resources/icons/chevron-right.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/clapperboard.svg b/app/Resources/icons/clapperboard.svg index c5d7d121..1e8cca28 100644 --- a/app/Resources/icons/clapperboard.svg +++ b/app/Resources/icons/clapperboard.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/clipboard.svg b/app/Resources/icons/clipboard.svg index 4e4214b2..143af421 100644 --- a/app/Resources/icons/clipboard.svg +++ b/app/Resources/icons/clipboard.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/close.svg b/app/Resources/icons/close.svg index 0ef4f305..ddd46522 100644 --- a/app/Resources/icons/close.svg +++ b/app/Resources/icons/close.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/cloud-off.svg b/app/Resources/icons/cloud-off.svg index 7177145a..34abcff2 100755 --- a/app/Resources/icons/cloud-off.svg +++ b/app/Resources/icons/cloud-off.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/dashboard.svg b/app/Resources/icons/dashboard.svg index a25c9e47..7fb04d5a 100644 --- a/app/Resources/icons/dashboard.svg +++ b/app/Resources/icons/dashboard.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/database.svg b/app/Resources/icons/database.svg index 6dc449b4..fe928126 100644 --- a/app/Resources/icons/database.svg +++ b/app/Resources/icons/database.svg @@ -1,6 +1 @@ - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/Resources/icons/delete-bin.svg b/app/Resources/icons/delete-bin.svg index bd1f9b30..6203485e 100755 --- a/app/Resources/icons/delete-bin.svg +++ b/app/Resources/icons/delete-bin.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/disc.svg b/app/Resources/icons/disc.svg index 095d2cda..de14b2b5 100644 --- a/app/Resources/icons/disc.svg +++ b/app/Resources/icons/disc.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/download.svg b/app/Resources/icons/download.svg index b3ea2a9f..84d71589 100755 --- a/app/Resources/icons/download.svg +++ b/app/Resources/icons/download.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/edit.svg b/app/Resources/icons/edit.svg index d9efb56c..92484f4d 100755 --- a/app/Resources/icons/edit.svg +++ b/app/Resources/icons/edit.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/error-warning.svg b/app/Resources/icons/error-warning.svg index 993f6e29..04bc9aff 100644 --- a/app/Resources/icons/error-warning.svg +++ b/app/Resources/icons/error-warning.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/Resources/icons/exchange-dollar.svg b/app/Resources/icons/exchange-dollar.svg index 85cc6af0..9e0271c0 100644 --- a/app/Resources/icons/exchange-dollar.svg +++ b/app/Resources/icons/exchange-dollar.svg @@ -1,6 +1 @@ - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/Resources/icons/external-link.svg b/app/Resources/icons/external-link.svg index 2efc6259..f5017634 100755 --- a/app/Resources/icons/external-link.svg +++ b/app/Resources/icons/external-link.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/eye.svg b/app/Resources/icons/eye.svg index f14a8b7d..93969ca9 100755 --- a/app/Resources/icons/eye.svg +++ b/app/Resources/icons/eye.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/file-copy.svg b/app/Resources/icons/file-copy.svg index 0b907436..4c1511b9 100755 --- a/app/Resources/icons/file-copy.svg +++ b/app/Resources/icons/file-copy.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/file-download.svg b/app/Resources/icons/file-download.svg index 0202c99a..d0a0c930 100644 --- a/app/Resources/icons/file-download.svg +++ b/app/Resources/icons/file-download.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/folder-user.svg b/app/Resources/icons/folder-user.svg index 6dcd37c4..57be0618 100755 --- a/app/Resources/icons/folder-user.svg +++ b/app/Resources/icons/folder-user.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/forbid.svg b/app/Resources/icons/forbid.svg index dbc2632c..311f5ed3 100644 --- a/app/Resources/icons/forbid.svg +++ b/app/Resources/icons/forbid.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/group.svg b/app/Resources/icons/group.svg index 5c2f10ee..e8cc1a1d 100755 --- a/app/Resources/icons/group.svg +++ b/app/Resources/icons/group.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/heading.svg b/app/Resources/icons/heading.svg index 0ae177f1..a0d8a6c1 100644 --- a/app/Resources/icons/heading.svg +++ b/app/Resources/icons/heading.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/heart.svg b/app/Resources/icons/heart.svg index f10aafa4..67c57616 100755 --- a/app/Resources/icons/heart.svg +++ b/app/Resources/icons/heart.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/history.svg b/app/Resources/icons/history.svg index 684091df..eae809d5 100644 --- a/app/Resources/icons/history.svg +++ b/app/Resources/icons/history.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/app/Resources/icons/home-gear.svg b/app/Resources/icons/home-gear.svg index 2504da6d..ef1a6de0 100644 --- a/app/Resources/icons/home-gear.svg +++ b/app/Resources/icons/home-gear.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/image-add.svg b/app/Resources/icons/image-add.svg index dca9aa8b..2b5ada85 100644 --- a/app/Resources/icons/image-add.svg +++ b/app/Resources/icons/image-add.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/information.svg b/app/Resources/icons/information.svg index 39f02fbd..37f63f52 100644 --- a/app/Resources/icons/information.svg +++ b/app/Resources/icons/information.svg @@ -1,4 +1 @@ - - - - + \ No newline at end of file diff --git a/app/Resources/icons/italic.svg b/app/Resources/icons/italic.svg index 4203e07e..9cad6165 100644 --- a/app/Resources/icons/italic.svg +++ b/app/Resources/icons/italic.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/line-chart.svg b/app/Resources/icons/line-chart.svg index dc43cd7d..0af14c94 100755 --- a/app/Resources/icons/line-chart.svg +++ b/app/Resources/icons/line-chart.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/link.svg b/app/Resources/icons/link.svg index 3b7c8e06..e70aba7b 100755 --- a/app/Resources/icons/link.svg +++ b/app/Resources/icons/link.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/list-ordered.svg b/app/Resources/icons/list-ordered.svg index be282082..bc95fbf0 100644 --- a/app/Resources/icons/list-ordered.svg +++ b/app/Resources/icons/list-ordered.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/list-unordered.svg b/app/Resources/icons/list-unordered.svg index 41809a3a..6d4fe2e1 100644 --- a/app/Resources/icons/list-unordered.svg +++ b/app/Resources/icons/list-unordered.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/loader.svg b/app/Resources/icons/loader.svg index 55da7bdb..b3bbd916 100644 --- a/app/Resources/icons/loader.svg +++ b/app/Resources/icons/loader.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/lock-unlock.svg b/app/Resources/icons/lock-unlock.svg index 0ea4517c..fc58eead 100644 --- a/app/Resources/icons/lock-unlock.svg +++ b/app/Resources/icons/lock-unlock.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/lock.svg b/app/Resources/icons/lock.svg index a54f3e42..33fd4a7a 100644 --- a/app/Resources/icons/lock.svg +++ b/app/Resources/icons/lock.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/loop-left.svg b/app/Resources/icons/loop-left.svg new file mode 100644 index 00000000..ceddcd67 --- /dev/null +++ b/app/Resources/icons/loop-left.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/Resources/icons/map-pin.svg b/app/Resources/icons/map-pin.svg index 5950f056..e3d636be 100644 --- a/app/Resources/icons/map-pin.svg +++ b/app/Resources/icons/map-pin.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/markdown.svg b/app/Resources/icons/markdown.svg index ab3edd2b..c52fbbfa 100644 --- a/app/Resources/icons/markdown.svg +++ b/app/Resources/icons/markdown.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/menu.svg b/app/Resources/icons/menu.svg index 666764dc..caeaa246 100755 --- a/app/Resources/icons/menu.svg +++ b/app/Resources/icons/menu.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/mic.svg b/app/Resources/icons/mic.svg index becff50c..9ae8b850 100755 --- a/app/Resources/icons/mic.svg +++ b/app/Resources/icons/mic.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/more.svg b/app/Resources/icons/more.svg index 5f6b5dba..8d891a89 100755 --- a/app/Resources/icons/more.svg +++ b/app/Resources/icons/more.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/movie.svg b/app/Resources/icons/movie.svg index f92dd60f..4eaa280e 100755 --- a/app/Resources/icons/movie.svg +++ b/app/Resources/icons/movie.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/notification-bell.svg b/app/Resources/icons/notification-bell.svg deleted file mode 100644 index ea792a4d..00000000 --- a/app/Resources/icons/notification-bell.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/Resources/icons/notification.svg b/app/Resources/icons/notification.svg new file mode 100644 index 00000000..4e46ee6f --- /dev/null +++ b/app/Resources/icons/notification.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/app/Resources/icons/pages.svg b/app/Resources/icons/pages.svg index 3d28c400..689353cc 100755 --- a/app/Resources/icons/pages.svg +++ b/app/Resources/icons/pages.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/pause.svg b/app/Resources/icons/pause.svg index 81cffce1..86832243 100644 --- a/app/Resources/icons/pause.svg +++ b/app/Resources/icons/pause.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/play-circle.svg b/app/Resources/icons/play-circle.svg index 5d5f7039..4f6a4f34 100644 --- a/app/Resources/icons/play-circle.svg +++ b/app/Resources/icons/play-circle.svg @@ -1,6 +1 @@ - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/Resources/icons/play.svg b/app/Resources/icons/play.svg index 4978d3d5..726dfb60 100644 --- a/app/Resources/icons/play.svg +++ b/app/Resources/icons/play.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/Resources/icons/question.svg b/app/Resources/icons/question.svg index b7fd91ed..b93b2920 100755 --- a/app/Resources/icons/question.svg +++ b/app/Resources/icons/question.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/quote.svg b/app/Resources/icons/quote.svg index a83df6c4..d60624ec 100644 --- a/app/Resources/icons/quote.svg +++ b/app/Resources/icons/quote.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/refresh.svg b/app/Resources/icons/refresh.svg index 08b0dba0..7d63f939 100644 --- a/app/Resources/icons/refresh.svg +++ b/app/Resources/icons/refresh.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/repeat.svg b/app/Resources/icons/repeat.svg index c5a26047..d68cd86c 100644 --- a/app/Resources/icons/repeat.svg +++ b/app/Resources/icons/repeat.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/rocket-tilted.svg b/app/Resources/icons/rocket-tilted.svg index 627e4772..3b9bab8b 100644 --- a/app/Resources/icons/rocket-tilted.svg +++ b/app/Resources/icons/rocket-tilted.svg @@ -1,6 +1 @@ - - - - - - + diff --git a/app/Resources/icons/rss.svg b/app/Resources/icons/rss.svg index 723552d9..ffdfe81c 100755 --- a/app/Resources/icons/rss.svg +++ b/app/Resources/icons/rss.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/scales.svg b/app/Resources/icons/scales.svg index 7383e06a..65a37635 100755 --- a/app/Resources/icons/scales.svg +++ b/app/Resources/icons/scales.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/search.svg b/app/Resources/icons/search.svg index 4d61f480..1f7398f4 100644 --- a/app/Resources/icons/search.svg +++ b/app/Resources/icons/search.svg @@ -1,6 +1 @@ - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/Resources/icons/send-plane.svg b/app/Resources/icons/send-plane.svg index 74ffbcf9..288e73c5 100644 --- a/app/Resources/icons/send-plane.svg +++ b/app/Resources/icons/send-plane.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/settings.svg b/app/Resources/icons/settings.svg index 893c92d2..81e150cf 100755 --- a/app/Resources/icons/settings.svg +++ b/app/Resources/icons/settings.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/shield-user.svg b/app/Resources/icons/shield-user.svg index 37cf8289..34088fca 100644 --- a/app/Resources/icons/shield-user.svg +++ b/app/Resources/icons/shield-user.svg @@ -1,4 +1 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/Resources/icons/sort.svg b/app/Resources/icons/sort.svg index 51df3545..0d67ac0c 100644 --- a/app/Resources/icons/sort.svg +++ b/app/Resources/icons/sort.svg @@ -1,6 +1 @@ - - - - - - + diff --git a/app/Resources/icons/timer.svg b/app/Resources/icons/timer.svg index 21ab4767..17530985 100755 --- a/app/Resources/icons/timer.svg +++ b/app/Resources/icons/timer.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/upload-cloud.svg b/app/Resources/icons/upload-cloud.svg index b87c7581..a2974743 100755 --- a/app/Resources/icons/upload-cloud.svg +++ b/app/Resources/icons/upload-cloud.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/user-add.svg b/app/Resources/icons/user-add.svg index 2d56227f..ddaef56c 100755 --- a/app/Resources/icons/user-add.svg +++ b/app/Resources/icons/user-add.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/user-follow.svg b/app/Resources/icons/user-follow.svg index e8892f28..f4616326 100644 --- a/app/Resources/icons/user-follow.svg +++ b/app/Resources/icons/user-follow.svg @@ -1,6 +1 @@ - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/Resources/icons/volume-high.svg b/app/Resources/icons/volume-high.svg index 0aa5be36..c4befea0 100644 --- a/app/Resources/icons/volume-high.svg +++ b/app/Resources/icons/volume-high.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/volume-low.svg b/app/Resources/icons/volume-low.svg index 6acfade5..b61ab667 100644 --- a/app/Resources/icons/volume-low.svg +++ b/app/Resources/icons/volume-low.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/volume-mute.svg b/app/Resources/icons/volume-mute.svg index 79bd55ac..f3323c1f 100644 --- a/app/Resources/icons/volume-mute.svg +++ b/app/Resources/icons/volume-mute.svg @@ -1,6 +1 @@ - - - - - - + \ No newline at end of file diff --git a/app/Resources/icons/warning.svg b/app/Resources/icons/warning.svg deleted file mode 100644 index e01de7fb..00000000 --- a/app/Resources/icons/warning.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/Views/Components/Forms/Field.php b/app/Views/Components/Forms/Field.php index fb65ed33..40d219cb 100644 --- a/app/Views/Components/Forms/Field.php +++ b/app/Views/Components/Forms/Field.php @@ -26,6 +26,7 @@ class Field extends FormComponent $labelAttributes = [ 'for' => $this->id, 'isOptional' => $this->required ? 'false' : 'true', + 'class' => '-mb-1', ]; if ($this->hint) { $labelAttributes['hint'] = $this->hint; @@ -40,16 +41,16 @@ class Field extends FormComponent unset($fieldComponentAttributes['helper']); unset($fieldComponentAttributes['hint']); - $fieldComponentAttributes['class'] = 'mb-1'; - $element = __NAMESPACE__ . '\\' . $this->as; $fieldElement = new $element($fieldComponentAttributes); return << {$this->label} - {$fieldElement->render()} {$helperText} +
+ {$fieldElement->render()} +
HTML; } diff --git a/app/Views/Components/Forms/Input.php b/app/Views/Components/Forms/Input.php index 83712071..6ba0ffdb 100644 --- a/app/Views/Components/Forms/Input.php +++ b/app/Views/Components/Forms/Input.php @@ -10,7 +10,7 @@ class Input extends FormComponent public function render(): string { - $baseClass = 'w-full bg-elevated border-contrast rounded-lg focus:border-contrast border-3 focus:ring-accent focus-within:ring-accent ' . $this->class; + $baseClass = 'w-full border-contrast rounded-lg focus:border-contrast border-3 focus:ring-accent focus-within:ring-accent ' . $this->class; $this->attributes['class'] = $baseClass; @@ -20,6 +20,12 @@ class Input extends FormComponent $this->attributes['class'] .= ' px-3 py-2'; } + if ($this->readonly) { + $this->attributes['class'] .= ' bg-base'; + } else { + $this->attributes['class'] .= ' bg-elevated'; + } + return form_input($this->attributes, old($this->name, $this->value)); } } diff --git a/app/Views/Components/Forms/Label.php b/app/Views/Components/Forms/Label.php index 49bbac3e..1c7ef093 100644 --- a/app/Views/Components/Forms/Label.php +++ b/app/Views/Components/Forms/Label.php @@ -21,10 +21,10 @@ class Label extends Component public function render(): string { - $labelClass = 'text-sm ' . $this->attributes['class']; + $labelClass = 'text-sm font-semibold ' . $this->attributes['class']; unset($this->attributes['class']); - $optionalText = $this->isOptional ? '(' . + $optionalText = $this->isOptional ? '(' . lang('Common.optional') . ')' : ''; $hint = $this->hint === null ? '' : hint_tooltip($this->hint, 'ml-1'); diff --git a/app/Views/Components/Forms/MultiSelect.php b/app/Views/Components/Forms/MultiSelect.php index df60aa74..81450a32 100644 --- a/app/Views/Components/Forms/MultiSelect.php +++ b/app/Views/Components/Forms/MultiSelect.php @@ -37,7 +37,7 @@ class MultiSelect extends FormComponent 'data-no-choices-text' => lang('Common.forms.multiSelect.noChoicesText'), 'data-max-item-text' => lang('Common.forms.multiSelect.maxItemText'), ]; - $this->attributes['class'] .= ' bg-elevated border-3 border-contrast rounded-lg'; + $this->attributes['class'] .= ' w-full bg-elevated border-3 border-contrast rounded-lg'; $extra = array_merge($defaultAttributes, $this->attributes); return form_dropdown($this->name, $this->options, $this->selected, $extra); diff --git a/app/Views/Components/Forms/Select.php b/app/Views/Components/Forms/Select.php index 6615b2e9..0740beef 100644 --- a/app/Views/Components/Forms/Select.php +++ b/app/Views/Components/Forms/Select.php @@ -21,7 +21,7 @@ class Select extends FormComponent public function render(): string { $defaultAttributes = [ - 'class' => 'focus:border-contrast focus:ring-accent border-3 rounded-lg bg-elevated border-contrast ' . $this->class, + 'class' => 'w-full focus:border-contrast focus:ring-accent border-3 rounded-lg bg-elevated border-contrast ' . $this->class, 'data-class' => $this->class, 'data-select-text' => lang('Common.forms.multiSelect.selectText'), 'data-loading-text' => lang('Common.forms.multiSelect.loadingText'), diff --git a/modules/Admin/Config/Routes.php b/modules/Admin/Config/Routes.php index 37edabe4..dc32143a 100644 --- a/modules/Admin/Config/Routes.php +++ b/modules/Admin/Config/Routes.php @@ -165,7 +165,7 @@ $routes->group( ]); $routes->post( '/', - 'PodcastPersonController::attemptAdd/$1', + 'PodcastPersonController::attemptCreate/$1', [ 'filter' => 'permission:podcast#.manage-persons', ], @@ -461,7 +461,7 @@ $routes->group( ]); $routes->post( '/', - 'EpisodePersonController::attemptAdd/$1/$2', + 'EpisodePersonController::attemptCreate/$1/$2', [ 'filter' => 'permission:podcast#.episodes.manage-persons', ], diff --git a/modules/Admin/Controllers/AboutController.php b/modules/Admin/Controllers/AboutController.php index b43453fc..f7cba14d 100644 --- a/modules/Admin/Controllers/AboutController.php +++ b/modules/Admin/Controllers/AboutController.php @@ -26,7 +26,7 @@ class AboutController extends BaseController 'languages' => implode(', ', config(App::class)->supportedLocales), ]; - return view('about', [ + return view('settings/about', [ 'info' => $instanceInfo, ]); } diff --git a/modules/Admin/Controllers/EpisodePersonController.php b/modules/Admin/Controllers/EpisodePersonController.php index 8b10ea60..8a6bcae5 100644 --- a/modules/Admin/Controllers/EpisodePersonController.php +++ b/modules/Admin/Controllers/EpisodePersonController.php @@ -65,7 +65,7 @@ class EpisodePersonController extends BaseController return view('episode/persons', $data); } - public function attemptAdd(): RedirectResponse + public function attemptCreate(): RedirectResponse { $rules = [ 'persons' => 'required', diff --git a/modules/Admin/Controllers/PodcastPersonController.php b/modules/Admin/Controllers/PodcastPersonController.php index 911653c1..ec02c393 100644 --- a/modules/Admin/Controllers/PodcastPersonController.php +++ b/modules/Admin/Controllers/PodcastPersonController.php @@ -52,7 +52,7 @@ class PodcastPersonController extends BaseController return view('podcast/persons', $data); } - public function attemptAdd(): RedirectResponse + public function attemptCreate(): RedirectResponse { $rules = [ 'persons' => 'required', diff --git a/modules/Admin/Language/ar/Podcast.php b/modules/Admin/Language/ar/Podcast.php index 949479d4..1404cc1a 100644 --- a/modules/Admin/Language/ar/Podcast.php +++ b/modules/Admin/Language/ar/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'أحدث الحلقات', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/ar/PodcastNavigation.php b/modules/Admin/Language/ar/PodcastNavigation.php index 1f34f48c..dc39cf23 100644 --- a/modules/Admin/Language/ar/PodcastNavigation.php +++ b/modules/Admin/Language/ar/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'المساهمون', 'contributor-list' => 'كل المساهمين', 'contributor-add' => 'إضافة مساهم', diff --git a/modules/Admin/Language/br/Podcast.php b/modules/Admin/Language/br/Podcast.php index 0ef55dbf..cf39ee7a 100644 --- a/modules/Admin/Language/br/Podcast.php +++ b/modules/Admin/Language/br/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Rannoù diwezhañ', 'see_all_episodes' => 'Gwelet an holl rannoù', 'draft' => 'Brouilhed', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Krouet eo bet ar podkast gant berzh!', 'editSuccess' => 'Hizivaet eo bet ar podkast gant berzh!', diff --git a/modules/Admin/Language/br/PodcastNavigation.php b/modules/Admin/Language/br/PodcastNavigation.php index 928b6a9f..9590aea0 100644 --- a/modules/Admin/Language/br/PodcastNavigation.php +++ b/modules/Admin/Language/br/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Mareoù ar selaou', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Perzhidi, perzhiadezed', 'contributor-list' => 'An holl berzhidi ha perzhiadezed', 'contributor-add' => 'Ouzhpennañ ur perzhiad pe ur berzhiadez', diff --git a/modules/Admin/Language/ca/Podcast.php b/modules/Admin/Language/ca/Podcast.php index 514112d8..c31998b2 100644 --- a/modules/Admin/Language/ca/Podcast.php +++ b/modules/Admin/Language/ca/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Darrers episodis', 'see_all_episodes' => 'Veure tots els episodis', 'draft' => 'Esborrany', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast creat correctament.', 'editSuccess' => 'El podcast s´ha actualitzat correctament.', diff --git a/modules/Admin/Language/ca/PodcastNavigation.php b/modules/Admin/Language/ca/PodcastNavigation.php index d8cb6e3e..a30d12c7 100644 --- a/modules/Admin/Language/ca/PodcastNavigation.php +++ b/modules/Admin/Language/ca/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Períodes de temps', 'premium' => 'Prèmium', 'subscription-list' => 'Totes les subscripcions', - 'subscription-add' => 'Afegiu una subscripció', + 'subscription-create' => 'Afegiu una subscripció', 'contributors' => 'Col·laboradors', 'contributor-list' => 'Tots els col·laboradors', 'contributor-add' => 'Afegir un col·laborador', diff --git a/modules/Admin/Language/da/Podcast.php b/modules/Admin/Language/da/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/da/Podcast.php +++ b/modules/Admin/Language/da/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/da/PodcastNavigation.php b/modules/Admin/Language/da/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/da/PodcastNavigation.php +++ b/modules/Admin/Language/da/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/de/Podcast.php b/modules/Admin/Language/de/Podcast.php index c50c8df9..7fc92d32 100644 --- a/modules/Admin/Language/de/Podcast.php +++ b/modules/Admin/Language/de/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Neueste Folgen', 'see_all_episodes' => 'Alle Folgen anzeigen', 'draft' => 'Entwurf', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast erfolgreich erstellt!', 'editSuccess' => 'Der Podcast wurde erfolgreich aktualisiert!', diff --git a/modules/Admin/Language/de/PodcastNavigation.php b/modules/Admin/Language/de/PodcastNavigation.php index 974a157e..0ddccc4a 100644 --- a/modules/Admin/Language/de/PodcastNavigation.php +++ b/modules/Admin/Language/de/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Zeiträume', 'premium' => 'Premium', 'subscription-list' => 'Alle Abonnements', - 'subscription-add' => 'Abonnement hinzufügen', + 'subscription-create' => 'Abonnement hinzufügen', 'contributors' => 'Mitwirkende', 'contributor-list' => 'Alle Unterstützer', 'contributor-add' => 'Mitwirkenden hinzufügen', diff --git a/modules/Admin/Language/el/Podcast.php b/modules/Admin/Language/el/Podcast.php index f1f26c73..a04effe4 100644 --- a/modules/Admin/Language/el/Podcast.php +++ b/modules/Admin/Language/el/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Τελευταία επεισόδια', 'see_all_episodes' => 'Δείτε όλα τα επεισόδια', 'draft' => 'Πρόχειρο', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Το επεισόδιο δημιουργήθηκε με επιτυχία!', 'editSuccess' => 'Το Podcast ενημερώθηκε με επιτυχία!', diff --git a/modules/Admin/Language/el/PodcastNavigation.php b/modules/Admin/Language/el/PodcastNavigation.php index 735dc9ac..3e97a3a3 100644 --- a/modules/Admin/Language/el/PodcastNavigation.php +++ b/modules/Admin/Language/el/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Χρονικές περίοδοι', 'premium' => 'Premium', 'subscription-list' => 'Όλες οι συνδρομές', - 'subscription-add' => 'Προσθέστε συνδρομή', + 'subscription-create' => 'Προσθέστε συνδρομή', 'contributors' => 'Συντελεστές', 'contributor-list' => 'Όλοι οι συντελεστές', 'contributor-add' => 'Προσθήκη συντελεστή', diff --git a/modules/Admin/Language/en/Breadcrumb.php b/modules/Admin/Language/en/Breadcrumb.php index 593322e6..8a52be1c 100644 --- a/modules/Admin/Language/en/Breadcrumb.php +++ b/modules/Admin/Language/en/Breadcrumb.php @@ -39,6 +39,7 @@ return [ 'my-account' => 'my account', 'change-password' => 'change password', 'imports' => 'imports', + 'sync-feeds' => 'synchronize feeds', 'platforms' => 'platforms', 'social' => 'social networks', 'funding' => 'funding', diff --git a/modules/Admin/Language/en/Podcast.php b/modules/Admin/Language/en/Podcast.php index 08768f1b..5ad5ec2e 100644 --- a/modules/Admin/Language/en/Podcast.php +++ b/modules/Admin/Language/en/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', @@ -59,6 +57,8 @@ return [ 'form' => [ 'identity_section_title' => 'Podcast identity', 'identity_section_subtitle' => 'These fields allow you to get noticed.', + 'fediverse_section_title' => 'Fediverse identity', + 'cover' => 'Podcast cover', 'cover_size_hint' => 'Cover must be squared and at least 1400px wide and tall.', 'banner' => 'Podcast banner', @@ -134,7 +134,6 @@ return [ 'partner_id_hint' => 'Your own partner ID', 'partner_link_url_hint' => 'The generic partner link address', 'partner_image_url_hint' => 'The generic partner image address', - 'status_section_title' => 'Status', 'block' => 'Podcast should be hidden from public catalogues', 'block_hint' => 'The podcast show or hide status: toggling this on prevents the entire podcast from appearing in Apple Podcasts, Google Podcasts, and any third party apps that pull shows from these directories. (Not guaranteed)', diff --git a/modules/Admin/Language/en/PodcastNavigation.php b/modules/Admin/Language/en/PodcastNavigation.php index a5c98b6c..ef7ce917 100644 --- a/modules/Admin/Language/en/PodcastNavigation.php +++ b/modules/Admin/Language/en/PodcastNavigation.php @@ -15,6 +15,7 @@ return [ 'podcast-edit' => 'Edit podcast', 'podcast-persons-manage' => 'Manage persons', 'podcast-imports' => 'Podcast imports', + 'podcast-imports-sync' => 'Sync feeds', 'episodes' => 'Episodes', 'episode-list' => 'All episodes', 'episode-create' => 'New episode', @@ -28,7 +29,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/es/Podcast.php b/modules/Admin/Language/es/Podcast.php index 24c05c1f..2fc372f4 100644 --- a/modules/Admin/Language/es/Podcast.php +++ b/modules/Admin/Language/es/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Últimos Episodios', 'see_all_episodes' => 'Mostrar todos los episodios', 'draft' => 'Borrador', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => '¡El Podcast ha sido creado con éxito!', 'editSuccess' => 'El Podcast se ha actualizado correctamente!', diff --git a/modules/Admin/Language/es/PodcastNavigation.php b/modules/Admin/Language/es/PodcastNavigation.php index a9accfab..8f9ee8d1 100644 --- a/modules/Admin/Language/es/PodcastNavigation.php +++ b/modules/Admin/Language/es/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Periodos de tiempo', 'premium' => 'Premium', 'subscription-list' => 'Todas las suscripciones', - 'subscription-add' => 'Añadir suscripción', + 'subscription-create' => 'Añadir suscripción', 'contributors' => 'Colaboradores', 'contributor-list' => 'Todos los colaboradores', 'contributor-add' => 'Añadir colaborador', diff --git a/modules/Admin/Language/fa/PodcastNavigation.php b/modules/Admin/Language/fa/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/fa/PodcastNavigation.php +++ b/modules/Admin/Language/fa/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/fr/Podcast.php b/modules/Admin/Language/fr/Podcast.php index fd8ce6db..2a3c5e4c 100644 --- a/modules/Admin/Language/fr/Podcast.php +++ b/modules/Admin/Language/fr/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Derniers épisodes', 'see_all_episodes' => 'Voir tous les épisodes', 'draft' => 'Brouillon', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Le podcast a été créé avec succès !', 'editSuccess' => 'Le podcast a bien été mis à jour !', diff --git a/modules/Admin/Language/fr/PodcastNavigation.php b/modules/Admin/Language/fr/PodcastNavigation.php index 9edb8e80..8043fc9d 100644 --- a/modules/Admin/Language/fr/PodcastNavigation.php +++ b/modules/Admin/Language/fr/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Périodes', 'premium' => 'Premium', 'subscription-list' => 'Tous les abonnements', - 'subscription-add' => 'Ajouter un abonnement', + 'subscription-create' => 'Ajouter un abonnement', 'contributors' => 'Contributeurs', 'contributor-list' => 'Tous les contributeurs', 'contributor-add' => 'Ajouter un contributeur', diff --git a/modules/Admin/Language/fr2/Podcast.php b/modules/Admin/Language/fr2/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/fr2/Podcast.php +++ b/modules/Admin/Language/fr2/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/fr2/PodcastNavigation.php b/modules/Admin/Language/fr2/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/fr2/PodcastNavigation.php +++ b/modules/Admin/Language/fr2/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/fr_CA/Podcast.php b/modules/Admin/Language/fr_CA/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/fr_CA/Podcast.php +++ b/modules/Admin/Language/fr_CA/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/fr_CA/PodcastNavigation.php b/modules/Admin/Language/fr_CA/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/fr_CA/PodcastNavigation.php +++ b/modules/Admin/Language/fr_CA/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/fr_trad/Podcast.php b/modules/Admin/Language/fr_trad/Podcast.php index 2d46aff5..63c5b613 100644 --- a/modules/Admin/Language/fr_trad/Podcast.php +++ b/modules/Admin/Language/fr_trad/Podcast.php @@ -47,8 +47,6 @@ return [ one {# episode was} other {# episodes were} } added to the podcast!', - 'podcastFeedUpToDate' => 'Podcast is already up to date.', - 'podcastNotImported' => 'Podcast could not be updated as it was not imported.', 'publishError' => 'This podcast is either already published or scheduled for publication.', 'publishEditError' => 'This podcast is not scheduled for publication.', 'publishCancelSuccess' => 'Podcast publication successfully cancelled!', diff --git a/modules/Admin/Language/fr_trad/PodcastNavigation.php b/modules/Admin/Language/fr_trad/PodcastNavigation.php index b4d7ddc0..5bf37b42 100644 --- a/modules/Admin/Language/fr_trad/PodcastNavigation.php +++ b/modules/Admin/Language/fr_trad/PodcastNavigation.php @@ -27,7 +27,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/gd/Podcast.php b/modules/Admin/Language/gd/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/gd/Podcast.php +++ b/modules/Admin/Language/gd/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/gd/PodcastNavigation.php b/modules/Admin/Language/gd/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/gd/PodcastNavigation.php +++ b/modules/Admin/Language/gd/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/gl/Podcast.php b/modules/Admin/Language/gl/Podcast.php index 5cc869da..6abc8e1d 100644 --- a/modules/Admin/Language/gl/Podcast.php +++ b/modules/Admin/Language/gl/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Últimos episodios', 'see_all_episodes' => 'Ver tódolos episodios', 'draft' => 'Borrador', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast creado correctamente!', 'editSuccess' => 'Episodio actualizado correctamente!', diff --git a/modules/Admin/Language/gl/PodcastNavigation.php b/modules/Admin/Language/gl/PodcastNavigation.php index c5adbf2b..4be04cdf 100644 --- a/modules/Admin/Language/gl/PodcastNavigation.php +++ b/modules/Admin/Language/gl/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Período de tempo', 'premium' => 'Premium', 'subscription-list' => 'Todas as subscricións', - 'subscription-add' => 'Engadir unha subscrición', + 'subscription-create' => 'Engadir unha subscrición', 'contributors' => 'Contribúen', 'contributor-list' => 'Todas as contribucións', 'contributor-add' => 'Engadir colaboración', diff --git a/modules/Admin/Language/id/Podcast.php b/modules/Admin/Language/id/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/id/Podcast.php +++ b/modules/Admin/Language/id/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/id/PodcastNavigation.php b/modules/Admin/Language/id/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/id/PodcastNavigation.php +++ b/modules/Admin/Language/id/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/it/Podcast.php b/modules/Admin/Language/it/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/it/Podcast.php +++ b/modules/Admin/Language/it/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/it/PodcastNavigation.php b/modules/Admin/Language/it/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/it/PodcastNavigation.php +++ b/modules/Admin/Language/it/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/ja/Podcast.php b/modules/Admin/Language/ja/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/ja/Podcast.php +++ b/modules/Admin/Language/ja/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/ja/PodcastNavigation.php b/modules/Admin/Language/ja/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/ja/PodcastNavigation.php +++ b/modules/Admin/Language/ja/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/ko/Podcast.php b/modules/Admin/Language/ko/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/ko/Podcast.php +++ b/modules/Admin/Language/ko/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/ko/PodcastNavigation.php b/modules/Admin/Language/ko/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/ko/PodcastNavigation.php +++ b/modules/Admin/Language/ko/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/nl/Podcast.php b/modules/Admin/Language/nl/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/nl/Podcast.php +++ b/modules/Admin/Language/nl/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/nl/PodcastNavigation.php b/modules/Admin/Language/nl/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/nl/PodcastNavigation.php +++ b/modules/Admin/Language/nl/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/nn-NO/PodcastNavigation.php b/modules/Admin/Language/nn-NO/PodcastNavigation.php index 78a25745..cbbfedaa 100644 --- a/modules/Admin/Language/nn-NO/PodcastNavigation.php +++ b/modules/Admin/Language/nn-NO/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Tidsperiodar', 'premium' => 'Premium', 'subscription-list' => 'Alle abonnement', - 'subscription-add' => 'Legg til abonnement', + 'subscription-create' => 'Legg til abonnement', 'contributors' => 'Bidragsytarar', 'contributor-list' => 'Alle bidragsytarane', 'contributor-add' => 'Legg til bidragsytar', diff --git a/modules/Admin/Language/oc/Podcast.php b/modules/Admin/Language/oc/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/oc/Podcast.php +++ b/modules/Admin/Language/oc/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/oc/PodcastNavigation.php b/modules/Admin/Language/oc/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/oc/PodcastNavigation.php +++ b/modules/Admin/Language/oc/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/pl/Podcast.php b/modules/Admin/Language/pl/Podcast.php index d1d1b7c4..0a617a2f 100644 --- a/modules/Admin/Language/pl/Podcast.php +++ b/modules/Admin/Language/pl/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Najnowsze odcinki', 'see_all_episodes' => 'Zobacz wszystkie odcinki', 'draft' => 'Wersja robocza', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast został pomyślnie utworzony!', 'editSuccess' => 'Podcast został pomyślnie zaktualizowany!', diff --git a/modules/Admin/Language/pl/PodcastNavigation.php b/modules/Admin/Language/pl/PodcastNavigation.php index fe8d119b..6226fc2a 100644 --- a/modules/Admin/Language/pl/PodcastNavigation.php +++ b/modules/Admin/Language/pl/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Okresy czasu', 'premium' => 'Premium', 'subscription-list' => 'Wszystkie subskrypcje', - 'subscription-add' => 'Dodaj subskrypcję', + 'subscription-create' => 'Dodaj subskrypcję', 'contributors' => 'Kontrybutorzy', 'contributor-list' => 'Wszyscy kontrybutorzy', 'contributor-add' => 'Dodaj kontrybutora', diff --git a/modules/Admin/Language/pt-BR/PodcastNavigation.php b/modules/Admin/Language/pt-BR/PodcastNavigation.php index 7841e71a..94d7a7a4 100644 --- a/modules/Admin/Language/pt-BR/PodcastNavigation.php +++ b/modules/Admin/Language/pt-BR/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Períodos de tempo', 'premium' => 'Premium', 'subscription-list' => 'Todas as assinaturas', - 'subscription-add' => 'Adicionar assinatura', + 'subscription-create' => 'Adicionar assinatura', 'contributors' => 'Contribuidores', 'contributor-list' => 'Todos os contribuidores', 'contributor-add' => 'Adicionar contribuidor', diff --git a/modules/Admin/Language/pt/Podcast.php b/modules/Admin/Language/pt/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/pt/Podcast.php +++ b/modules/Admin/Language/pt/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/pt/PodcastNavigation.php b/modules/Admin/Language/pt/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/pt/PodcastNavigation.php +++ b/modules/Admin/Language/pt/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/ro/Podcast.php b/modules/Admin/Language/ro/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/ro/Podcast.php +++ b/modules/Admin/Language/ro/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/ro/PodcastNavigation.php b/modules/Admin/Language/ro/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/ro/PodcastNavigation.php +++ b/modules/Admin/Language/ro/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/ru/Podcast.php b/modules/Admin/Language/ru/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/ru/Podcast.php +++ b/modules/Admin/Language/ru/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/ru/PodcastNavigation.php b/modules/Admin/Language/ru/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/ru/PodcastNavigation.php +++ b/modules/Admin/Language/ru/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/sk/Podcast.php b/modules/Admin/Language/sk/Podcast.php index bd1979ed..1db0f269 100644 --- a/modules/Admin/Language/sk/Podcast.php +++ b/modules/Admin/Language/sk/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Posledné časti', 'see_all_episodes' => 'Pozrieť všetky časti', 'draft' => 'Koncept', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast úspešne vytvorený!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/sk/PodcastNavigation.php b/modules/Admin/Language/sk/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/sk/PodcastNavigation.php +++ b/modules/Admin/Language/sk/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/sr_Latn/Podcast.php b/modules/Admin/Language/sr_Latn/Podcast.php index d11c96fa..1b08fcf5 100644 --- a/modules/Admin/Language/sr_Latn/Podcast.php +++ b/modules/Admin/Language/sr_Latn/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Najnovije epizode', 'see_all_episodes' => 'Prikaži sve epizode', 'draft' => 'Nacrt', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podkast uspešno kreiran!', 'editSuccess' => 'Podkast je uspešno ažuriran!', diff --git a/modules/Admin/Language/sr_Latn/PodcastNavigation.php b/modules/Admin/Language/sr_Latn/PodcastNavigation.php index 2cee8017..9ea142e2 100644 --- a/modules/Admin/Language/sr_Latn/PodcastNavigation.php +++ b/modules/Admin/Language/sr_Latn/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/sv/Podcast.php b/modules/Admin/Language/sv/Podcast.php index fa2c50d1..32505fbc 100644 --- a/modules/Admin/Language/sv/Podcast.php +++ b/modules/Admin/Language/sv/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Senaste avsnitt', 'see_all_episodes' => 'Se alla avsnitt', 'draft' => 'Utkast', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast har skapats!', 'editSuccess' => 'Podcasten har uppdaterats!', diff --git a/modules/Admin/Language/sv/PodcastNavigation.php b/modules/Admin/Language/sv/PodcastNavigation.php index 4774ba9e..848c577c 100644 --- a/modules/Admin/Language/sv/PodcastNavigation.php +++ b/modules/Admin/Language/sv/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Tidsperioder', 'premium' => 'Premium', 'subscription-list' => 'Alla prenumerationer', - 'subscription-add' => 'Lägg till en prenumeration', + 'subscription-create' => 'Lägg till en prenumeration', 'contributors' => 'Bidragsgivare', 'contributor-list' => 'Alla bidragsgivare', 'contributor-add' => 'Lägg till bidragsgivare', diff --git a/modules/Admin/Language/uk/Podcast.php b/modules/Admin/Language/uk/Podcast.php index 08768f1b..ab84e4ff 100644 --- a/modules/Admin/Language/uk/Podcast.php +++ b/modules/Admin/Language/uk/Podcast.php @@ -26,8 +26,6 @@ return [ 'latest_episodes' => 'Latest episodes', 'see_all_episodes' => 'See all episodes', 'draft' => 'Draft', - 'sync_feed' => 'Synchronize feed', - 'sync_feed_hint' => 'Import this podcast\'s latest episodes', 'messages' => [ 'createSuccess' => 'Podcast successfully created!', 'editSuccess' => 'Podcast has been successfully updated!', diff --git a/modules/Admin/Language/uk/PodcastNavigation.php b/modules/Admin/Language/uk/PodcastNavigation.php index a5c98b6c..efc00e5b 100644 --- a/modules/Admin/Language/uk/PodcastNavigation.php +++ b/modules/Admin/Language/uk/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => 'Time periods', 'premium' => 'Premium', 'subscription-list' => 'All subscriptions', - 'subscription-add' => 'Add subscription', + 'subscription-create' => 'Add subscription', 'contributors' => 'Contributors', 'contributor-list' => 'All contributors', 'contributor-add' => 'Add contributor', diff --git a/modules/Admin/Language/zh-Hans/PodcastNavigation.php b/modules/Admin/Language/zh-Hans/PodcastNavigation.php index 9a50d223..cd1913a0 100644 --- a/modules/Admin/Language/zh-Hans/PodcastNavigation.php +++ b/modules/Admin/Language/zh-Hans/PodcastNavigation.php @@ -28,7 +28,7 @@ return [ 'podcast-analytics-time-periods' => '时间段', 'premium' => '高级版', 'subscription-list' => '所有订阅', - 'subscription-add' => '添加订阅', + 'subscription-create' => '添加订阅', 'contributors' => '贡献者', 'contributor-list' => '所有贡献者', 'contributor-add' => '添加贡献者', diff --git a/modules/Auth/Config/Routes.php b/modules/Auth/Config/Routes.php index 0bdc30ca..ff718079 100644 --- a/modules/Auth/Config/Routes.php +++ b/modules/Auth/Config/Routes.php @@ -90,7 +90,7 @@ $routes->group( ]); $routes->post( 'add', - 'ContributorController::attemptAdd/$1', + 'ContributorController::attemptCreate/$1', [ 'filter' => 'permission:podcast#.manage-contributors', ], diff --git a/modules/Auth/Controllers/ContributorController.php b/modules/Auth/Controllers/ContributorController.php index d976bb41..84005c0b 100644 --- a/modules/Auth/Controllers/ContributorController.php +++ b/modules/Auth/Controllers/ContributorController.php @@ -76,7 +76,7 @@ class ContributorController extends BaseController return view('contributor/view', $data); } - public function add(): string + public function create(): string { helper('form'); @@ -110,10 +110,10 @@ class ContributorController extends BaseController replace_breadcrumb_params([ 0 => $this->podcast->at_handle, ]); - return view('contributor/add', $data); + return view('contributor/create', $data); } - public function attemptAdd(): RedirectResponse + public function attemptCreate(): RedirectResponse { $user = (new UserModel())->find((int) $this->request->getPost('user')); diff --git a/modules/Fediverse/Config/Routes.php b/modules/Fediverse/Config/Routes.php index 7d5770c8..b4c469fc 100644 --- a/modules/Fediverse/Config/Routes.php +++ b/modules/Fediverse/Config/Routes.php @@ -60,7 +60,7 @@ $routes->group('', [ ]); }); // Post - $routes->post('posts/new', 'PostController::attemptCreate/$1', [ + $routes->post('posts/create', 'PostController::attemptCreate/$1', [ 'as' => 'post-attempt-create', ]); $routes->get('posts/(:uuid)', 'PostController::index/$1', [ diff --git a/modules/PodcastImport/Config/Routes.php b/modules/PodcastImport/Config/Routes.php index 28f349d3..b99c885f 100644 --- a/modules/PodcastImport/Config/Routes.php +++ b/modules/PodcastImport/Config/Routes.php @@ -38,7 +38,11 @@ $routes->group( 'as' => 'podcast-imports', 'filter' => 'permission:podcast#.manage-import', ]); - $routes->get('sync-feed', 'PodcastImportController::syncImport/$1', [ + $routes->get('sync-feeds', 'PodcastImportController::syncImport/$1', [ + 'as' => 'podcast-imports-sync', + 'filter' => 'permission:podcast#.manage-import', + ]); + $routes->post('sync-feeds', 'PodcastImportController::syncImportAttempt/$1', [ 'as' => 'podcast-imports-sync', 'filter' => 'permission:podcast#.manage-import', ]); diff --git a/modules/PodcastImport/Controllers/PodcastImportController.php b/modules/PodcastImport/Controllers/PodcastImportController.php index fc63b143..3eb0f652 100644 --- a/modules/PodcastImport/Controllers/PodcastImportController.php +++ b/modules/PodcastImport/Controllers/PodcastImportController.php @@ -104,22 +104,45 @@ class PodcastImportController extends BaseController ->with('message', lang('PodcastImport.messages.importTaskQueued')); } - public function syncImport(int $podcastId): RedirectResponse + public function syncImport(int $podcastId): string { if (! ($podcast = (new PodcastModel())->getPodcastById($podcastId)) instanceof Podcast) { throw PageNotFoundException::forPageNotFound(); } - if ($podcast->imported_feed_url === null) { + helper('form'); + + replace_breadcrumb_params([ + 0 => $podcast->at_handle, + ]); + return view('import/podcast_sync', [ + 'podcast' => $podcast, + ]); + } + + public function syncImportAttempt(int $podcastId): RedirectResponse + { + if (! ($podcast = (new PodcastModel())->getPodcastById($podcastId)) instanceof Podcast) { + throw PageNotFoundException::forPageNotFound(); + } + + $rules = [ + 'feed_url' => 'valid_url_strict', + ]; + + if (! $this->validate($rules)) { return redirect() ->back() - ->with('error', lang('PodcastImport.messages.podcastNotImported')); + ->withInput() + ->with('errors', $this->validator->getErrors()); } + $validData = $this->validator->getValidated(); + // create update task in podcastImport $importTask = new PodcastImportTask([ 'handle' => $podcast->handle, - 'feed_url' => $podcast->imported_feed_url, + 'feed_url' => $validData['feed_url'], 'language' => $podcast->language_code, 'category' => $podcast->category_id, 'status' => TaskStatus::Queued, diff --git a/modules/PodcastImport/Language/ar/PodcastImport.php b/modules/PodcastImport/Language/ar/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/ar/PodcastImport.php +++ b/modules/PodcastImport/Language/ar/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/br/PodcastImport.php b/modules/PodcastImport/Language/br/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/br/PodcastImport.php +++ b/modules/PodcastImport/Language/br/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/ca/PodcastImport.php b/modules/PodcastImport/Language/ca/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/ca/PodcastImport.php +++ b/modules/PodcastImport/Language/ca/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/da/PodcastImport.php b/modules/PodcastImport/Language/da/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/da/PodcastImport.php +++ b/modules/PodcastImport/Language/da/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/de/PodcastImport.php b/modules/PodcastImport/Language/de/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/de/PodcastImport.php +++ b/modules/PodcastImport/Language/de/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/el/PodcastImport.php b/modules/PodcastImport/Language/el/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/el/PodcastImport.php +++ b/modules/PodcastImport/Language/el/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/en/PodcastImport.php b/modules/PodcastImport/Language/en/PodcastImport.php index e7503eef..8bf494d3 100644 --- a/modules/PodcastImport/Language/en/PodcastImport.php +++ b/modules/PodcastImport/Language/en/PodcastImport.php @@ -48,6 +48,12 @@ return [ 'delete' => 'Delete', ], ], + 'syncForm' => [ + 'title' => 'Synchronize feeds', + 'feed_url' => 'Feed URL', + 'feed_url_hint' => 'The feed URL you want to synchronize with the current podcast.', + 'submit' => 'Add to queue', + ], 'messages' => [ 'canceled' => 'Import task has been successfully canceled!', 'notRunning' => 'Cannot cancel Import Task as it is not running.', @@ -55,7 +61,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/es/PodcastImport.php b/modules/PodcastImport/Language/es/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/es/PodcastImport.php +++ b/modules/PodcastImport/Language/es/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/fa/PodcastImport.php b/modules/PodcastImport/Language/fa/PodcastImport.php index 34c55dc9..ac6779ab 100644 --- a/modules/PodcastImport/Language/fa/PodcastImport.php +++ b/modules/PodcastImport/Language/fa/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'وظیفهٔ درون‌ریزی صف شد. به زودی دوباره انجام خواهد شد!', 'deleted' => 'وظیفهٔ درون‌ریزی با موفّقیت حذف شد!', 'importTaskQueued' => 'وظیفه‌ای جدید صف شد. درون‌ریزی به زودی آغاز خواهد شد!', - 'podcastNotImported' => 'از آن‌جا که پادکست درون‌ریزی نشده، قابل هم‌گام سازی نیست.', 'syncTaskQueued' => 'وظیفهٔ درون‌ریزی جدیدی صف شد. هم‌گام سازی به زودی آغاز خواهد شد!', ], ]; diff --git a/modules/PodcastImport/Language/fr/PodcastImport.php b/modules/PodcastImport/Language/fr/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/fr/PodcastImport.php +++ b/modules/PodcastImport/Language/fr/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/fr2/PodcastImport.php b/modules/PodcastImport/Language/fr2/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/fr2/PodcastImport.php +++ b/modules/PodcastImport/Language/fr2/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/fr_CA/PodcastImport.php b/modules/PodcastImport/Language/fr_CA/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/fr_CA/PodcastImport.php +++ b/modules/PodcastImport/Language/fr_CA/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/gd/PodcastImport.php b/modules/PodcastImport/Language/gd/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/gd/PodcastImport.php +++ b/modules/PodcastImport/Language/gd/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/gl/PodcastImport.php b/modules/PodcastImport/Language/gl/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/gl/PodcastImport.php +++ b/modules/PodcastImport/Language/gl/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/id/PodcastImport.php b/modules/PodcastImport/Language/id/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/id/PodcastImport.php +++ b/modules/PodcastImport/Language/id/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/it/PodcastImport.php b/modules/PodcastImport/Language/it/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/it/PodcastImport.php +++ b/modules/PodcastImport/Language/it/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/ja/PodcastImport.php b/modules/PodcastImport/Language/ja/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/ja/PodcastImport.php +++ b/modules/PodcastImport/Language/ja/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/ko/PodcastImport.php b/modules/PodcastImport/Language/ko/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/ko/PodcastImport.php +++ b/modules/PodcastImport/Language/ko/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/nl/PodcastImport.php b/modules/PodcastImport/Language/nl/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/nl/PodcastImport.php +++ b/modules/PodcastImport/Language/nl/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/nn-NO/PodcastImport.php b/modules/PodcastImport/Language/nn-NO/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/nn-NO/PodcastImport.php +++ b/modules/PodcastImport/Language/nn-NO/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/oc/PodcastImport.php b/modules/PodcastImport/Language/oc/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/oc/PodcastImport.php +++ b/modules/PodcastImport/Language/oc/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/pl/PodcastImport.php b/modules/PodcastImport/Language/pl/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/pl/PodcastImport.php +++ b/modules/PodcastImport/Language/pl/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/pt-BR/PodcastImport.php b/modules/PodcastImport/Language/pt-BR/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/pt-BR/PodcastImport.php +++ b/modules/PodcastImport/Language/pt-BR/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/pt/PodcastImport.php b/modules/PodcastImport/Language/pt/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/pt/PodcastImport.php +++ b/modules/PodcastImport/Language/pt/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/ro/PodcastImport.php b/modules/PodcastImport/Language/ro/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/ro/PodcastImport.php +++ b/modules/PodcastImport/Language/ro/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/ru/PodcastImport.php b/modules/PodcastImport/Language/ru/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/ru/PodcastImport.php +++ b/modules/PodcastImport/Language/ru/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/sk/PodcastImport.php b/modules/PodcastImport/Language/sk/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/sk/PodcastImport.php +++ b/modules/PodcastImport/Language/sk/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/sr_Latn/PodcastImport.php b/modules/PodcastImport/Language/sr_Latn/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/sr_Latn/PodcastImport.php +++ b/modules/PodcastImport/Language/sr_Latn/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/sv/PodcastImport.php b/modules/PodcastImport/Language/sv/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/sv/PodcastImport.php +++ b/modules/PodcastImport/Language/sv/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/uk/PodcastImport.php b/modules/PodcastImport/Language/uk/PodcastImport.php index e7503eef..3708fb06 100644 --- a/modules/PodcastImport/Language/uk/PodcastImport.php +++ b/modules/PodcastImport/Language/uk/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => 'Import task has been queued, it will be retried shortly!', 'deleted' => 'Import task has been successfully deleted!', 'importTaskQueued' => 'An new task has been queued, import will start shortly!', - 'podcastNotImported' => 'Podcast cannot be synched as it was not imported.', 'syncTaskQueued' => 'A new import task has been queued, synchronization will start shortly!', ], ]; diff --git a/modules/PodcastImport/Language/zh-Hans/PodcastImport.php b/modules/PodcastImport/Language/zh-Hans/PodcastImport.php index bc46c816..7572a396 100644 --- a/modules/PodcastImport/Language/zh-Hans/PodcastImport.php +++ b/modules/PodcastImport/Language/zh-Hans/PodcastImport.php @@ -55,7 +55,6 @@ return [ 'retried' => '导入任务已排队，稍后将重试！', 'deleted' => '导入任务已成功删除！', 'importTaskQueued' => '新任务已排队，导入即将开始！', - 'podcastNotImported' => '播客无法同步，因为未导入。', 'syncTaskQueued' => '新的导入任务已排队，即将开始同步！', ], ]; diff --git a/modules/PremiumPodcasts/Config/Routes.php b/modules/PremiumPodcasts/Config/Routes.php index 1da50e43..3b98b09b 100644 --- a/modules/PremiumPodcasts/Config/Routes.php +++ b/modules/PremiumPodcasts/Config/Routes.php @@ -24,13 +24,13 @@ $routes->group( 'as' => 'subscription-list', 'filter' => 'permission:podcast#.manage-subscriptions', ]); - $routes->get('add', 'SubscriptionController::add/$1', [ - 'as' => 'subscription-add', + $routes->get('new', 'SubscriptionController::create/$1', [ + 'as' => 'subscription-create', 'filter' => 'permission:podcast#.manage-subscriptions', ]); $routes->post( - 'add', - 'SubscriptionController::attemptAdd/$1', + 'new', + 'SubscriptionController::attemptCreate/$1', [ 'filter' => 'permission:podcast#.manage-subscriptions', ], diff --git a/modules/PremiumPodcasts/Controllers/SubscriptionController.php b/modules/PremiumPodcasts/Controllers/SubscriptionController.php index df6726ca..afece7fd 100644 --- a/modules/PremiumPodcasts/Controllers/SubscriptionController.php +++ b/modules/PremiumPodcasts/Controllers/SubscriptionController.php @@ -116,7 +116,7 @@ class SubscriptionController extends BaseController return view('subscription/view', $data); } - public function add(): string + public function create(): string { helper('form'); @@ -127,10 +127,10 @@ class SubscriptionController extends BaseController replace_breadcrumb_params([ 0 => $this->podcast->at_handle, ]); - return view('subscription/add', $data); + return view('subscription/create', $data); } - public function attemptAdd(): RedirectResponse + public function attemptCreate(): RedirectResponse { helper('text'); diff --git a/modules/PremiumPodcasts/Language/ar/Subscription.php b/modules/PremiumPodcasts/Language/ar/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/ar/Subscription.php +++ b/modules/PremiumPodcasts/Language/ar/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/br/Subscription.php b/modules/PremiumPodcasts/Language/br/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/br/Subscription.php +++ b/modules/PremiumPodcasts/Language/br/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/ca/Subscription.php b/modules/PremiumPodcasts/Language/ca/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/ca/Subscription.php +++ b/modules/PremiumPodcasts/Language/ca/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/da/Subscription.php b/modules/PremiumPodcasts/Language/da/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/da/Subscription.php +++ b/modules/PremiumPodcasts/Language/da/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/el/Subscription.php b/modules/PremiumPodcasts/Language/el/Subscription.php index af4ae3db..a8f8f923 100644 --- a/modules/PremiumPodcasts/Language/el/Subscription.php +++ b/modules/PremiumPodcasts/Language/el/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Ημερομηνία λήξης', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/en/Subscription.php b/modules/PremiumPodcasts/Language/en/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/en/Subscription.php +++ b/modules/PremiumPodcasts/Language/en/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/fa/Subscription.php b/modules/PremiumPodcasts/Language/fa/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/fa/Subscription.php +++ b/modules/PremiumPodcasts/Language/fa/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/fr2/Subscription.php b/modules/PremiumPodcasts/Language/fr2/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/fr2/Subscription.php +++ b/modules/PremiumPodcasts/Language/fr2/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/fr_CA/Subscription.php b/modules/PremiumPodcasts/Language/fr_CA/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/fr_CA/Subscription.php +++ b/modules/PremiumPodcasts/Language/fr_CA/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/fr_trad/Subscription.php b/modules/PremiumPodcasts/Language/fr_trad/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/fr_trad/Subscription.php +++ b/modules/PremiumPodcasts/Language/fr_trad/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/gl/Subscription.php b/modules/PremiumPodcasts/Language/gl/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/gl/Subscription.php +++ b/modules/PremiumPodcasts/Language/gl/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/id/Subscription.php b/modules/PremiumPodcasts/Language/id/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/id/Subscription.php +++ b/modules/PremiumPodcasts/Language/id/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/it/Subscription.php b/modules/PremiumPodcasts/Language/it/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/it/Subscription.php +++ b/modules/PremiumPodcasts/Language/it/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/ja/Subscription.php b/modules/PremiumPodcasts/Language/ja/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/ja/Subscription.php +++ b/modules/PremiumPodcasts/Language/ja/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/ko/Subscription.php b/modules/PremiumPodcasts/Language/ko/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/ko/Subscription.php +++ b/modules/PremiumPodcasts/Language/ko/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/nn-NO/Subscription.php b/modules/PremiumPodcasts/Language/nn-NO/Subscription.php index 41d2e89c..f08fe770 100644 --- a/modules/PremiumPodcasts/Language/nn-NO/Subscription.php +++ b/modules/PremiumPodcasts/Language/nn-NO/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/oc/Subscription.php b/modules/PremiumPodcasts/Language/oc/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/oc/Subscription.php +++ b/modules/PremiumPodcasts/Language/oc/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/pt-BR/Subscription.php b/modules/PremiumPodcasts/Language/pt-BR/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/pt-BR/Subscription.php +++ b/modules/PremiumPodcasts/Language/pt-BR/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/pt/Subscription.php b/modules/PremiumPodcasts/Language/pt/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/pt/Subscription.php +++ b/modules/PremiumPodcasts/Language/pt/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/ru/Subscription.php b/modules/PremiumPodcasts/Language/ru/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/ru/Subscription.php +++ b/modules/PremiumPodcasts/Language/ru/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/sk/Subscription.php b/modules/PremiumPodcasts/Language/sk/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/sk/Subscription.php +++ b/modules/PremiumPodcasts/Language/sk/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/sr_Latn/Subscription.php b/modules/PremiumPodcasts/Language/sr_Latn/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/sr_Latn/Subscription.php +++ b/modules/PremiumPodcasts/Language/sr_Latn/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/modules/PremiumPodcasts/Language/uk/Subscription.php b/modules/PremiumPodcasts/Language/uk/Subscription.php index f8af256f..e83f0cb2 100644 --- a/modules/PremiumPodcasts/Language/uk/Subscription.php +++ b/modules/PremiumPodcasts/Language/uk/Subscription.php @@ -34,7 +34,7 @@ return [ 'email' => 'Email', 'expiration_date' => 'Expiration date', 'expiration_date_hint' => 'The date and time at which the subscription expires. Leave empty for an unlimited subscription.', - 'submit_add' => 'Add subscription', + 'submit_create' => 'Create subscription', 'submit_edit' => 'Edit subscription', ], 'form_link_add' => [ diff --git a/themes/cp_admin/_partials/_nav_header.php b/themes/cp_admin/_partials/_nav_header.php index 59c92b27..7acb9e45 100644 --- a/themes/cp_admin/_partials/_nav_header.php +++ b/themes/cp_admin/_partials/_nav_header.php @@ -21,7 +21,7 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>
+ endSection() ?> - section('content') ?> include('import/_queue_table'); ?> diff --git a/themes/cp_admin/import/podcast_sync.php b/themes/cp_admin/import/podcast_sync.php new file mode 100644 index 00000000..21470707 --- /dev/null +++ b/themes/cp_admin/import/podcast_sync.php @@ -0,0 +1,24 @@ +extend('_layout') ?> + +section('title') ?> + +endSection() ?> + +section('pageTitle') ?> + +endSection() ?> + +section('content') ?> +
+ + + + + +endSection() ?> diff --git a/themes/cp_admin/podcast/_sidebar.php b/themes/cp_admin/podcast/_sidebar.php index 2895ab47..b0b02291 100644 --- a/themes/cp_admin/podcast/_sidebar.php +++ b/themes/cp_admin/podcast/_sidebar.php @@ -3,7 +3,7 @@ $podcastNavigation = [ 'dashboard' => [ 'icon' => 'dashboard', - 'items' => ['podcast-view', 'podcast-edit', 'podcast-persons-manage', 'podcast-imports'], + 'items' => ['podcast-view', 'podcast-edit', 'podcast-persons-manage', 'podcast-imports', 'podcast-imports-sync'], ], 'episodes' => [ 'icon' => 'play-circle', diff --git a/themes/cp_admin/podcast/create.php b/themes/cp_admin/podcast/create.php index 330f9426..4615021e 100644 --- a/themes/cp_admin/podcast/create.php +++ b/themes/cp_admin/podcast/create.php @@ -29,26 +29,11 @@ required="true" accept=".jpg,.jpeg,.png" /> - - -
- -
- - -
-
- + + +
+ +
+ + +
+
+ + + + @@ -201,8 +206,7 @@ + title="" > - + + + + + + + + + - - - - - - - - - - diff --git a/themes/cp_admin/podcast/edit.php b/themes/cp_admin/podcast/edit.php index e8d12775..9afbf98e 100644 --- a/themes/cp_admin/podcast/edit.php +++ b/themes/cp_admin/podcast/edit.php @@ -49,17 +49,9 @@ type="file" accept=".jpg,.jpeg,.png" /> - - @@ -89,6 +81,26 @@ + + +
+ +
+ + +
+
+ + + + + @@ -235,26 +247,14 @@ hint="" content="custom_rss_string) ?>" /> - + /> -imported_feed_url !== null): ?> -
- - -
- - - - - - diff --git a/themes/cp_admin/about.php b/themes/cp_admin/settings/about.php similarity index 100% rename from themes/cp_admin/about.php rename to themes/cp_admin/settings/about.php diff --git a/themes/cp_admin/subscription/add.php b/themes/cp_admin/subscription/create.php similarity index 82% rename from themes/cp_admin/subscription/add.php rename to themes/cp_admin/subscription/create.php index 0cd956bf..19fbd198 100644 --- a/themes/cp_admin/subscription/add.php +++ b/themes/cp_admin/subscription/create.php @@ -11,7 +11,7 @@ section('content') ?> -
+ @@ -28,7 +28,7 @@ hint="" /> - +
diff --git a/themes/cp_admin/subscription/list.php b/themes/cp_admin/subscription/list.php index 67ae8533..fdd50a5d 100644 --- a/themes/cp_admin/subscription/list.php +++ b/themes/cp_admin/subscription/list.php @@ -9,7 +9,7 @@ endSection() ?> section('headerRight') ?> - + endSection() ?> diff --git a/themes/cp_app/_admin_navbar.php b/themes/cp_app/_admin_navbar.php index 16d28933..771aae9f 100644 --- a/themes/cp_app/_admin_navbar.php +++ b/themes/cp_app/_admin_navbar.php @@ -15,7 +15,7 @@ $userPodcasts = get_podcasts_user_can_interact_with(auth()->user()); ?>