From cbd83ddebb3c7e88157f90905c4ac63bf5214c44 Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Thu, 6 Aug 2020 11:19:56 -0400 Subject: [PATCH] Swap out button/submit inputs for button elements --- CRM/Admin/Form/Preferences/Display.php | 2 +- CRM/Admin/Form/Setting/Smtp.php | 6 +++++- CRM/Batch/Form/Entry.php | 5 +++-- CRM/Case/Form/CaseView.php | 8 ++++++-- CRM/Contact/Form/Contact.php | 15 +++++++++------ CRM/Contact/Form/Search.php | 3 ++- CRM/Contact/Form/Task/AddToParentClass.php | 8 ++++++-- CRM/Contribute/Form/ContributionPage.php | 5 ++++- CRM/Contribute/Form/ContributionPage/Widget.php | 5 +++-- CRM/Contribute/Import/Form/DataSource.php | 5 ++++- CRM/Core/BAO/Mapping.php | 12 +++++++++--- CRM/Core/Form.php | 11 ++++++++--- CRM/Custom/Form/Field.php | 7 +++++-- CRM/Custom/Form/Group.php | 5 ++++- CRM/Custom/Form/Option.php | 9 +++++++-- CRM/Event/Form/ManageEvent/Fee.php | 7 +++++-- CRM/Financial/Form/BatchTransaction.php | 12 +++++++----- CRM/Financial/Form/Search.php | 3 ++- CRM/Price/Form/Field.php | 7 +++++-- CRM/Profile/Form.php | 5 +++-- CRM/Profile/Form/Edit.php | 2 +- CRM/Report/Form.php | 7 +++++-- CRM/UF/Form/Field.php | 7 +++++-- CRM/UF/Form/Group.php | 5 ++++- install/template.html | 6 +++--- js/jquery/jquery.dashboard.js | 4 ++-- setup/plugins/blocks/advanced.tpl.php | 2 +- setup/plugins/blocks/install.tpl.php | 5 ++--- setup/plugins/blocks/requirements.tpl.php | 2 +- setup/src/Setup/UI/SetupController.php | 2 +- templates/CRM/Block/Add.tpl | 2 +- templates/CRM/Block/FullTextSearch.tpl | 2 +- templates/CRM/Contact/Page/View/Print.tpl | 2 +- templates/CRM/Mailing/Page/Resubscribe.tpl | 4 ++-- templates/CRM/common/navigation.js.tpl | 2 +- 35 files changed, 129 insertions(+), 65 deletions(-) diff --git a/CRM/Admin/Form/Preferences/Display.php b/CRM/Admin/Form/Preferences/Display.php index 775fa2c04e..41073eed62 100644 --- a/CRM/Admin/Form/Preferences/Display.php +++ b/CRM/Admin/Form/Preferences/Display.php @@ -50,7 +50,7 @@ class CRM_Admin_Form_Preferences_Display extends CRM_Admin_Form_Preferences { $invoiceSettings = Civi::settings()->get('contribution_invoice_settings'); $this->assign('invoicing', CRM_Invoicing_Utils::isInvoicingEnabled()); - $this->addElement('submit', 'ckeditor_config', ts('Configure CKEditor')); + $this->addElement('xbutton', 'ckeditor_config', ts('Configure CKEditor'), ['type' => 'submit']); $editOptions = CRM_Core_OptionGroup::values('contact_edit_options', FALSE, FALSE, FALSE, 'AND v.filter = 0'); $this->assign('editOptions', $editOptions); diff --git a/CRM/Admin/Form/Setting/Smtp.php b/CRM/Admin/Form/Setting/Smtp.php index da909c7f08..1c6dc0d46a 100644 --- a/CRM/Admin/Form/Setting/Smtp.php +++ b/CRM/Admin/Form/Setting/Smtp.php @@ -61,7 +61,11 @@ class CRM_Admin_Form_Setting_Smtp extends CRM_Admin_Form_Setting { $this->addFormRule(['CRM_Admin_Form_Setting_Smtp', 'formRule']); parent::buildQuickForm(); $buttons = $this->getElement('buttons')->getElements(); - $buttons[] = $this->createElement('submit', $this->_testButtonName, ts('Save & Send Test Email'), ['crm-icon' => 'fa-envelope-o']); + $attrs = [ + 'type' => 'submit', + 'crm-icon' => 'fa-envelope-o', + ]; + $buttons[] = $this->createElement('xbutton', $this->_testButtonName, ts('Save & Send Test Email'), $attrs); $this->getElement('buttons')->setElements($buttons); if (!empty($setStatus)) { diff --git a/CRM/Batch/Form/Entry.php b/CRM/Batch/Form/Entry.php index e60ababdb4..8e1a3022f4 100644 --- a/CRM/Batch/Form/Entry.php +++ b/CRM/Batch/Form/Entry.php @@ -173,9 +173,10 @@ class CRM_Batch_Form_Entry extends CRM_Core_Form { // add the force save button $forceSave = $this->getButtonName('upload', 'force'); - $this->addElement('submit', + $this->addElement('xbutton', $forceSave, - ts('Ignore Mismatch & Process the Batch?') + ts('Ignore Mismatch & Process the Batch?'), + ['type' => 'submit'] ); $this->addButtons([ diff --git a/CRM/Case/Form/CaseView.php b/CRM/Case/Form/CaseView.php index 7c9724a53c..f2300dadb2 100644 --- a/CRM/Case/Form/CaseView.php +++ b/CRM/Case/Form/CaseView.php @@ -275,7 +275,10 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form { // This button is hidden but gets clicked by javascript at // https://github.com/civicrm/civicrm-core/blob/bd28ecf8121a85bc069cad3ab912a0c3dff8fdc5/templates/CRM/Case/Form/CaseView.js#L194 // by the onChange handler for the above timeline_id select. - $this->addElement('submit', $this->getButtonName('next'), ' ', ['class' => 'hiddenElement']); + $this->addElement('xbutton', $this->getButtonName('next'), ' ', [ + 'class' => 'hiddenElement', + 'type' => 'submit', + ]); $this->buildMergeCaseForm(); @@ -523,11 +526,12 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form { // This button is hidden but gets clicked by javascript at // https://github.com/civicrm/civicrm-core/blob/bd28ecf8121a85bc069cad3ab912a0c3dff8fdc5/templates/CRM/Case/Form/CaseView.js#L55 // when the mergeCasesDialog is saved. - $this->addElement('submit', + $this->addElement('xbutton', $this->getButtonName('next', 'merge_case'), ts('Merge'), [ 'class' => 'hiddenElement', + 'type' => 'submit', ] ); } diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php index 04e3c8a897..5d6ce311bc 100644 --- a/CRM/Contact/Form/Contact.php +++ b/CRM/Contact/Form/Contact.php @@ -808,17 +808,20 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { $this->addField('image_URL', ['maxlength' => '255', 'label' => ts('Browse/Upload Image')]); // add the dedupe button - $this->addElement('submit', + $this->addElement('xbutton', $this->_dedupeButtonName, - ts('Check for Matching Contact(s)') + ts('Check for Matching Contact(s)'), + ['type' => 'submit'] ); - $this->addElement('submit', + $this->addElement('xbutton', $this->_duplicateButtonName, - ts('Save Matching Contact') + ts('Save Matching Contact'), + ['type' => 'submit'] ); - $this->addElement('submit', + $this->addElement('xbutton', $this->getButtonName('next', 'sharedHouseholdDuplicate'), - ts('Save With Duplicate Household') + ts('Save With Duplicate Household'), + ['type' => 'submit'] ); $buttons = [ diff --git a/CRM/Contact/Form/Search.php b/CRM/Contact/Form/Search.php index 25c95ac6b7..af5e9f8213 100644 --- a/CRM/Contact/Form/Search.php +++ b/CRM/Contact/Form/Search.php @@ -469,8 +469,9 @@ class CRM_Contact_Form_Search extends CRM_Core_Form_Search { // also set the group title and freeze the action task with Add Members to Group $groupValues = ['id' => $this->_amtgID, 'title' => $this->_group[$this->_amtgID]]; $this->assign_by_ref('group', $groupValues); - $this->add('submit', $this->_actionButtonName, ts('Add Contacts to %1', [1 => $this->_group[$this->_amtgID]]), + $this->add('xbutton', $this->_actionButtonName, ts('Add Contacts to %1', [1 => $this->_group[$this->_amtgID]]), [ + 'type' => 'submit', 'class' => 'crm-form-submit', ] ); diff --git a/CRM/Contact/Form/Task/AddToParentClass.php b/CRM/Contact/Form/Task/AddToParentClass.php index f98aa34e32..ac69e5e142 100644 --- a/CRM/Contact/Form/Task/AddToParentClass.php +++ b/CRM/Contact/Form/Task/AddToParentClass.php @@ -65,8 +65,12 @@ class CRM_Contact_Form_Task_AddToParentClass extends CRM_Contact_Form_Task { $this->assign('searchCount', $searchCount); $this->assign('searchDone', $this->get('searchDone')); $this->assign('contact_type_display', $contactType); - $this->addElement('submit', $this->getButtonName('refresh'), ts('Search'), ['class' => 'crm-form-submit']); - $this->addElement('submit', $this->getButtonName('cancel'), ts('Cancel'), ['class' => 'crm-form-submit']); + $buttonAttrs = [ + 'type' => 'submit', + 'class' => 'crm-form-submit', + ]; + $this->addElement('xbutton', $this->getButtonName('refresh'), ts('Search'), $buttonAttrs); + $this->addElement('xbutton', $this->getButtonName('cancel'), ts('Cancel'), $buttonAttrs); $this->addButtons([ [ 'type' => 'next', diff --git a/CRM/Contribute/Form/ContributionPage.php b/CRM/Contribute/Form/ContributionPage.php index ba8bb64ec0..76e245eabd 100644 --- a/CRM/Contribute/Form/ContributionPage.php +++ b/CRM/Contribute/Form/ContributionPage.php @@ -222,7 +222,10 @@ class CRM_Contribute_Form_ContributionPage extends CRM_Core_Form { // views are implemented as frozen form if ($this->_action & CRM_Core_Action::VIEW) { $this->freeze(); - $this->addElement('button', 'done', ts('Done'), ['onclick' => "location.href='civicrm/admin/custom/group?reset=1&action=browse'"]); + $this->addElement('xbutton', 'done', ts('Done'), [ + 'type' => 'button', + 'onclick' => "location.href='civicrm/admin/custom/group?reset=1&action=browse'", + ]); } // don't show option for contribution amounts section if membership price set diff --git a/CRM/Contribute/Form/ContributionPage/Widget.php b/CRM/Contribute/Form/ContributionPage/Widget.php index 7c6ee1bb99..77cdd5094a 100644 --- a/CRM/Contribute/Form/ContributionPage/Widget.php +++ b/CRM/Contribute/Form/ContributionPage/Widget.php @@ -188,9 +188,10 @@ class CRM_Contribute_Form_ContributionPage_Widget extends CRM_Contribute_Form_Co $this->assign_by_ref('colorFields', $this->_colorFields); $this->_refreshButtonName = $this->getButtonName('refresh'); - $this->addElement('submit', + $this->addElement('xbutton', $this->_refreshButtonName, - ts('Save and Preview') + ts('Save and Preview'), + ['type' => 'submit'] ); parent::buildQuickForm(); $this->addFormRule(['CRM_Contribute_Form_ContributionPage_Widget', 'formRule'], $this); diff --git a/CRM/Contribute/Import/Form/DataSource.php b/CRM/Contribute/Import/Form/DataSource.php index f1c72357c7..6833eafd0e 100644 --- a/CRM/Contribute/Import/Form/DataSource.php +++ b/CRM/Contribute/Import/Form/DataSource.php @@ -38,7 +38,10 @@ class CRM_Contribute_Import_Form_DataSource extends CRM_Import_Form_DataSource { $this->setDefaults(['onDuplicate' => CRM_Import_Parser::DUPLICATE_SKIP]); - $this->addElement('submit', 'loadMapping', ts('Load Mapping'), NULL, ['onclick' => 'checkSelect()']); + $this->addElement('xbutton', 'loadMapping', ts('Load Mapping'), [ + 'type' => 'submit', + 'onclick' => 'checkSelect()', + ]); $this->addContactTypeSelector(); } diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php index e2e0e7057a..58b573c3f8 100644 --- a/CRM/Core/BAO/Mapping.php +++ b/CRM/Core/BAO/Mapping.php @@ -318,8 +318,11 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { $hasRelationTypes = []; $columnCount = $columnNo; - $form->addElement('submit', 'addBlock', ts('Also include contacts where'), - ['class' => 'submit-link'] + $form->addElement('xbutton', 'addBlock', ts('Also include contacts where'), + [ + 'type' => 'submit', + 'class' => 'submit-link', + ] ); $contactTypes = CRM_Contact_BAO_ContactType::basicTypes(); @@ -553,7 +556,10 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { $form->add('text', "value[$x][$i]", ''); } - $form->addElement('submit', "addMore[$x]", ts('Another search field'), ['class' => 'submit-link']); + $form->addElement('xbutton', "addMore[$x]", ts('Another search field'), [ + 'type' => 'submit', + 'class' => 'submit-link', + ]); } //end of block for diff --git a/CRM/Core/Form.php b/CRM/Core/Form.php index 98526b5a81..8a48473c01 100644 --- a/CRM/Core/Form.php +++ b/CRM/Core/Form.php @@ -686,7 +686,8 @@ class CRM_Core_Form extends HTML_QuickForm_Page { } if ($button['type'] === 'reset') { - $prevnext[] = $this->createElement($button['type'], 'reset', $button['name'], $attrs); + $attrs['type'] = 'reset'; + $prevnext[] = $this->createElement('xbutton', 'reset', $button['name'], $attrs); } else { if (!empty($button['subName'])) { @@ -709,7 +710,8 @@ class CRM_Core_Form extends HTML_QuickForm_Page { $attrs['crm-icon'] = $icon; } $buttonName = $this->getButtonName($button['type'], CRM_Utils_Array::value('subName', $button)); - $prevnext[] = $this->createElement('submit', $buttonName, $button['name'], $attrs); + $attrs['type'] = 'submit'; + $prevnext[] = $this->createElement('xbutton', $buttonName, $button['name'], $attrs); } if (!empty($button['isDefault'])) { $this->setDefaultAction($button['type']); @@ -2448,7 +2450,10 @@ class CRM_Core_Form extends HTML_QuickForm_Page { $this->_actionButtonName = $this->getButtonName('next', 'action'); } $this->assign('actionButtonName', $this->_actionButtonName); - $this->add('submit', $this->_actionButtonName, ts('Go'), ['class' => 'hiddenElement crm-search-go-button']); + $this->add('xbutton', $this->_actionButtonName, ts('Go'), [ + 'type' => 'submit', + 'class' => 'hiddenElement crm-search-go-button', + ]); // Radio to choose "All items" or "Selected items only" $selectedRowsRadio = $this->addElement('radio', 'radio_ts', NULL, '', 'ts_sel', ['checked' => 'checked']); diff --git a/CRM/Custom/Form/Field.php b/CRM/Custom/Form/Field.php index 840650e7d9..af6ca363cb 100644 --- a/CRM/Custom/Form/Field.php +++ b/CRM/Custom/Form/Field.php @@ -565,10 +565,13 @@ class CRM_Custom_Form_Field extends CRM_Core_Form { if ($this->_action & CRM_Core_Action::VIEW) { $this->freeze(); $url = CRM_Utils_System::url('civicrm/admin/custom/group/field', 'reset=1&action=browse&gid=' . $this->_gid); - $this->addElement('button', + $this->addElement('xbutton', 'done', ts('Done'), - ['onclick' => "location.href='$url'"] + [ + 'type' => 'button', + 'onclick' => "location.href='$url'", + ] ); } } diff --git a/CRM/Custom/Form/Group.php b/CRM/Custom/Form/Group.php index 0c37d90374..09cffc7533 100644 --- a/CRM/Custom/Form/Group.php +++ b/CRM/Custom/Form/Group.php @@ -351,7 +351,10 @@ class CRM_Custom_Form_Group extends CRM_Core_Form { // TODO: Is this condition ever true? Can this code be removed? if ($this->_action & CRM_Core_Action::VIEW) { $this->freeze(); - $this->addElement('button', 'done', ts('Done'), ['onclick' => "location.href='civicrm/admin/custom/group?reset=1&action=browse'"]); + $this->addElement('xbutton', 'done', ts('Done'), [ + 'type' => 'button', + 'onclick' => "location.href='civicrm/admin/custom/group?reset=1&action=browse'", + ]); } } diff --git a/CRM/Custom/Form/Option.php b/CRM/Custom/Form/Option.php index 3bb6a5fb6c..054df62529 100644 --- a/CRM/Custom/Form/Option.php +++ b/CRM/Custom/Form/Option.php @@ -201,10 +201,15 @@ class CRM_Custom_Form_Option extends CRM_Core_Form { 'reset=1&action=browse&fid=' . $this->_fid . '&gid=' . $this->_gid, TRUE, NULL, FALSE ); - $this->addElement('button', + $this->addElement('xbutton', 'done', ts('Done'), - ['onclick' => "location.href='$url'", 'class' => 'crm-form-submit cancel', 'crm-icon' => 'fa-times'] + [ + 'type' => 'button', + 'onclick' => "location.href='$url'", + 'class' => 'crm-form-submit cancel', + 'crm-icon' => 'fa-times', + ] ); } } diff --git a/CRM/Event/Form/ManageEvent/Fee.php b/CRM/Event/Form/ManageEvent/Fee.php index 40b40fc912..78fdadaf62 100644 --- a/CRM/Event/Form/ManageEvent/Fee.php +++ b/CRM/Event/Form/ManageEvent/Fee.php @@ -355,8 +355,11 @@ class CRM_Event_Form_ManageEvent_Fee extends CRM_Event_Form_ManageEvent { $this->add('datepicker', 'discount_end_date[' . $i . ']', ts('Discount End Date'), [], FALSE, ['time' => FALSE]); } $_showHide->addToTemplate(); - $this->addElement('submit', $this->getButtonName('submit'), ts('Add Discount Set to Fee Table'), - ['class' => 'crm-form-submit cancel'] + $this->addElement('xbutton', $this->getButtonName('submit'), ts('Add Discount Set to Fee Table'), + [ + 'type' => 'submit', + 'class' => 'crm-form-submit cancel', + ] ); if (Civi::settings()->get('deferred_revenue_enabled')) { $deferredFinancialType = CRM_Financial_BAO_FinancialAccount::getDeferredFinancialType(); diff --git a/CRM/Financial/Form/BatchTransaction.php b/CRM/Financial/Form/BatchTransaction.php index 408a84e729..20848b58ec 100644 --- a/CRM/Financial/Form/BatchTransaction.php +++ b/CRM/Financial/Form/BatchTransaction.php @@ -75,7 +75,7 @@ class CRM_Financial_Form_BatchTransaction extends CRM_Contribute_Form_Search { */ public function buildQuickForm() { if ($this->_batchStatus == 'Closed') { - $this->add('submit', 'export_batch', ts('Export Batch')); + $this->add('xbutton', 'export_batch', ts('Export Batch'), ['type' => 'submit']); } // do not build rest of form unless it is open/reopened batch @@ -85,9 +85,9 @@ class CRM_Financial_Form_BatchTransaction extends CRM_Contribute_Form_Search { parent::buildQuickForm(); if (CRM_Batch_BAO_Batch::checkBatchPermission('close', $this->_values['created_id'])) { - $this->add('submit', 'close_batch', ts('Close Batch')); + $this->add('xbutton', 'close_batch', ts('Close Batch'), ['type' => 'submit']); if (CRM_Batch_BAO_Batch::checkBatchPermission('export', $this->_values['created_id'])) { - $this->add('submit', 'export_batch', ts('Close & Export Batch')); + $this->add('xbutton', 'export_batch', ts('Close & Export Batch'), ['type' => 'submit']); } } @@ -99,8 +99,9 @@ class CRM_Financial_Form_BatchTransaction extends CRM_Contribute_Form_Search { ts('Task'), ['' => ts('- actions -')] + ['Remove' => ts('Remove from Batch')]); - $this->add('submit', 'rSubmit', ts('Go'), + $this->add('xbutton', 'rSubmit', ts('Go'), [ + 'type' => 'submit', 'class' => 'crm-form-submit', 'id' => 'GoRemove', ]); @@ -123,8 +124,9 @@ class CRM_Financial_Form_BatchTransaction extends CRM_Contribute_Form_Search { ts('Task'), ['' => ts('- actions -')] + ['Assign' => ts('Assign to Batch')]); - $this->add('submit', 'submit', ts('Go'), + $this->add('xbutton', 'submit', ts('Go'), [ + 'type' => 'submit', 'class' => 'crm-form-submit', 'id' => 'Go', ]); diff --git a/CRM/Financial/Form/Search.php b/CRM/Financial/Form/Search.php index 985d9ddfbb..069c6e0a9a 100644 --- a/CRM/Financial/Form/Search.php +++ b/CRM/Financial/Form/Search.php @@ -93,8 +93,9 @@ class CRM_Financial_Form_Search extends CRM_Core_Form { ts('Task'), ['' => ts('- actions -')] + $batchAction); - $this->add('submit', 'submit', ts('Go'), + $this->add('xbutton', 'submit', ts('Go'), [ + 'type' => 'submit', 'class' => 'crm-form-submit', 'id' => 'Go', ]); diff --git a/CRM/Price/Form/Field.php b/CRM/Price/Form/Field.php index 571ab77be1..aed5e90a8d 100644 --- a/CRM/Price/Form/Field.php +++ b/CRM/Price/Form/Field.php @@ -376,10 +376,13 @@ class CRM_Price_Form_Field extends CRM_Core_Form { if ($this->_action & CRM_Core_Action::VIEW) { $this->freeze(); $url = CRM_Utils_System::url('civicrm/admin/price/field', 'reset=1&action=browse&sid=' . $this->_sid); - $this->addElement('button', + $this->addElement('xbutton', 'done', ts('Done'), - ['onclick' => "location.href='$url'"] + [ + 'type' => 'button', + 'onclick' => "location.href='$url'", + ] ); } } diff --git a/CRM/Profile/Form.php b/CRM/Profile/Form.php index 8d8f46cd88..c34f1388dd 100644 --- a/CRM/Profile/Form.php +++ b/CRM/Profile/Form.php @@ -904,9 +904,10 @@ class CRM_Profile_Form extends CRM_Core_Form { if ($this->_context == 'dialog') { $this->addElement( - 'submit', + 'xbutton', $this->_duplicateButtonName, - ts('Save Matching Contact') + ts('Save Matching Contact'), + ['type' => 'submit'] ); } } diff --git a/CRM/Profile/Form/Edit.php b/CRM/Profile/Form/Edit.php index 7564dc37fc..16bc4a31eb 100644 --- a/CRM/Profile/Form/Edit.php +++ b/CRM/Profile/Form/Edit.php @@ -209,7 +209,7 @@ SELECT module,is_reserved if (($this->_multiRecord & CRM_Core_Action::DELETE) && $this->_recordExists) { $this->_deleteButtonName = $this->getButtonName('upload', 'delete'); - $this->addElement('submit', $this->_deleteButtonName, ts('Delete')); + $this->addElement('xbutton', $this->_deleteButtonName, ts('Delete'), ['type' => 'submit']); return; } diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php index aaf8bb15fd..1099be3bb0 100644 --- a/CRM/Report/Form.php +++ b/CRM/Report/Form.php @@ -1535,7 +1535,7 @@ class CRM_Report_Form extends CRM_Core_Form { if (!empty($this->_charts)) { $this->addElement('select', "charts", ts('Chart'), $this->_charts); $this->assign('charts', $this->_charts); - $this->addElement('submit', $this->_chartButtonName, ts('View')); + $this->addElement('xbutton', $this->_chartButtonName, ts('View'), ['type' => 'submit']); } } @@ -1660,7 +1660,10 @@ class CRM_Report_Form extends CRM_Core_Form { $this->assign('group', TRUE); } - $this->addElement('submit', $this->_groupButtonName, '', ['style' => 'display: none;']); + $this->addElement('xbutton', $this->_groupButtonName, '', [ + 'type' => 'submit', + 'style' => 'display: none;', + ]); $this->addChartOptions(); $showResultsLabel = $this->getResultsLabel(); diff --git a/CRM/UF/Form/Field.php b/CRM/UF/Form/Field.php index 4bfcb214af..997962cd40 100644 --- a/CRM/UF/Form/Field.php +++ b/CRM/UF/Form/Field.php @@ -467,8 +467,11 @@ class CRM_UF_Form_Field extends CRM_Core_Form { // if view mode pls freeze it with the done button. if ($this->_action & CRM_Core_Action::VIEW) { $this->freeze(); - $this->addElement('button', 'done', ts('Done'), - ['onclick' => "location.href='civicrm/admin/uf/group/field?reset=1&action=browse&gid=" . $this->_gid . "'"] + $this->addElement('xbutton', 'done', ts('Done'), + [ + 'type' => 'button', + 'onclick' => "location.href='civicrm/admin/uf/group/field?reset=1&action=browse&gid=" . $this->_gid . "'", + ] ); } diff --git a/CRM/UF/Form/Group.php b/CRM/UF/Form/Group.php index a9fef4dc8f..5a4d3dd570 100644 --- a/CRM/UF/Form/Group.php +++ b/CRM/UF/Form/Group.php @@ -231,7 +231,10 @@ class CRM_UF_Form_Group extends CRM_Core_Form { // views are implemented as frozen form if ($this->_action & CRM_Core_Action::VIEW) { $this->freeze(); - $this->addElement('button', 'done', ts('Done'), ['onclick' => "location.href='civicrm/admin/uf/group?reset=1&action=browse'"]); + $this->addElement('xbutton', 'done', ts('Done'), [ + 'type' => 'button', + 'onclick' => "location.href='civicrm/admin/uf/group?reset=1&action=browse'", + ]); } $this->addFormRule(['CRM_UF_Form_Group', 'formRule'], $this); diff --git a/install/template.html b/install/template.html index e95165536b..eb12944d22 100644 --- a/install/template.html +++ b/install/template.html @@ -34,7 +34,7 @@ if ($text_direction == 'rtl') {

- +

-

+

diff --git a/js/jquery/jquery.dashboard.js b/js/jquery/jquery.dashboard.js index 4191285449..00c65260ec 100644 --- a/js/jquery/jquery.dashboard.js +++ b/js/jquery/jquery.dashboard.js @@ -526,8 +526,8 @@ html += '
'; html += '
'; html += '
'; - html += ' '; - html += ' '; + html += ' '; + html += ' '; html += '
'; html += '
'; return html; diff --git a/setup/plugins/blocks/advanced.tpl.php b/setup/plugins/blocks/advanced.tpl.php index 971d22c1fd..abfc039260 100644 --- a/setup/plugins/blocks/advanced.tpl.php +++ b/setup/plugins/blocks/advanced.tpl.php @@ -26,7 +26,7 @@ endif; ?>
- +