From fbad6ab8cbd7a9003386a63bb7814b033dc21034 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sat, 21 May 2016 20:35:13 +0930
Subject: [PATCH] Add label to dismiss flag button, change icon to eye-slash

ref #7 cc @jordanjay29
---
 extensions/flags/js/forum/dist/extension.js      | 12 ++++++++++--
 extensions/flags/js/forum/src/addFlagsToPosts.js | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/extensions/flags/js/forum/dist/extension.js b/extensions/flags/js/forum/dist/extension.js
index 787bf8e6c..7dfbbcb31 100644
--- a/extensions/flags/js/forum/dist/extension.js
+++ b/extensions/flags/js/forum/dist/extension.js
@@ -123,9 +123,17 @@ System.register('flarum/flags/addFlagsToPosts', ['flarum/extend', 'flarum/app',
         });
       });
 
-      items.merge(controls);
+      items.add('controls', m(
+        'div',
+        { className: 'ButtonGroup' },
+        controls.toArray()
+      ));
 
-      items.add('dismiss', m(Button, { className: 'Button Button--icon Button--link', icon: 'times', onclick: this.dismissFlag.bind(this), title: app.translator.trans('flarum-flags.forum.post.dismiss_flag_tooltip') }), -100);
+      items.add('dismiss', m(
+        Button,
+        { className: 'Button', icon: 'eye-slash', onclick: this.dismissFlag.bind(this) },
+        app.translator.trans('flarum-flags.forum.post.dismiss_flag_button')
+      ), -100);
 
       return items;
     };
diff --git a/extensions/flags/js/forum/src/addFlagsToPosts.js b/extensions/flags/js/forum/src/addFlagsToPosts.js
index e968c44f4..9fba53074 100644
--- a/extensions/flags/js/forum/src/addFlagsToPosts.js
+++ b/extensions/flags/js/forum/src/addFlagsToPosts.js
@@ -63,9 +63,17 @@ export default function() {
       extend(props, 'onclick', () => this.dismissFlag());
     });
 
-    items.merge(controls);
+    items.add('controls', (
+      <div className="ButtonGroup">
+        {controls.toArray()}
+      </div>
+    ));
 
-    items.add('dismiss', <Button className="Button Button--icon Button--link" icon="ban" onclick={this.dismissFlag.bind(this)} title={app.translator.trans('flarum-flags.forum.post.dismiss_flag_tooltip')}/>, -100);
+    items.add('dismiss', (
+      <Button className="Button" icon="eye-slash" onclick={this.dismissFlag.bind(this)}>
+        {app.translator.trans('flarum-flags.forum.post.dismiss_flag_button')}
+      </Button>
+    ), -100);
 
     return items;
   };