From: Coleman Watts Date: Fri, 31 Jan 2014 18:27:49 +0000 (-0800) Subject: CRM-13966 - Refactor out and remove crmasmselect X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ab345ca52e2b604ac53e816354f94d3e8fdf676f;p=civicrm-core.git CRM-13966 - Refactor out and remove crmasmselect --- diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php index bc09379a2a..1b0fcc307c 100644 --- a/CRM/Activity/Form/Activity.php +++ b/CRM/Activity/Form/Activity.php @@ -835,7 +835,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task { if (!empty($tags)) { $this->add('select', 'tag', ts('Tags'), $tags, FALSE, - array('id' => 'tags', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'tags', 'multiple' => 'multiple', 'class' => 'crm-select2') ); } diff --git a/CRM/Campaign/BAO/Query.php b/CRM/Campaign/BAO/Query.php index 177a7f61bd..fbc2d325e7 100755 --- a/CRM/Campaign/BAO/Query.php +++ b/CRM/Campaign/BAO/Query.php @@ -331,11 +331,11 @@ civicrm_activity_assignment.record_type_id = $assigneeID ) "; $contactTypes = CRM_Contact_BAO_ContactType::getSelectElements(); $form->add('select', 'contact_type', ts('Contact Type(s)'), $contactTypes, FALSE, - array('id' => 'contact_type', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'contact_type', 'multiple' => 'multiple', 'class' => 'crm-select2') ); $groups = CRM_Core_PseudoConstant::group(); $form->add('select', 'group', ts('Groups'), $groups, FALSE, - array('id' => 'group', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'group', 'multiple' => 'multiple', 'class' => 'crm-select2') ); $showInterviewer = FALSE; diff --git a/CRM/Case/Form/Case.php b/CRM/Case/Form/Case.php index 255ecc6b32..7c37a1308e 100644 --- a/CRM/Case/Form/Case.php +++ b/CRM/Case/Form/Case.php @@ -269,7 +269,7 @@ class CRM_Case_Form_Case extends CRM_Core_Form { $tags = CRM_Core_BAO_Tag::getTags('civicrm_case'); if (!empty($tags)) { $this->add('select', 'tag', ts('Select Tags'), $tags, FALSE, - array('id' => 'tags', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'tags', 'multiple' => 'multiple', 'class' => 'crm-select2') ); } diff --git a/CRM/Case/Form/CaseView.php b/CRM/Case/Form/CaseView.php index 248e19955c..4e5234cc65 100644 --- a/CRM/Case/Form/CaseView.php +++ b/CRM/Case/Form/CaseView.php @@ -425,7 +425,7 @@ class CRM_Case_Form_CaseView extends CRM_Core_Form { if (!empty($allTags)) { $this->add('select', 'case_tag', ts('Tags'), $allTags, FALSE, - array('id' => 'tags', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'tags', 'multiple' => 'multiple', 'class' => 'crm-select2') ); $tags = CRM_Core_BAO_EntityTag::getTag($this->_caseID, 'civicrm_case'); diff --git a/CRM/Contact/Form/Contact.php b/CRM/Contact/Form/Contact.php index 2610fa6376..3af21b4c87 100644 --- a/CRM/Contact/Form/Contact.php +++ b/CRM/Contact/Form/Contact.php @@ -779,15 +779,14 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { } // subtype is a common field. lets keep it here - $subtypes = CRM_Contact_BAO_ContactType::subTypePairs($this->_contactType); + $subtypes = CRM_Contact_BAO_Contact::buildOptions('contact_sub_type', 'create', array('contact_type' => $this->_contactType)); if (!empty($subtypes)) { $sel = $this->add('select', 'contact_sub_type', ts('Contact Type'), $subtypes, FALSE, array( 'id' => 'contact_sub_type', 'multiple' => 'multiple', - 'title' => '- ' . ts('select') . ' -', - 'class' => $buildCustomData, + 'class' => $buildCustomData . ' crm-select2', ) ); } @@ -807,7 +806,7 @@ class CRM_Contact_Form_Contact extends CRM_Core_Form { // build tags and groups CRM_Contact_Form_Edit_TagsAndGroups::buildQuickForm($this, 0, CRM_Contact_Form_Edit_TagsAndGroups::ALL, - FALSE, NULL, 'Group(s)', 'Tag(s)', NULL, 'crmasmSelect'); + FALSE, NULL, 'Group(s)', 'Tag(s)', NULL, 'select'); // build location blocks. CRM_Contact_Form_Edit_Lock::buildQuickForm($this); diff --git a/CRM/Contact/Form/Edit/TagsAndGroups.php b/CRM/Contact/Form/Edit/TagsAndGroups.php index 7917cc3a1d..3bbaf5480c 100644 --- a/CRM/Contact/Form/Edit/TagsAndGroups.php +++ b/CRM/Contact/Form/Edit/TagsAndGroups.php @@ -111,7 +111,7 @@ class CRM_Contact_Form_Edit_TagsAndGroups { continue; } - if ($groupElementType == 'crmasmSelect') { + if ($groupElementType == 'select') { $groupsOptions[$id] = $group['title']; } else { @@ -120,9 +120,9 @@ class CRM_Contact_Form_Edit_TagsAndGroups { } } - if ($groupElementType == 'crmasmSelect' && !empty($groupsOptions)) { + if ($groupElementType == 'select' && !empty($groupsOptions)) { $form->add('select', $fName, ts('%1', array(1 => $groupName)), $groupsOptions, FALSE, - array('id' => $fName, 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => $fName, 'multiple' => 'multiple', 'class' => 'crm-select2') ); $form->assign('groupCount', count($groupsOptions)); } @@ -190,7 +190,7 @@ class CRM_Contact_Form_Edit_TagsAndGroups { $contactGroup = CRM_Contact_BAO_GroupContact::getContactGroup($id, 'Added', NULL, FALSE, TRUE); if ($contactGroup) { foreach ($contactGroup as $group) { - if ($groupElementType == 'crmasmSelect') { + if ($groupElementType == 'select') { $defaults[$fName][] = $group['group_id']; } else { @@ -242,7 +242,7 @@ class CRM_Contact_Form_Edit_TagsAndGroups { // set the group and tag ids $groupElementType = 'checkbox'; if (CRM_Utils_System::getClassName($form) == 'CRM_Contact_Form_Contact') { - $groupElementType = 'crmasmSelect'; + $groupElementType = 'select'; } self::setDefaults($form->_contactId, $defaults, self::ALL, NULL, $groupElementType); } diff --git a/CRM/Contribute/BAO/Query.php b/CRM/Contribute/BAO/Query.php index 20e6bc8039..48335e2452 100644 --- a/CRM/Contribute/BAO/Query.php +++ b/CRM/Contribute/BAO/Query.php @@ -752,21 +752,23 @@ class CRM_Contribute_BAO_Query { ts('Currency Type'), array( '' => ts('- any -')) + - CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'currency', array('labelColumn' => 'name')) + CRM_Core_PseudoConstant::get('CRM_Contribute_DAO_Contribution', 'currency', array('labelColumn' => 'name')), + FALSE, array('class' => 'crm-select2') ); // CRM-13848 $form->add('select', 'financial_type_id', ts('Financial Type'), CRM_Contribute_PseudoConstant::financialType(), FALSE, - array('id' => 'financial_type_id', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'financial_type_id', 'multiple' => 'multiple', 'class' => 'crm-select2') ); $form->add('select', 'contribution_page_id', ts('Contribution Page'), array( '' => ts('- any -')) + - CRM_Contribute_PseudoConstant::contributionPage() + CRM_Contribute_PseudoConstant::contributionPage(), + FALSE, array('class' => 'crm-select2') ); @@ -774,14 +776,16 @@ class CRM_Contribute_BAO_Query { ts('Payment Instrument'), array( '' => ts('- any -')) + - CRM_Contribute_PseudoConstant::paymentInstrument() + CRM_Contribute_PseudoConstant::paymentInstrument(), + FALSE, array('class' => 'crm-select2') ); $form->add('select', 'contribution_pcp_made_through_id', ts('Personal Campaign Page'), array( '' => ts('- any -')) + - CRM_Contribute_PseudoConstant::pcPage() + CRM_Contribute_PseudoConstant::pcPage(), + FALSE, array('class' => 'crm-select2') ); $status = array(); @@ -848,7 +852,9 @@ class CRM_Contribute_BAO_Query { if ( !empty( $batches ) ) { $form->add('select', 'contribution_batch_id', ts('Batch Name'), - array( '' => ts('- any -')) + $batches ); + array('' => ts('- any -')) + $batches, + FALSE, array('class' => 'crm-select2') + ); } $form->assign('validCiviContribute', TRUE); diff --git a/CRM/Contribute/Form/ContributionPage/Settings.php b/CRM/Contribute/Form/ContributionPage/Settings.php index 4b0ab46472..be06c45e17 100644 --- a/CRM/Contribute/Form/ContributionPage/Settings.php +++ b/CRM/Contribute/Form/ContributionPage/Settings.php @@ -217,7 +217,7 @@ class CRM_Contribute_Form_ContributionPage_Settings extends CRM_Contribute_Form_ array( 'id' => 'soft_credit_types', 'multiple' => 'multiple', - 'title' => '- ' . ts('select') . ' -', + 'class' => 'crm-select2', ) ); diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php index 47ed3d7cfe..93e281a640 100644 --- a/CRM/Contribute/Form/Search.php +++ b/CRM/Contribute/Form/Search.php @@ -243,17 +243,16 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form { // multiselect for groups if ($this->_group) { $this->add('select', 'group', ts('Groups'), $this->_group, FALSE, - array('id' => 'group', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'group', 'multiple' => 'multiple', 'class' => 'crm-select2') ); } // multiselect for tags - require_once 'CRM/Core/BAO/Tag.php'; $contactTags = CRM_Core_BAO_Tag::getTags(); if ($contactTags) { $this->add('select', 'contact_tags', ts('Tags'), $contactTags, FALSE, - array('id' => 'contact_tags', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'contact_tags', 'multiple' => 'multiple', 'class' => 'crm-select2') ); } diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php index 540d4ec628..4145fad2fa 100644 --- a/CRM/Core/BAO/File.php +++ b/CRM/Core/BAO/File.php @@ -387,7 +387,7 @@ if (!empty($tags)) { $form->add('select', "tag_$i", ts('Tags'), $tags, FALSE, - array('id' => "tags_$i", 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => "tags_$i", 'multiple' => 'multiple', 'class' => 'crm-select2') ); } } diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php index 9a79b94b1c..26bd78fc75 100644 --- a/CRM/Core/Resources.php +++ b/CRM/Core/Resources.php @@ -575,7 +575,6 @@ class CRM_Core_Resources { "js/Common.js", "js/jquery/jquery.crmeditable.js", - "js/jquery/jquery.crmasmselect.js", ); // Add localized jQuery UI files diff --git a/CRM/Financial/Form/BatchTransaction.php b/CRM/Financial/Form/BatchTransaction.php index fa4a94898f..6112332fb5 100644 --- a/CRM/Financial/Form/BatchTransaction.php +++ b/CRM/Financial/Form/BatchTransaction.php @@ -106,14 +106,14 @@ class CRM_Financial_Form_BatchTransaction extends CRM_Contribute_Form { // multiselect for groups if ($this->_group) { $this->add('select', 'group', ts('Groups'), $this->_group, FALSE, - array('id' => 'group', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'group', 'multiple' => 'multiple', 'class' => 'crm-select2') ); } $contactTags = CRM_Core_BAO_Tag::getTags(); if ($contactTags) { $this->add('select', 'contact_tags', ts('Tags'), $contactTags, FALSE, - array('id' => 'contact_tags', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'contact_tags', 'multiple' => 'multiple', 'class' => 'crm-select2') ); } CRM_Contribute_BAO_Query::buildSearchForm($this); diff --git a/CRM/Grant/BAO/Query.php b/CRM/Grant/BAO/Query.php index b3d14f7cdb..91da27c50d 100644 --- a/CRM/Grant/BAO/Query.php +++ b/CRM/Grant/BAO/Query.php @@ -301,14 +301,14 @@ class CRM_Grant_BAO_Query { $grantType = CRM_Core_OptionGroup::values('grant_type'); $form->add('select', 'grant_type_id', ts('Grant Type'), - array( - '' => ts('- any -')) + $grantType + array('' => ts('- any -')) + $grantType, + FALSE, array('class' => 'crm-select2') ); $grantStatus = CRM_Core_OptionGroup::values('grant_status'); $form->add('select', 'grant_status_id', ts('Grant Status'), - array( - '' => ts('- any -')) + $grantStatus + array('' => ts('- any -')) + $grantStatus, + FALSE, array('class' => 'crm-select2') ); $form->addDate('grant_application_received_date_low', ts('App. Received Date - From'), FALSE, array('formatType' => 'searchDate')); diff --git a/CRM/Mailing/BAO/Query.php b/CRM/Mailing/BAO/Query.php index ea18d25891..5b14a88136 100644 --- a/CRM/Mailing/BAO/Query.php +++ b/CRM/Mailing/BAO/Query.php @@ -363,7 +363,7 @@ class CRM_Mailing_BAO_Query { if (!empty($mailings)) { $form->add('select', 'mailing_id', ts('Mailing Name(s)'), $mailings, FALSE, - array('id' => 'mailing_id', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'mailing_id', 'multiple' => 'multiple', 'class' => 'crm-select2') ); } @@ -383,7 +383,7 @@ class CRM_Mailing_BAO_Query { array('keyColumn' => 'id', 'labelColumn' => 'name') ); $form->add('select', 'mailing_bounce_types', ts('Bounce Types'), $mailingBounceTypes, FALSE, - array('id' => 'mailing_bounce_types', 'multiple' => 'multiple', 'title' => ts('- select -')) + array('id' => 'mailing_bounce_types', 'multiple' => 'multiple', 'class' => 'crm-select2') ); // event filters diff --git a/CRM/Pledge/BAO/Query.php b/CRM/Pledge/BAO/Query.php index c21945c4af..05b50c6797 100644 --- a/CRM/Pledge/BAO/Query.php +++ b/CRM/Pledge/BAO/Query.php @@ -549,16 +549,14 @@ class CRM_Pledge_BAO_Query { $form->add('select', 'pledge_financial_type_id', ts( 'Financial Type' ), - array( - '' => ts('- select -')) + - CRM_Contribute_PseudoConstant::financialType() + array('' => ts('- select -')) + CRM_Contribute_PseudoConstant::financialType(), + FALSE, array('class' => 'crm-select2') ); $form->add('select', 'pledge_contribution_page_id', ts('Contribution Page'), - array( - '' => ts('- any -')) + - CRM_Contribute_PseudoConstant::contributionPage() + array('' => ts('- any -')) + CRM_Contribute_PseudoConstant::contributionPage(), + FALSE, array('class' => 'crm-select2') ); //add fields for pledge frequency @@ -571,8 +569,7 @@ class CRM_Pledge_BAO_Query { $form->add('select', 'pledge_frequency_unit', ts('Pledge Frequency'), - array( - '' => ts('- any -')) + $freqUnitsDisplay + array('' => ts('- any -')) + $freqUnitsDisplay ); // add all the custom searchable fields diff --git a/css/civicrm.css b/css/civicrm.css index 38c2e0c85d..2a2a5ded55 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -229,67 +229,6 @@ div.crm-container fieldset label{ color: #3E3E3E; } -/* crm advanced select styling */ -.crm-container .crmasmContainer, -.crm-container .crmasmSelect, -.crm-container .crmasmSelectCampaigns, -.crm-container .crmtagContainer, -.crm-container .crmtagSelect { - width: 160px; -} - -.crm-container .crmasmSelect, -.crm-container .crmtagSelect, -.crm-container .crmasmSelectCampaigns { - padding: 2px; -} - -.crm-container .crmasmSelect .child-1 { - padding-left: 1em; -} -.crm-container .crmasmSelect .child-2 { - padding-left: 2em; -} - -.crm-container .crmasmHighlight, -.crm-container .crmtagHighlight { - display: block; - padding: 2px 4px; - background-color: #EEF4B8; -} - -.crm-container .crmasmList, -.crm-container .crmtagList { - margin: 0px; - padding: 0px; -} - -.crm-container .crmasmList li, -.crm-container .crmtagList li { - background-color: #3E3E3E; - background-image: none; - padding: 2px 4px; - list-style-type: none; - margin: 1px 0px; - color: #F5F6F1; -} - -.crm-container .crmasmListItem, -.crm-container .crmtagListItem { - position: relative; -} - -.crm-container .crmasmListItemRemove, -.crm-container .crmtagListItemRemove { - padding: 5px; - position: absolute; - right: 5px; - top: 2px; - font-size: 11px; - margin: 0px; - padding: 0px; -} - .crm-container textarea { border: 1px solid #999; } @@ -3829,6 +3768,12 @@ div.m ul#civicrm-menu, } /* select2 */ +.crm-select2 { + width: 15em; +} +.crm-container .select2-container { + min-width: 15em !important; +} /* Move background image into outer container so we can place an icon in the inner container */ .crm-container .select2-container-multi { background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(1%, #eee), color-stop(15%, #fff)); @@ -3837,6 +3782,9 @@ div.m ul#civicrm-menu, background-image: linear-gradient(top, #eee 1%, #fff 15%); } .crm-container .select2-container-multi .select2-choices { + background: url("../i/TreeMinus.gif") no-repeat scroll right 5px; +} +.crm-container .select2-container-multi.select2-container-active .select2-choices { background: url("../packages/jquery/plugins/select2/select2.png") no-repeat scroll right -22px; } diff --git a/js/Common.js b/js/Common.js index e9a5bb2380..14a2c1d23a 100644 --- a/js/Common.js +++ b/js/Common.js @@ -285,7 +285,7 @@ $.fn.select2.defaults.width = 'resolve'; $(this).remove(); }); var options = $(this).data('select2') || {}; - $(this).removeClass('crm-select2').select2(options); + $(this).select2(options).removeClass('crm-select2'); }); }); diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl index a155479296..0a6f7720f4 100644 --- a/templates/CRM/Activity/Form/Activity.tpl +++ b/templates/CRM/Activity/Form/Activity.tpl @@ -201,18 +201,8 @@ {if $form.tag.html} {$form.tag.label} -
{$form.tag.html}
- {literal} - - {/literal} + +
{$form.tag.html}
{/if} diff --git a/templates/CRM/Campaign/Form/Search/Common.tpl b/templates/CRM/Campaign/Form/Search/Common.tpl index f4d08395df..159df5e2e7 100755 --- a/templates/CRM/Campaign/Form/Search/Common.tpl +++ b/templates/CRM/Campaign/Form/Search/Common.tpl @@ -66,32 +66,9 @@
{$form.contact_type.html} - {literal} - - {/literal} {$form.group.html} - {literal} - - {/literal} @@ -220,34 +197,24 @@ function buildCampaignGroups( surveyId ) { function( data ) { if ( data.status != 'success' ) return; - var selectName = 'campaignGroupsSelect'; - var groupSelect = cj("select[id^=" + selectName + "]"); - var groupSelectCountId = cj( groupSelect ).attr( 'id' ).replace( selectName, '' ); - //first remove all groups for given survey. - cj( "#group" ).find('option').remove( ); - cj( groupSelect ).find('option').remove( ); - cj( '#crmasmContainer' + groupSelectCountId ).find( 'span' ).remove( ); - cj( '#crmasmList' + groupSelectCountId ).find( 'li' ).remove( ); + cj("#group").find('option').remove(); var groups = data.groups; //build the new group options. var optCount = 0; for ( group in groups ) { - title = groups[group].title; - value = groups[group].value; - if ( !title ) continue; - var crmOptCount = 'asm' + groupSelectCountId + 'option' + optCount; + var title = groups[group].title; + var value = groups[group].value; + if ( !value ) continue; //add options to main group select. - cj( "#group" ).append( cj('').val( value ).html( title ).attr( 'id', crmOptCount ) ); - - //add option to crm multi select ul. - cj( groupSelect ).append( cj('').val(value).html(title).attr( 'rel', crmOptCount ) ); + cj( "#group" ).append( cj('').val( value ).html(title)); optCount++; } + cj("#group").trigger('change'); }, 'json'); } diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl index 3a0220d228..3cfb2cb5ba 100644 --- a/templates/CRM/Case/Form/Activity.tpl +++ b/templates/CRM/Case/Form/Activity.tpl @@ -229,19 +229,8 @@ {if $form.tag.html} {$form.tag.label} -
{$form.tag.html}
- {literal} - - {/literal} - + +
{$form.tag.html}
{/if} diff --git a/templates/CRM/Case/Form/Case.tpl b/templates/CRM/Case/Form/Case.tpl index 3cd223ba99..90864961ca 100644 --- a/templates/CRM/Case/Form/Case.tpl +++ b/templates/CRM/Case/Form/Case.tpl @@ -112,17 +112,6 @@ {$form.tag.label}
{$form.tag.html}
-{literal} - -{/literal} {/if} diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl index 60334a4154..769a3b24dd 100644 --- a/templates/CRM/Case/Form/CaseView.tpl +++ b/templates/CRM/Case/Form/CaseView.tpl @@ -820,13 +820,6 @@ function addRole() { {literal} diff --git a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl index 6779b3cbd5..9ecd2c1b9f 100644 --- a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl +++ b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl @@ -30,18 +30,9 @@ {/if} - {if $groupElementType eq 'crmasmSelect'} + {if $groupElementType eq 'select'} {/if} {foreach key=key item=item from=$tagGroup} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl index 3b0d36e73a..54d8327c64 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Settings.tpl @@ -222,12 +222,6 @@ return false; }) - cj("select#soft_credit_types").crmasmSelect({ - addItemTarget: 'bottom', - animate: false, - highlight: true, - respectParents: true - }); {/literal} diff --git a/templates/CRM/Contribute/Form/Search.tpl b/templates/CRM/Contribute/Form/Search.tpl index 2008a10a74..fe4393fde6 100644 --- a/templates/CRM/Contribute/Form/Search.tpl +++ b/templates/CRM/Contribute/Form/Search.tpl @@ -42,18 +42,6 @@ {if $form.contact_tags} {else} @@ -62,18 +50,6 @@ {if $form.group} {else} diff --git a/templates/CRM/Contribute/Form/Search/Common.tpl b/templates/CRM/Contribute/Form/Search/Common.tpl index 140b5209c1..72a152621c 100644 --- a/templates/CRM/Contribute/Form/Search/Common.tpl +++ b/templates/CRM/Contribute/Form/Search/Common.tpl @@ -41,7 +41,7 @@ {if $form.contribution_batch_id.html } {else} @@ -59,18 +48,6 @@ {if $form.group} {else} diff --git a/templates/CRM/Form/attachment.tpl b/templates/CRM/Form/attachment.tpl index 183d649567..8b0c72cac5 100644 --- a/templates/CRM/Form/attachment.tpl +++ b/templates/CRM/Form/attachment.tpl @@ -95,17 +95,6 @@ {/if} {/section} - {literal} - - {/literal} {/if} {if $currentAttachmentInfo} diff --git a/templates/CRM/Mailing/Form/Search/Common.tpl b/templates/CRM/Mailing/Form/Search/Common.tpl index 4e170c6179..00db5d5d58 100644 --- a/templates/CRM/Mailing/Form/Search/Common.tpl +++ b/templates/CRM/Mailing/Form/Search/Common.tpl @@ -3,16 +3,6 @@ {$form.mailing_id.label}
{$form.mailing_id.html} - {literal} - - {/literal}
{if $title}{$form.group.label}{/if} {$form.group.html} - {literal} - - {/literal} {$form.contact_tags.html} - {literal} - - {/literal}   {$form.group.html} - {literal} - - {/literal}  

- {$form.contribution_payment_instrument_id.html} + {$form.contribution_payment_instrument_id.html|crmAddClass:twenty}
{$form.contribution_check_number.label}
@@ -119,18 +119,6 @@

{$form.financial_type_id.html|crmAddClass:twenty} - {* CRM-13848 *} - {literal} - - {/literal}
@@ -164,7 +152,7 @@

- {$form.contribution_currency_type.html} + {$form.contribution_currency_type.html|crmAddClass:twenty} 		diff --git a/templates/CRM/Financial/Form/BatchTransaction.tpl b/templates/CRM/Financial/Form/BatchTransaction.tpl index 4f5ff95936..7418795569 100644 --- a/templates/CRM/Financial/Form/BatchTransaction.tpl +++ b/templates/CRM/Financial/Form/BatchTransaction.tpl @@ -41,17 +41,6 @@ {if $form.contact_tags} {$form.contact_tags.html} - {literal} - - {/literal}   {$form.group.html} - {literal} - - {/literal}  
{$form.mailing_job_status.label} @@ -35,16 +25,6 @@
{$form.mailing_bounce_types.label} {$form.mailing_bounce_types.html} - {literal} - - {/literal} 		{$form.mailing_open_status.label}