github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-29 02:35:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Expand reason descriptions and add configurable link to community guidelines

Browse Source
This commit is contained in:
Toby Zerner 2015-11-04 12:59:29 +10:30
parent 39b8f0ad7a
commit 379b1f0831
5 changed files with 67 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/flags/js/admin/src/components/FlagsSettingsModal.js Normal file
View File

@ -0,0 +1,20 @@
import SettingsModal from 'flarum/components/SettingsModal';
export default class FlagsSettingsModal extends SettingsModal {
className() {
return 'FlagsSettingsModal Modal--small';
}
title() {
return app.translator.trans('flarum-flags.admin.settings.title');
}
form() {
return [
<div className="Form-group">
<label>{app.translator.trans('flarum-flags.admin.settings.guidelines_url_label')}</label>
<input className="FormControl" bidi={this.setting('flarum-flags.guidelines_url')}/>
</div>
];
}
}

4
extensions/flags/js/admin/src/main.js
View File

@ -2,7 +2,11 @@ import { extend } from 'flarum/extend';
import app from 'flarum/app';
import PermissionGrid from 'flarum/components/PermissionGrid';
import FlagsSettingsModal from 'flarum/flags/components/FlagsSettingsModal';
app.initializers.add('flarum-flags', () => {
app.extensionSettings['flarum-flags'] = () => app.modal.show(new FlagsSettingsModal());
extend(PermissionGrid.prototype, 'moderateItems', items => {
items.add('viewFlags', {
icon: 'flag',

20
extensions/flags/js/forum/src/components/FlagPostModal.js
View File

@ -18,30 +18,36 @@ export default class FlagPostModal extends Modal {
}
content() {
const guidelinesUrl = app.forum.attribute('guidelinesUrl');
return (
<div className="Modal-body">
<div className="Form">
<div className="Form Form--centered">
<div className="Form-group">
<label>{app.translator.trans('flarum-flags.forum.flag_post.reason_heading')}</label>
<div>
<label className="checkbox">
<input type="radio" name="reason" checked={this.reason() === 'off_topic'} value="off_topic" onclick={m.withAttr('value', this.reason)}/>
{app.translator.trans('flarum-flags.forum.flag_post.reason_off_topic_label')}
<strong>{app.translator.trans('flarum-flags.forum.flag_post.reason_off_topic_label')}</strong>
{app.translator.trans('flarum-flags.forum.flag_post.reason_off_topic_text')}
</label>
<label className="checkbox">
<input type="radio" name="reason" checked={this.reason() === 'inappropriate'} value="inappropriate" onclick={m.withAttr('value', this.reason)}/>
{app.translator.trans('flarum-flags.forum.flag_post.reason_inappropriate_label')}
<strong>{app.translator.trans('flarum-flags.forum.flag_post.reason_inappropriate_label')}</strong>
{app.translator.trans('flarum-flags.forum.flag_post.reason_inappropriate_text', {
a: guidelinesUrl ? <a href={guidelinesUrl} target="_blank"/> : undefined
})}
</label>
<label className="checkbox">
<input type="radio" name="reason" checked={this.reason() === 'spam'} value="spam" onclick={m.withAttr('value', this.reason)}/>
{app.translator.trans('flarum-flags.forum.flag_post.reason_spam_label')}
<strong>{app.translator.trans('flarum-flags.forum.flag_post.reason_spam_label')}</strong>
{app.translator.trans('flarum-flags.forum.flag_post.reason_spam_text')}
</label>
<label className="checkbox">
<input type="radio" name="reason" checked={this.reason() === 'other'} value="other" onclick={m.withAttr('value', this.reason)}/>
{app.translator.trans('flarum-flags.forum.flag_post.reason_other_label')}
<strong>{app.translator.trans('flarum-flags.forum.flag_post.reason_other_label')}</strong>
{this.reason() === 'other' ? (
<textarea className="FormControl" value={this.reasonDetail()} oninput={m.withAttr('value', this.reasonDetail)}></textarea>
) : ''}
@ -51,7 +57,7 @@ export default class FlagPostModal extends Modal {
<div className="Form-group">
<Button
className="Button Button--primary"
className="Button Button--primary Button--block"
type="submit"
loading={this.loading}
disabled={!this.reason()}>

14
extensions/flags/less/forum/extension.less
View File

@ -56,3 +56,17 @@
display: none;
}
}
.FlagPostModal {
.Form-group {
margin-bottom: 20px;
}
.checkbox {
margin-bottom: 12px;
strong {
display: block;
color: @text-color;
}
}
}

16
extensions/flags/src/Listener/AddFlagsApi.php
View File

@ -19,10 +19,24 @@ use Flarum\Event\ConfigureModelDates;
use Flarum\Event\PrepareApiAttributes;
use Flarum\Flags\Api\Controller;
use Flarum\Flags\Flag;
use Flarum\Settings\SettingsRepositoryInterface;
use Illuminate\Contracts\Events\Dispatcher;
class AddFlagsApi
{
/**
* @var SettingsRepositoryInterface
*/
protected $settings;
/**
* @param SettingsRepositoryInterface $settings
*/
public function __construct(SettingsRepositoryInterface $settings)
{
$this->settings = $settings;
}
/**
* @param Dispatcher $events
*/
@ -54,6 +68,8 @@ class AddFlagsApi
if ($event->attributes['canViewFlags']) {
$event->attributes['flagsCount'] = (int) $this->getFlagsCount($event->actor);
}
$event->attributes['guidelinesUrl'] = $this->settings->get('flarum-flags.guidelines_url');
}
if ($event->isSerializer(CurrentUserSerializer::class)) {