Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add descriptions to Feed Information Table #3031

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Add descriptions to Feed Information Table #3031

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f9660b
fix: overwrite fixed modal width so that the table fits all conditions
wofferl Jan 6, 2025
7724bec
feat: add explanations for the individual values in the feed informat…
wofferl Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
82 changes: 65 additions & 17 deletions src/components/modals/FeedInfoTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,41 @@
@close="$emit('close')">
<div class="table-modal">
<h2>{{ t('news', 'Article feed information') }}</h2>
<table>
<tr>
<td>
{{ t('news', 'Last update') }}:
</td>
<td>
{{ t('news', 'Time when the feed was last downloaded') }}
</td>
</tr>
<tr>
<td>
{{ t('news', 'Next update') }}:
</td>
<td>
{{ t('news', 'Time when the next feed update will be done') }}<br>
({{ t('news', 'Only if activated in the admin settings, otherwise the regular update interval is used') }})
</td>
</tr>
<tr>
<td>
APU ({{ t('news', 'Articles per update') }}):
</td>
<td>
{{ t('news', 'Maximum number of articles reached in a feed update') }}
</td>
</tr>
<tr>
<td>
EC ({{ t('news', 'Error Count') }}):
</td>
<td>
{{ t('news', 'Number of errors that have occurred since the last successful feed update') }}
</td>
</tr>
</table>
<table>
<thead>
<tr>
Expand Down Expand Up @@ -70,12 +105,22 @@
</thead>
<tbody>
<tr v-for="feed in sortedFeeds" :key="feed.id">
<td>{{ feed.id }}</td>
<td>{{ feed.title }}</td>
<td>{{ formatDate(feed.lastModified/1000) }}</td>
<td>{{ formatDate(feed.nextUpdateTime*1000) }}</td>
<td>{{ feed.articlesPerUpdate }}</td>
<td :title="feed.lastUpdateError">
<td class="number">
{{ feed.id }}
</td>
<td class="text">
{{ feed.title }}
</td>
<td class="date">
{{ formatDate(feed.lastModified/1000) }}
</td>
<td class="date">
{{ formatDate(feed.nextUpdateTime*1000) }}
</td>
<td class="number">
{{ feed.articlesPerUpdate }}
</td>
<td class="number" :title="feed.lastUpdateError">
{{ feed.updateErrorCount }}
</td>
</tr>
Expand Down Expand Up @@ -193,21 +238,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;
}
}

Expand All @@ -224,5 +264,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));
}
</style>
Loading