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.

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

Improvements to toots display in admin view #7452

Merged
merged 3 commits into from May 12, 2018

Conversation

Projects
None yet
6 participants
@ThibG
Collaborator

ThibG commented May 11, 2018

  • Shows “Boosted from [link to admin view of original account]” for boosted toots and show proper media/CW/sensitive status

screenshot-2018-5-11 etat du compte - thib - mastodon instance perso de thibg

  • Restore “show more” button from public views to make CW usage clearer (though content is initially unfolded)

screenshot-2018-5-11 etat du compte - thib - mastodon instance perso de thibg 1

@ThibG ThibG force-pushed the ThibG:fixes/boosts-in-admin-views branch from 268f37a to b79b565 May 11, 2018

@ThibG ThibG force-pushed the ThibG:fixes/boosts-in-admin-views branch from b79b565 to 0002b90 May 11, 2018

@Gargron

This comment has been minimized.

Member

Gargron commented May 11, 2018

I don't see the use in the show more button. If you insist, just prepend a "content warning: " localized string before it.

@ThibG

This comment has been minimized.

Collaborator

ThibG commented May 11, 2018

The use is of the show more button is simply to have a recognizable marker that the thing is a CW.
A slightly thicker font weight is not really recognizable. As for prepending with a localized “Content warning:” only partially solves that, because a toot starting with “Content warning: blalabla” isn't easily recognizable from a toot with a proper content warning.

@Gargron

This comment has been minimized.

Member

Gargron commented May 11, 2018

@ThibG Okay how about making the bold text... $error-red or something. I do not want a button that does nothing there. I don't want any button there. Sorry

@ThibG

This comment has been minimized.

Collaborator

ThibG commented May 11, 2018

It does a thing, it hides and shows the toot's contents, exactly like on a public page (just that the toots are shown by default). True, this toggle functionality isn't extremely useful here, but I think there is value in having a consistent UI…

@ThibG

This comment has been minimized.

Collaborator

ThibG commented May 12, 2018

I have removed the button.

pr

@Gargron

Nice

@Gargron Gargron merged commit 0f2fbf7 into tootsuite:master May 12, 2018

9 checks passed

ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: check-i18n Your tests passed on CircleCI!
Details
ci/circleci: install Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: install-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.4 Your tests passed on CircleCI!
Details
ci/circleci: test-ruby2.5 Your tests passed on CircleCI!
Details
ci/circleci: test-webui Your tests passed on CircleCI!
Details
codeclimate Approved by Eugen.
Details
@theotix

This comment has been minimized.

theotix commented May 12, 2018

screenshot

wtf

@ProgVal

This comment has been minimized.

Contributor

ProgVal commented May 12, 2018

wat

@arobase-che

This comment has been minimized.

arobase-che commented May 12, 2018

💕 "Make content warnings swag" 💕

gg

multiple-creatures added a commit to multiple-creatures/monsterpit-mastodon that referenced this pull request May 15, 2018

Improvements to toots display in admin view (tootsuite#7452)
* Distinguish boosts from original statuses in the admin panel (fixes tootsuite#7449)

* Show the “show more” button in admin view to make CWs clearer (fixes tootsuite#7451)

* Make content warnings swag

SerCom-KC added a commit to SerCom-KC/mastodon that referenced this pull request May 21, 2018

Gargron added a commit that referenced this pull request May 21, 2018

i18n: Update Simplified Chinese translations (#7565)
* i18n: (zh-CN) #7532

* i18n: (zh-CN) #6984

* i18n: (zh-CN) #7391, #7507

* i18n: (zh-CN) #6998

* i18n: (zh-CN) #7074

* i18n: (zh-CN) #7000, #7032, #7131 (#7032, #7040)

* i18n: (zh-CN) #7130, #7188

* i18n: (zh-CN) #6486

* i18n: (zh-CN) #6292

* i18n: (zh-CN) #7347

* i18n: (zh-CN) #6661

* i18n: (zh-CN) #6425

* i18n: (zh-CN) #6597

* i18n: (zh-CN) #6695

* i18n: (zh-CN) #6325

* i18n: (zh-CN) #6460, #7375

* i18n: (zh-CN) #6872

* i18n: (zh-CN) #6818

* i18n: (zh-CN) #7452

* i18n: (zh-CN) #7176

* i18n: (zh-CN) #6460

* i18n: (zh-CN) #7213

* i18n: (zh-CN) #7376

* i18n: (zh-CN) #6556

* i18n: (zh-CN) #6645

* i18n: (zh-CN) #6448

* i18n: (zh-CN) #5303

* i18n: (zh-CN) #7445

* i18n: (zh-CN) Normalization and improvements

* i18n: (zh-CN) #7391

* i18n: (zh-CN) #6627

* i18n: (zh-CN) #6956, #7546

* i18n: (zh-CN) #6636

* i18n: (zh-CN) #6610, #6875

* i18n: (zh-CN) #6887

* i18n: (zh-CN) #4514

* i18n: (zh-CN) #6628

* i18n: (zh-CN) #6771

* i18n: (zh-CN) #6772

* i18n: (zh-CN) #7178

* i18n: (zh-CN) #7521

* i18n: (zh-CN) #6570

* i18n: (zh-CN) #6593

* i18n: (zh-CN) #6423

* i18n: (zh-CN) #6157

* i18n: (zh-CN) #7089

* i18n: (zh-CN) #6733

* i18n: (zh-CN) #7072

* i18n: (zh-CN) #6520

* i18n: (zh-CN) Improvment

* i18n: (zh-CN) #6631

@bugQ bugQ referenced this pull request Jun 6, 2018

Closed

Restore normal functionality of CWs in admin interface #7752

1 of 2 tasks complete
@sireebob

This comment has been minimized.

sireebob commented Aug 5, 2018

this is bullshit

byronhulcher added a commit to byronhulcher/mastodon that referenced this pull request Aug 18, 2018

Improvements to toots display in admin view (tootsuite#7452)
* Distinguish boosts from original statuses in the admin panel (fixes tootsuite#7449)

* Show the “show more” button in admin view to make CWs clearer (fixes tootsuite#7451)

* Make content warnings swag

byronhulcher added a commit to byronhulcher/mastodon that referenced this pull request Aug 18, 2018

i18n: Update Simplified Chinese translations (tootsuite#7565)
* i18n: (zh-CN) tootsuite#7532

* i18n: (zh-CN) tootsuite#6984

* i18n: (zh-CN) tootsuite#7391, tootsuite#7507

* i18n: (zh-CN) tootsuite#6998

* i18n: (zh-CN) tootsuite#7074

* i18n: (zh-CN) tootsuite#7000, tootsuite#7032, tootsuite#7131 (tootsuite#7032, tootsuite#7040)

* i18n: (zh-CN) tootsuite#7130, tootsuite#7188

* i18n: (zh-CN) tootsuite#6486

* i18n: (zh-CN) tootsuite#6292

* i18n: (zh-CN) tootsuite#7347

* i18n: (zh-CN) tootsuite#6661

* i18n: (zh-CN) tootsuite#6425

* i18n: (zh-CN) tootsuite#6597

* i18n: (zh-CN) tootsuite#6695

* i18n: (zh-CN) tootsuite#6325

* i18n: (zh-CN) tootsuite#6460, tootsuite#7375

* i18n: (zh-CN) tootsuite#6872

* i18n: (zh-CN) tootsuite#6818

* i18n: (zh-CN) tootsuite#7452

* i18n: (zh-CN) tootsuite#7176

* i18n: (zh-CN) tootsuite#6460

* i18n: (zh-CN) tootsuite#7213

* i18n: (zh-CN) tootsuite#7376

* i18n: (zh-CN) tootsuite#6556

* i18n: (zh-CN) tootsuite#6645

* i18n: (zh-CN) tootsuite#6448

* i18n: (zh-CN) tootsuite#5303

* i18n: (zh-CN) tootsuite#7445

* i18n: (zh-CN) Normalization and improvements

* i18n: (zh-CN) tootsuite#7391

* i18n: (zh-CN) tootsuite#6627

* i18n: (zh-CN) tootsuite#6956, tootsuite#7546

* i18n: (zh-CN) tootsuite#6636

* i18n: (zh-CN) tootsuite#6610, tootsuite#6875

* i18n: (zh-CN) tootsuite#6887

* i18n: (zh-CN) tootsuite#4514

* i18n: (zh-CN) tootsuite#6628

* i18n: (zh-CN) tootsuite#6771

* i18n: (zh-CN) tootsuite#6772

* i18n: (zh-CN) tootsuite#7178

* i18n: (zh-CN) tootsuite#7521

* i18n: (zh-CN) tootsuite#6570

* i18n: (zh-CN) tootsuite#6593

* i18n: (zh-CN) tootsuite#6423

* i18n: (zh-CN) tootsuite#6157

* i18n: (zh-CN) tootsuite#7089

* i18n: (zh-CN) tootsuite#6733

* i18n: (zh-CN) tootsuite#7072

* i18n: (zh-CN) tootsuite#6520

* i18n: (zh-CN) Improvment

* i18n: (zh-CN) tootsuite#6631
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment