tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add moderation warnings (#9519)

Browse Source 
* Add moderation warnings

Replace individual routes for disabling, silencing, and suspending
a user, as well as the report update route, with a unified account
action controller that allows you to select an action (none,
disable, silence, suspend) as well as whether it should generate an
e-mail notification with optional custom text. That notification,
with the optional custom text, is saved as a warning.

Additionally, there are warning presets you can configure to save
time when performing the above.

* Use Account#local_username_and_domain
This commit is contained in:
Eugen Rochko
2018-12-22 20:02:09 +01:00
committed by GitHub
parent 00862dcaff
commit 3c033c4352
72 changed files with 685 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/images/icon_flag.svg Normal file
View File

@ -0,0 +1,4 @@
<svg fill="#FFFFFF" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
<path d="M0 0h24v24H0z" fill="none"/>
<path d="M14.4 6L14 4H5v17h2v-7h5.6l.4 2h7V6z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 197 B

BIN
app/javascript/images/mailer/icon_warning.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 371 B

4
app/javascript/styles/mailer.scss
View File

@ -426,6 +426,10 @@ h5 {
background: $success-green;
}
&.alert-icon td {
background: $error-red;
}
img {
max-width: 32px;
width: 32px;

4
app/javascript/styles/mastodon/admin.scss
View File

@ -542,6 +542,10 @@ a.name-tag,
border-left-color: lighten($error-red, 12%);
}
&.warning {
border-left-color: $gold-star;
}
&__bubble {
padding: 16px;
padding-left: 14px;