Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-25 02:31:59 -05:00
Code Issues Activity

Moved the pagination to the right based on feedback

Browse source 
refs https://github.com/TryGhost/Team/issues/2149
This commit is contained in:
James Morris 2022-10-25 16:13:35 +01:00
parent 3e206411f8
commit 66e42c8b29
2 changed files with 38 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
ghost/admin/app/components/posts/post-activity-feed.hbs
View file

@ -76,43 +76,15 @@
{{/let}} {{/let}}
{{/each}} {{/each}}
{{#let (compute (fn this.getAmountOfStubs eventsFetcher)) as |stubs|}} {{#if (not (compute (fn this.isPaginationNeeded eventsFetcher)))}}
{{#each stubs}} {{#let (compute (fn this.getAmountOfStubs eventsFetcher)) as |stubs|}}
<div class="gh-dashboard-list-item"></div> {{#each stubs}}
{{/each}} <div class="gh-dashboard-list-item"></div>
{{/let}} {{/each}}
{{/let}}
{{/if}}
<div class="gh-post-activity-feed-footer"> <div class="gh-post-activity-feed-footer">
<div class="gh-post-activity-feed-pagination">
{{#if (compute (fn this.isPaginationNeeded eventsFetcher))}}
Showing {{eventsFetcher.totalEvents}} in total
{{else}}
<div class="gh-post-activity-feed-pagination-group">
<button
class="gh-post-activity-feed-pagination-button gh-post-activity-feed-prev-button"
type="button"
title="Previous page"
disabled={{compute (fn this.isPreviousButtonDisabled eventsFetcher)}}
{{on "click" eventsFetcher.loadPreviousPage}}
>
{{svg-jar "arrow-left-pagination"}}
</button>
<button
class="gh-post-activity-feed-pagination-button gh-post-activity-feed-next-button"
type="button"
title="Next page"
disabled={{compute (fn this.isNextButtonDisabled eventsFetcher)}}
{{on "click" eventsFetcher.loadNextPage}}
>
{{svg-jar "arrow-right-pagination"}}
</button>
</div>
Showing {{eventsFetcher.previousEvents}}-{{eventsFetcher.shownEvents}} of {{eventsFetcher.totalEvents}}
{{/if}}
</div>
{{#if @linkQuery}} {{#if @linkQuery}}
<LinkTo <LinkTo
class="gh-post-activity-feed-pagination-link" class="gh-post-activity-feed-pagination-link"
@ -123,6 +95,36 @@
See members See members
</LinkTo> </LinkTo>
{{/if}} {{/if}}
<div class="gh-post-activity-feed-pagination">
{{#if (compute (fn this.isPaginationNeeded eventsFetcher))}}
Showing {{eventsFetcher.totalEvents}} in total
{{else}}
Showing {{eventsFetcher.previousEvents}}-{{eventsFetcher.shownEvents}} of {{eventsFetcher.totalEvents}}
{{/if}}
<div class="gh-post-activity-feed-pagination-group">
<button
class="gh-post-activity-feed-pagination-button gh-post-activity-feed-prev-button"
type="button"
title="Previous page"
disabled={{compute (fn this.isPreviousButtonDisabled eventsFetcher)}}
{{on "click" eventsFetcher.loadPreviousPage}}
>
{{svg-jar "arrow-left-pagination"}}
</button>
<button
class="gh-post-activity-feed-pagination-button gh-post-activity-feed-next-button"
type="button"
title="Next page"
disabled={{compute (fn this.isNextButtonDisabled eventsFetcher)}}
{{on "click" eventsFetcher.loadNextPage}}
>
{{svg-jar "arrow-right-pagination"}}
</button>
</div>
</div>
</div> </div>
</div> </div>

1
ghost/admin/app/styles/layouts/content.css
View file

@ -1627,6 +1627,7 @@ a.gh-post-list-cta.stats.is-hovered:hover > * {
opacity: 0.99999; opacity: 0.99999;
background-color: #ffffff; background-color: #ffffff;
border-radius: 0 0 4px 4px; border-radius: 0 0 4px 4px;
min-height: 121px;
} }
.gh-tabs-analytics h3 { .gh-tabs-analytics h3 {