From 226c9836e464b3066015799c7572cd8ff3758968 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 18 May 2017 00:38:01 +0200
Subject: [PATCH] Add reset button to admin accounts search, improve looks a
 little (#3100)

---
 app/javascript/styles/forms.scss         | 9 +++++++++
 app/views/admin/accounts/index.html.haml | 9 ++++-----
 config/locales/en.yml                    | 1 +
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss
index d66359943a2..ce31f01af72 100644
--- a/app/javascript/styles/forms.scss
+++ b/app/javascript/styles/forms.scss
@@ -159,9 +159,11 @@ code {
 
   .actions {
     margin-top: 30px;
+    display: flex;
   }
 
   button,
+  .button,
   .block-button {
     display: block;
     width: 100%;
@@ -170,6 +172,8 @@ code {
     background: $ui-highlight-color;
     color: $primary-text-color;
     font-size: 18px;
+    line-height: inherit;
+    height: auto;
     padding: 10px;
     text-transform: uppercase;
     text-decoration: none;
@@ -179,6 +183,11 @@ code {
     font-weight: 500;
     outline: 0;
     margin-bottom: 10px;
+    margin-right: 10px;
+
+    &:last-child {
+      margin-right: 0;
+    }
 
     &:hover {
       background-color: lighten($ui-highlight-color, 5%);
diff --git a/app/views/admin/accounts/index.html.haml b/app/views/admin/accounts/index.html.haml
index c9a5dd17a9f..6d2849c3211 100644
--- a/app/views/admin/accounts/index.html.haml
+++ b/app/views/admin/accounts/index.html.haml
@@ -20,7 +20,7 @@
       %li= filter_link_to t('admin.accounts.order.alphabetic'), recent: nil
       %li= filter_link_to t('admin.accounts.order.most_recent'), recent: '1'
 
-= form_tag(admin_accounts_url, { method: 'GET', class: 'simple_form' }) do
+= form_tag admin_accounts_url, method: 'GET', class: 'simple_form' do
   .fields-group
     - Admin::FilterHelper::ACCOUNT_FILTERS.each do |key|
       - if params[key].present?
@@ -28,12 +28,11 @@
 
     - %i(username display_name email ip).each do |key|
       .input.string.optional
-        .label_input
-          %label.string.optional= t("admin.accounts.#{key}")
-          = text_field_tag key, params[key], class: 'string optional'
+        = text_field_tag key, params[key], class: 'string optional', placeholder: I18n.t("admin.accounts.#{key}")
 
     .actions
-      %button.btn= t('admin.accounts.search')
+      %button= t('admin.accounts.search')
+      = link_to t('admin.accounts.reset'), admin_accounts_path, class: 'button negative'
 
 %table.table
   %thead
diff --git a/config/locales/en.yml b/config/locales/en.yml
index a0c47e11e4d..8b38dd4b1f8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -85,6 +85,7 @@ en:
       profile_url: Profile URL
       public: Public
       push_subscription_expires: PuSH subscription expires
+      reset: Reset
       reset_password: Reset password
       salmon_url: Salmon URL
       search: Search