logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe git clone https://hacktivis.me/git/pleroma-fe.git
commit: f715de43f2bae1593128f34f7362c1963a54e3a1
parent f0ba0e68559b3665b76f0022c5ad3b8f457c37a5
Author: tusooa <tusooa@kazv.moe>
Date:   Mon,  7 Nov 2022 13:22:40 -0500

Add labels for timeline header

Diffstat:

Msrc/components/popover/popover.js7++++++-
Msrc/components/popover/popover.vue1+
Msrc/components/quick_filter_settings/quick_filter_settings.vue5++---
Msrc/components/quick_view_settings/quick_view_settings.vue5++---
Msrc/components/timeline/timeline.vue1+
Msrc/i18n/en.json4+++-
6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js @@ -43,7 +43,12 @@ const Popover = { overlayCentersSelector: String, // Lets hover popover stay when clicking inside of it - stayOnClick: Boolean + stayOnClick: Boolean, + + triggerAttrs: { + type: Object, + default: {} + } }, inject: ['popoversZLayer'], // override popover z layer data () { diff --git a/src/components/popover/popover.vue b/src/components/popover/popover.vue @@ -7,6 +7,7 @@ ref="trigger" class="button-unstyled popover-trigger-button" type="button" + v-bind="triggerAttrs" @click="onClick" > <slot name="trigger" /> diff --git a/src/components/quick_filter_settings/quick_filter_settings.vue b/src/components/quick_filter_settings/quick_filter_settings.vue @@ -3,6 +3,7 @@ trigger="click" class="QuickFilterSettings" :bound-to="{ x: 'container' }" + :triggerAttrs="{ title: $t('timeline.quick_filter_settings') }" > <template #content> <div class="dropdown-menu"> @@ -79,9 +80,7 @@ </div> </template> <template #trigger> - <button class="button-unstyled"> - <FAIcon icon="filter" /> - </button> + <FAIcon icon="filter" /> </template> </Popover> </template> diff --git a/src/components/quick_view_settings/quick_view_settings.vue b/src/components/quick_view_settings/quick_view_settings.vue @@ -3,6 +3,7 @@ trigger="click" class="QuickViewSettings" :bound-to="{ x: 'container' }" + :triggerAttrs="{ title: $t('timeline.quick_view_settings') }" > <template #content> <div class="dropdown-menu"> @@ -66,9 +67,7 @@ </div> </template> <template #trigger> - <button class="button-unstyled"> - <FAIcon icon="bars" /> - </button> + <FAIcon icon="bars" /> </template> </Popover> </template> diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue @@ -47,6 +47,7 @@ v-else-if="!embedded" class="loadmore-text faint veryfaint rightside-icon" :title="$t('timeline.up_to_date')" + :aria-disabled="true" @click.prevent > <FAIcon diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -807,7 +807,9 @@ "no_more_statuses": "No more statuses", "no_statuses": "No statuses", "socket_reconnected": "Realtime connection established", - "socket_broke": "Realtime connection lost: CloseEvent code {0}" + "socket_broke": "Realtime connection lost: CloseEvent code {0}", + "quick_view_settings": "Quick view settings", + "quick_filter_settings": "Quick filter settings" }, "status": { "favorites": "Favorites",