Fill in create, edit, update, and destroy for keyword mutes interface.

Also add a destroy-all action, which can be useful if you're flushing an
old list entirely to start a new one.

5 files changed, 27 insertions, 17 deletions

diff --git a/app/views/settings/keyword_mutes/_fields.html.haml b/app/views/settings/keyword_mutes/_fields.html.haml
new file mode 100644
index 000000000..892676f18
--- /dev/null
+++ b/app/views/settings/keyword_mutes/_fields.html.haml
@@ -0,0 +1,11 @@
+.fields-group
+  = f.input :keyword
+  = f.check_box :whole_word
+  = f.label :whole_word, t('keyword_mutes.match_whole_word')
+
+.actions
+  - if f.object.persisted?
+    = f.button :button, t('generic.save_changes'), type: :submit
+    = link_to t('keyword_mutes.remove'), settings_keyword_mute_path(f.object), class: 'negative button', method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
+  - else
+    = f.button :button, t('keyword_mutes.add_keyword'), type: :submit
diff --git a/app/views/settings/keyword_mutes/_keyword_mute.html.haml b/app/views/settings/keyword_mutes/_keyword_mute.html.haml
index a2698ac7b..7e191d79b 100644
--- a/app/views/settings/keyword_mutes/_keyword_mute.html.haml
+++ b/app/views/settings/keyword_mutes/_keyword_mute.html.haml
@@ -2,6 +2,9 @@
   %td
     = keyword_mute.keyword
   %td
+    - if keyword_mute.whole_word
+      %i.fa.fa-check
+  %td
     = table_link_to 'edit', t('settings.keyword_mutes.edit'), edit_settings_keyword_mute_path(keyword_mute)
   %td
     = table_link_to 'times', t('settings.keyword_mutes.delete'), settings_keyword_mute_path(keyword_mute), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/settings/keyword_mutes/edit.html.haml b/app/views/settings/keyword_mutes/edit.html.haml
new file mode 100644
index 000000000..2b52f4018
--- /dev/null
+++ b/app/views/settings/keyword_mutes/edit.html.haml
@@ -0,0 +1,6 @@
+- content_for :page_title do
+  = t('keyword_mutes.edit_keyword')
+
+= simple_form_for @keyword_mute, url: settings_keyword_mute_path(@keyword_mute) do |f|
+  = render 'shared/error_messages', object: @keyword_mute
+  = render 'fields', f: f
diff --git a/app/views/settings/keyword_mutes/index.html.haml b/app/views/settings/keyword_mutes/index.html.haml
index 6b212895d..b359eea4a 100644
--- a/app/views/settings/keyword_mutes/index.html.haml
+++ b/app/views/settings/keyword_mutes/index.html.haml
@@ -5,11 +5,14 @@
   %table.table
     %thead
       %tr
-        %th= t('settings.keyword_mutes.keyword')
+        %th= t('keyword_mutes.keyword')
+        %th= t('keyword_mutes.match_whole_word')
         %th
         %th
       %tbody
         = render @keyword_mutes
 
 = paginate @keyword_mutes
-= link_to t('settings.keyword_mutes.add_keyword'), new_settings_keyword_mute_path, class: 'button'
+.simple_form
+  = link_to t('keyword_mutes.add_keyword'), new_settings_keyword_mute_path, class: 'button'
+  = link_to t('keyword_mutes.remove_all'), destroy_all_settings_keyword_mutes_path, class: 'button negative', method: :delete, data: { confirm: t('admin.accounts.are_you_sure') }
diff --git a/app/views/settings/keyword_mutes/new.html.haml b/app/views/settings/keyword_mutes/new.html.haml
index 5e8268e97..197f10cd7 100644
--- a/app/views/settings/keyword_mutes/new.html.haml
+++ b/app/views/settings/keyword_mutes/new.html.haml
@@ -1,19 +1,6 @@
 - content_for :page_title do
-  = t('settings.keyword_mutes.add_keyword')
+  = t('keyword_mutes.add_keyword')
 
 = simple_form_for @keyword_mute, url: settings_keyword_mutes_path do |f|
   = render 'shared/error_messages', object: @keyword_mute
-
-  %p.muted-hint
-    Keywords match word boundaries case-insensitively.  For example:
-    %ul
-      %li
-        <strong>alice</strong> matches <strong>alice</strong>, <strong>Alice</strong>, and <strong>Alice's</strong>
-      %li
-        <strong>bob</strong> matches <strong>bob</strong> and <strong>Bob</strong> but not <strong>bobcat</strong>
-
-  .fields-group
-    = f.input :keyword
-
-  .actions
-    = f.button :button, t('admin.keyword_mutes.add_keyword'), type: :submit
+  = render 'fields', f: f