From 5f9660b65afb85071a6976f5b9b7292cdb654f13 Mon Sep 17 00:00:00 2001 From: Wolfgang Date: Mon, 6 Jan 2025 11:55:20 +0100 Subject: [PATCH 1/2] fix: overwrite fixed modal width so that the table fits all conditions Signed-off-by: Wolfgang --- src/components/modals/FeedInfoTable.vue | 47 ++++++++++++++++--------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/src/components/modals/FeedInfoTable.vue b/src/components/modals/FeedInfoTable.vue index 9faf33306..d5083a361 100644 --- a/src/components/modals/FeedInfoTable.vue +++ b/src/components/modals/FeedInfoTable.vue @@ -70,12 +70,22 @@ - {{ feed.id }} - {{ feed.title }} - {{ formatDate(feed.lastModified/1000) }} - {{ formatDate(feed.nextUpdateTime*1000) }} - {{ feed.articlesPerUpdate }} - + + {{ feed.id }} + + + {{ feed.title }} + + + {{ formatDate(feed.lastModified/1000) }} + + + {{ formatDate(feed.nextUpdateTime*1000) }} + + + {{ feed.articlesPerUpdate }} + + {{ feed.updateErrorCount }} @@ -193,21 +203,16 @@ export default { border-top: 1px solid var(--color-background-dark); border-bottom: unset; - &.noborder { - border-top: unset; + &.text { + text-align: left; } - &.ellipsis_top { - padding-bottom: 0; + &.number { + text-align: right; } - &.ellipsis { - padding-top: 0; - padding-bottom: 0; - } - - &.ellipsis_bottom { - padding-top: 0; + &.date { + text-align: center; } } @@ -224,5 +229,13 @@ export default { height: 20px; width: 20px; } + + } + + /* overwrite the fixed large modal width */ + :deep(.modal-wrapper--large > .modal-container) { + max-width: 90%; + width: max-content; + max-height: min(90%, 100% - 2 * var(--header-height)); } From 7724bece890945880641ba4552e647d7a2cf0ad4 Mon Sep 17 00:00:00 2001 From: Wolfgang Date: Mon, 6 Jan 2025 11:59:02 +0100 Subject: [PATCH 2/2] feat: add explanations for the individual values in the feed information table Signed-off-by: Wolfgang --- CHANGELOG.md | 1 + src/components/modals/FeedInfoTable.vue | 35 +++++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1bb21dc32..851fd9902 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ You can also check [on GitHub](https://github.com/nextcloud/news/releases), the # Unreleased ## [25.x.x] ### Changed +- add explanations for the individual values in the feed information table ### Fixed diff --git a/src/components/modals/FeedInfoTable.vue b/src/components/modals/FeedInfoTable.vue index d5083a361..fa452e847 100644 --- a/src/components/modals/FeedInfoTable.vue +++ b/src/components/modals/FeedInfoTable.vue @@ -7,6 +7,41 @@ @close="$emit('close')">

{{ t('news', 'Article feed information') }}

+ + + + + + + + + + + + + + + + + +
+ {{ t('news', 'Last update') }}: + + {{ t('news', 'Time when the feed was last downloaded') }} +
+ {{ t('news', 'Next update') }}: + + {{ t('news', 'Time when the next feed update will be done') }}
+ ({{ t('news', 'Only if activated in the admin settings, otherwise the regular update interval is used') }}) +
+ APU ({{ t('news', 'Articles per update') }}): + + {{ t('news', 'Maximum number of articles reached in a feed update') }} +
+ EC ({{ t('news', 'Error Count') }}): + + {{ t('news', 'Number of errors that have occurred since the last successful feed update') }} +