From 69e1be3a1d47bb095a0eb23315967b33c0cb1d5e Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 1 Dec 2018 05:37:41 +0000
Subject: [PATCH] dev/core#442 Fix Style issues on word replacements, credit
 card expiry date section, dedupe execptions and tags and groups section

---
 CRM/Admin/Form/WordReplacements.php               | 4 ++--
 CRM/Core/Payment.php                              | 1 +
 CRM/Core/Payment/Form.php                         | 4 +++-
 templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl | 2 +-
 templates/CRM/Contact/Page/DedupeException.tpl    | 4 ++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CRM/Admin/Form/WordReplacements.php b/CRM/Admin/Form/WordReplacements.php
index 29338517e4..2809b2ce24 100644
--- a/CRM/Admin/Form/WordReplacements.php
+++ b/CRM/Admin/Form/WordReplacements.php
@@ -127,8 +127,8 @@ class CRM_Admin_Form_WordReplacements extends CRM_Core_Form {
     }
     foreach ($soInstances as $instance) {
       $this->addElement('checkbox', "enabled[$instance]");
-      $this->add('textarea', "old[$instance]", NULL, array('rows' => 1, 'cols' => 40));
-      $this->add('textarea', "new[$instance]", NULL, array('rows' => 1, 'cols' => 40));
+      $this->add('text', "old[$instance]", NULL);
+      $this->add('text', "new[$instance]", NULL);
       $this->addElement('checkbox', "cb[$instance]");
     }
     $this->assign('numStrings', $this->_numStrings);
diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php
index f54e61d254..64d0688219 100644
--- a/CRM/Core/Payment.php
+++ b/CRM/Core/Payment.php
@@ -734,6 +734,7 @@ abstract class CRM_Core_Payment {
             'rule_parameters' => TRUE,
           ),
         ),
+        'extra' => ['class' => 'crm-form-select'],
       ),
       'credit_card_type' => array(
         'htmlType' => 'select',
diff --git a/CRM/Core/Payment/Form.php b/CRM/Core/Payment/Form.php
index 8fc4a5e6f7..0e63bf1960 100644
--- a/CRM/Core/Payment/Form.php
+++ b/CRM/Core/Payment/Form.php
@@ -115,6 +115,7 @@ class CRM_Core_Payment_Form {
   protected static function addCommonFields(&$form, $paymentFields) {
     $requiredPaymentFields = $paymentFieldsMetadata = [];
     foreach ($paymentFields as $name => $field) {
+      $field['extra'] = isset($field['extra']) ? $field['extra'] : NULL;
       if ($field['htmlType'] == 'chainSelect') {
         $form->addChainSelect($field['name'], array('required' => FALSE));
       }
@@ -123,7 +124,8 @@ class CRM_Core_Payment_Form {
           $field['name'],
           $field['title'],
           $field['attributes'],
-          FALSE
+          FALSE,
+          $field['extra']
         );
       }
       // This will cause the fields to be marked as required - but it is up to the payment processor to
diff --git a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
index f6da78e9c1..144828039a 100644
--- a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
+++ b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
@@ -33,7 +33,7 @@
         {if !$type || $type eq 'tag'}
           <td>
             <div class="crm-section tag-section">
-              {if $title}{$form.tag.label}{/if}
+              {if $title}{$form.tag.label}<br>{/if}
               {$form.tag.html}
             </div>
             {if $context NEQ 'profile'}
diff --git a/templates/CRM/Contact/Page/DedupeException.tpl b/templates/CRM/Contact/Page/DedupeException.tpl
index 189a1ef215..d0ed6076c6 100644
--- a/templates/CRM/Contact/Page/DedupeException.tpl
+++ b/templates/CRM/Contact/Page/DedupeException.tpl
@@ -31,11 +31,11 @@
     <tr>
       <td class="crm-contact-form-block-contact1">
         <label for="contact1">{ts}Contact 1{/ts}</label><br />
-        <input type="text" placeholder="Search Contact1" search-column="0" />
+        <input class="crm-form-text" type="text" placeholder="Search Contact1" search-column="0" />
       </td>
       <td class="crm-contact-form-block-contact2">
         <label for="contact2">{ts}Contact 2{/ts}</label><br />
-        <input type="text" placeholder="Search Contact2" search-column="1" />
+        <input class="crm-form-text" type="text" placeholder="Search Contact2" search-column="1" />
       </td>
     </tr>
   </table>
-- 
2.25.1