Commit 80bc2820 authored by Andrew Hunt's avatar Andrew Hunt

CRM-16415 smarty crmButton uses and many instances of close

----------------------------------------
* CRM-16415: Implement Font Awesome icon font
  https://issues.civicrm.org/jira/browse/CRM-16415
parent bc8360e1
......@@ -323,7 +323,7 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty {
// Initially hide if not needed
// Note: visibility:hidden prevents layout jumping around unlike display:none
$display = $field->getValue() !== NULL ? '' : ' style="visibility:hidden;"';
$el['html'] .= ' <a href="#" class="crm-hover-button crm-clear-link"' . $display . ' title="' . ts('Clear') . '"><span class="icon ui-icon-close"></span></a>';
$el['html'] .= ' <a href="#" class="crm-hover-button crm-clear-link"' . $display . ' title="' . ts('Clear') . '"><i class="crm-i fa-times"></i></a>';
}
}
......@@ -58,5 +58,5 @@ function smarty_block_crmButton($params, $text, &$smarty) {
// All other params are treated as html attributes
CRM_Utils_Array::remove($params, 'icon', 'p', 'q', 'a', 'f', 'h', 'fb', 'fe');
$attributes = CRM_Utils_String::htmlAttributes($params);
return "<a $attributes><span><span class='icon ui-icon-$icon'></span> $text</span></a>";
return "<a $attributes><span><span class='crm-i fa-$icon'></span> $text</span></a>";
}
......@@ -23,7 +23,7 @@
"jquery-validation": "~1.13",
"datatables": "~1.10",
"ckeditor": "~4.5",
"font-awesome": "~4.3",
"font-awesome": "~4.4",
"angular-sanitize": "~1.3.15"
},
"resolutions": {
......
......@@ -67,7 +67,7 @@
{if $action ne 1 and $action ne 2}
<div class="action-link">
{crmButton q="action=add&reset=1" id="newACL" icon="circle-plus"}{ts}Add ACL{/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newACL" icon="plus-circle"}{ts}Add ACL{/ts}{/crmButton}
</div>
{/if}
</div>
......
......@@ -60,7 +60,7 @@
{if $action ne 1 and $action ne 2}
<div class="crm-submit-buttons">
{crmButton q="action=add&reset=1" id="newACL" icon="circle-plus"}{ts}Add Role Assignment{/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newACL" icon="plus-circle"}{ts}Add Role Assignment{/ts}{/crmButton}
</div>
{/if}
</div>
......
......@@ -63,7 +63,7 @@
</div>
{/if}
<div class="action-link">
{crmButton q="action=add&reset=1" icon="circle-plus"}{ts}Add Contact Type{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton q="action=add&reset=1" icon="plus-circle"}{ts}Add Contact Type{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
......@@ -30,7 +30,7 @@
<div class="crm-content-block">
{if $action ne 1 and $action ne 2}
<div class="action-link">
{crmButton p="civicrm/event/add" q="action=add&is_template=1&reset=1" id="newEventTemplate" icon="circle-plus"}{ts}Add Event Template{/ts}{/crmButton}
{crmButton p="civicrm/event/add" q="action=add&is_template=1&reset=1" id="newEventTemplate" icon="plus-circle"}{ts}Add Event Template{/ts}{/crmButton}
<div class="clear"></div>
</div>
{/if}
......
......@@ -36,8 +36,8 @@
{if $action ne 1 and $action ne 2}
<div class="action-link">
{crmButton q="action=add&reset=1" id="newJob" icon="circle-plus"}{ts}Add New Scheduled Job{/ts}{/crmButton}
{crmButton p='civicrm/admin/joblog' q="reset=1" id="jobLog" icon="zoomin"}{ts}View Log (all jobs){/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newJob" icon="plus-circle"}{ts}Add New Scheduled Job{/ts}{/crmButton}
{crmButton p='civicrm/admin/joblog' q="reset=1" id="jobLog" icon="list-alt"}{ts}View Log (all jobs){/ts}{/crmButton}
</div>
{/if}
......
......@@ -69,7 +69,7 @@
</div>
{/if}
<div class="action-link">
{crmButton q="action=add&reset=1" id="newLocationType" icon="circle-plus"}{ts}Add Option{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newLocationType" icon="plus-circle"}{ts}Add Option{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
......@@ -75,7 +75,7 @@
</div>
{/if}
<div class="action-link">
{crmButton q="action=add&reset=1" id="newMailSettings" icon="circle-plus"}{ts}Add Mail Account{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newMailSettings" icon="plus-circle"}{ts}Add Mail Account{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
......@@ -142,7 +142,7 @@
{if $action ne 1 and $action ne 2 and $type eq 'userTemplates'}
<div class="action-link">
{crmButton p='civicrm/admin/messageTemplates/add' q="action=add&reset=1" id="newMessageTemplates" icon="circle-plus"}{ts}Add Message Template{/ts}{/crmButton}
{crmButton p='civicrm/admin/messageTemplates/add' q="action=add&reset=1" id="newMessageTemplates" icon="plus-circle"}{ts}Add Message Template{/ts}{/crmButton}
</div>
<div class="spacer"></div>
{/if}
......
......@@ -57,8 +57,8 @@
{if $action ne 1 and $action ne 2}
<div class="action-link">
{crmButton q="action=add&reset=1" id="newOptionGroup" icon="circle-plus"}{ts}Add Option Group{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newOptionGroup" icon="plus-circle"}{ts}Add Option Group{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
</div>
......
......@@ -72,7 +72,7 @@
{if $rows}
{if $isLocked ne 1}
<div class="action-link">
{crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="circle-plus"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
{crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
</div>
{/if}
<div id={$gName}>
......@@ -158,9 +158,9 @@
{/if}
<div class="action-link">
{if $isLocked ne 1}
{crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="circle-plus"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
{crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="plus-circle"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
{/if}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
</div>
{/if}
......@@ -62,8 +62,8 @@
{if $action ne 1 and $action ne 2}
<div class="action-link">
{crmButton q="action=add&reset=1" icon="circle-plus"}{ts}Add Participant Status{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton q="action=add&reset=1" icon="plus-circle"}{ts}Add Participant Status{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
</div>
......
......@@ -62,7 +62,7 @@
{if $action ne 1 and $action ne 2}
<div class="action-link">
{crmButton q="action=add&reset=1&pp=$defaultPaymentProcessorType" id="newPaymentProcessor" icon="circle-plus"}{ts}Add Payment Processor{/ts}{/crmButton}
{crmButton q="action=add&reset=1&pp=$defaultPaymentProcessorType" id="newPaymentProcessor" icon="plus-circle"}{ts}Add Payment Processor{/ts}{/crmButton}
</div>
{/if}
</div>
......@@ -72,7 +72,7 @@
{ts}There are no Payment Processors entered.{/ts}
</div>
<div class="action-link">
{crmButton p='civicrm/admin/paymentProcessor' q="action=add&reset=1&pp=$defaultPaymentProcessorType" id="newPaymentProcessor" icon="circle-plus"}{ts}Add Payment Processor{/ts}{/crmButton}
{crmButton p='civicrm/admin/paymentProcessor' q="action=add&reset=1&pp=$defaultPaymentProcessorType" id="newPaymentProcessor" icon="plus-circle"}{ts}Add Payment Processor{/ts}{/crmButton}
</div>
{/if}
{/if}
......@@ -62,7 +62,7 @@
{if $action ne 1 and $action ne 2}
<div class="action-link">
<a href="{crmURL q="action=add&reset=1"}" id="newPaymentProcessor">&raquo; {ts}New Payment Processor{/ts}</a>
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
</div>
......
......@@ -65,7 +65,7 @@
{/if}
<div class="spacer"></div>
<div class="action-link">
{crmButton q="action=add&reset=1" id="newPdfFormat" icon="circle-plus"}{ts}Add PDF Page Format{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newPdfFormat" icon="plus-circle"}{ts}Add PDF Page Format{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
......@@ -2,7 +2,7 @@
{if $type eq 'configTemplates'}
<table class="report-layout">
<div class="action-link">
{crmButton p='civicrm/admin/tplstrings/add' q='reset=1&action=add' icon="circle-plus"}{ts}Add New String{/ts}{/crmButton}
{crmButton p='civicrm/admin/tplstrings/add' q='reset=1&action=add' icon="plus-circle"}{ts}Add New String{/ts}{/crmButton}
</div>
{if !empty( $template_row) }
<tr>
......@@ -33,7 +33,7 @@
</head>
<br/>
<div class="action-link">
{crmButton p='civicrm/admin/tplstrings/add' q='reset=1&action=add&config=1' icon="circle-plus"}{ts}Add New Config{/ts}{/crmButton}
{crmButton p='civicrm/admin/tplstrings/add' q='reset=1&action=add&config=1' icon="plus-circle"}{ts}Add New Config{/ts}{/crmButton}
</div>
<br/>
{if !empty( $template_row) }
......
......@@ -36,7 +36,7 @@
{if $rows}
{if !($action eq 1 and $action eq 2)}
<div class="action-link">
{crmButton q="action=add&reset=1" class="newRelationshipType" icon="circle-plus"}{ts}Add Relationship Type{/ts}{/crmButton}
{crmButton q="action=add&reset=1" class="newRelationshipType" icon="plus-circle"}{ts}Add Relationship Type{/ts}{/crmButton}
</div>
{/if}
......@@ -82,7 +82,7 @@
</div>
{/if}
<div class="action-link">
{crmButton q="action=add&reset=1" class="newRelationshipType" icon="circle-plus"}{ts}Add Relationship Type{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton q="action=add&reset=1" class="newRelationshipType" icon="plus-circle"}{ts}Add Relationship Type{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
......@@ -55,7 +55,7 @@
{else}
{assign var='urlParams' value="action=add&reset=1"}
{/if}
{crmButton p=$link q=$urlParams id="newScheduleReminder" icon="circle-plus"}{ts}Add Reminder{/ts}{/crmButton}
{crmButton p=$link q=$urlParams id="newScheduleReminder" icon="plus-circle"}{ts}Add Reminder{/ts}{/crmButton}
</div>
{/if}
{/if}
......@@ -38,9 +38,9 @@
{if !($action eq 1 and $action eq 2)}
<div class="crm-submit-buttons">
<div class="action-link">
{crmButton q="action=add&reset=1" id="newTag" icon="circle-plus"}{ts}Add Tag{/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newTag" icon="plus-circle"}{ts}Add Tag{/ts}{/crmButton}
{if $adminTagSet}
{crmButton q="action=add&reset=1&tagset=1" id="newTagSet" icon="circle-plus"}{ts}Add Tag Set{/ts}{/crmButton}
{crmButton q="action=add&reset=1&tagset=1" id="newTagSet" icon="plus-circle"}{ts}Add Tag Set{/ts}{/crmButton}
{/if}
</div>
</div>
......@@ -81,9 +81,9 @@
{if !($action eq 1 and $action eq 2)}
<div class="crm-submit-buttons">
<div class="action-link">
{crmButton q="action=add&reset=1" id="newTag" icon="circle-plus"}{ts}Add Tag{/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newTag" icon="plus-circle"}{ts}Add Tag{/ts}{/crmButton}
{if $adminTagSet}
{crmButton q="action=add&reset=1&tagset=1" id="newTagSet" icon="circle-plus"}{ts}Add Tag Set{/ts}{/crmButton}
{crmButton q="action=add&reset=1&tagset=1" id="newTagSet" icon="plus-circle"}{ts}Add Tag Set{/ts}{/crmButton}
{/if}
</div>
</div>
......
......@@ -31,7 +31,7 @@
</div>
<div class="action-link">
{crmButton p='civicrm/petition/add' q='reset=1' h=0 icon="circle-plus"}{ts}Add Petition{/ts}{/crmButton}
{crmButton p='civicrm/petition/add' q='reset=1' h=0 icon="plus-circle"}{ts}Add Petition{/ts}{/crmButton}
</div>
{elseif $buildSelector}
......@@ -72,7 +72,7 @@
{else}
<div class="action-link">
{crmButton p='civicrm/petition/add' q='reset=1' h=0 icon="circle-plus"}{ts}Add Petition{/ts}{/crmButton}
{crmButton p='civicrm/petition/add' q='reset=1' h=0 icon="plus-circle"}{ts}Add Petition{/ts}{/crmButton}
</div>
{* build search form here *}
......
......@@ -31,7 +31,7 @@
</div>
<div class="action-link">
{crmButton p='civicrm/survey/add' q='reset=1' h=0 icon="circle-plus"}{ts}Add Survey{/ts}{/crmButton}
{crmButton p='civicrm/survey/add' q='reset=1' h=0 icon="plus-circle"}{ts}Add Survey{/ts}{/crmButton}
</div>
{elseif $buildSelector}
......@@ -76,7 +76,7 @@
{else}
<div class="action-link">
{crmButton p='civicrm/survey/add' q='reset=1' h=0 icon="circle-plus"}{ts}Add Survey{/ts}{/crmButton}
{crmButton p='civicrm/survey/add' q='reset=1' h=0 icon="plus-circle"}{ts}Add Survey{/ts}{/crmButton}
</div>
{* build search form here *}
......
......@@ -78,6 +78,6 @@
{/if}
{/if}
<div class="crm-submit-buttons">
{crmButton p='civicrm/case' q="reset=1" class='cancel' icon='close'}{ts}Done{/ts}{/crmButton}
{crmButton p='civicrm/case' q="reset=1" class='cancel' icon='times'}{ts}Done{/ts}{/crmButton}
</div>
</div>
......@@ -32,7 +32,7 @@
{include file="CRM/Case/Form/ViewRelatedCases.tpl"}
{* Main case view *}
{else}
<h3>{ts}Summary{/ts}</h3>
<table class="report crm-entity case-summary" data-entity="case" data-id="{$caseID}" data-cid="{$contactID}">
{if $multiClient}
......@@ -119,7 +119,7 @@
{if $hasAccessToAllCases}
<a class="crm-hover-button action-item no-popup" href="{crmURL p='civicrm/case/report/print' q="all=1&redact=0&cid=$contactID&caseID=$caseId&asn=standard_timeline"}"><span class="icon ui-icon-print"></span> {ts}Print Report{/ts}</a>
{/if}
{if $mergeCases}
<a href="#mergeCasesDialog" class="action-item no-popup crm-hover-button case-miniform"><span class="icon ui-icon-copy"></span>{ts}Merge Case{/ts}</a>
{$form._qf_CaseView_next_merge_case.html}
......@@ -127,7 +127,7 @@
{$form.merge_case_id.html}
</span>
{/if}
{if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))}
<a class="action-item crm-hover-button medium-popup" href="{crmURL p='civicrm/contact/view/case/editClient' h=1 q="reset=1&action=update&id=$caseID&cid=$contactID"}"><span class="icon ui-icon-person"></span> {ts}Assign to Another Client{/ts}</a>
{/if}
......@@ -143,7 +143,7 @@
{ts}Roles{/ts}
</div><!-- /.crm-accordion-header -->
<div class="crm-accordion-body">
{if $hasAccessToAllCases}
<div class="crm-submit-buttons">
<a class="button case-miniform" href="#addCaseRoleDialog" data-key="{crmKey name='civicrm/ajax/relation'}" rel="#caseRoles-selector-{$caseID}"><div class="icon ui-icon-circle-plus"></div>{ts}Add new role{/ts}</a>
......@@ -155,12 +155,12 @@
<div><input name="add_role_contact_id" placeholder="{ts}- first select relationship type -{/ts}" class="huge" /></div>
</div>
{/if}
<div id="editCaseRoleDialog" class="hiddenElement">
<div><label for="edit_role_contact_id">{ts}Change To{/ts}:</label></div>
<div><input name="edit_role_contact_id" placeholder="{ts}- select contact -{/ts}" class="huge" /></div>
</div>
<table id="caseRoles-selector-{$caseID}" class="report-layout crm-ajax-table" data-page-length="10">
<thead>
<tr>
......@@ -186,11 +186,11 @@
})(CRM.$);
</script>
{/literal}
<div id="deleteCaseRoleDialog" class="hiddenElement">
{ts}Are you sure you want to end this relationship?{/ts}
</div>
</div><!-- /.crm-accordion-body -->
</div><!-- /.crm-accordion-wrapper -->
......@@ -201,7 +201,7 @@
</div><!-- /.crm-accordion-header -->
<div class="crm-accordion-body">
<div class="crm-submit-buttons">
{crmButton p='civicrm/contact/view/rel' q="action=add&reset=1&cid=`$contactId`&caseID=`$caseID`" icon="circle-plus"}{ts}Add client relationship{/ts}{/crmButton}
{crmButton p='civicrm/contact/view/rel' q="action=add&reset=1&cid=`$contactId`&caseID=`$caseID`" icon="plus-circle"}{ts}Add client relationship{/ts}{/crmButton}
</div>
<table id="clientRelationships-selector-{$caseID}" class="report-layout crm-ajax-table" data-page-length="10">
<thead>
......@@ -320,4 +320,3 @@
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
{/if} {* view related cases if end *}
</div>
......@@ -44,7 +44,7 @@
</table>
<div class="clear"><br /></div>
<div class="action-link">
{crmButton p="civicrm/contact/deduperules" q="reset=1" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton p="civicrm/contact/deduperules" q="reset=1" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{* process the dupe contacts *}
......
......@@ -72,18 +72,18 @@
</div><!-- /.crm-accordion-wrapper -->
<div>
Show / Hide columns:
<input type='checkbox' id ='steet-address' class='toggle-vis' data-column-main="7" data-column-dupe="8" >
<input type='checkbox' id ='steet-address' class='toggle-vis' data-column-main="7" data-column-dupe="8" >
<label for="steet-address">{ts}Street Address{/ts}&nbsp;</label>
<input type='checkbox' id ='post-code' class='toggle-vis' data-column-main="9" data-column-dupe="10" >
<input type='checkbox' id ='post-code' class='toggle-vis' data-column-main="9" data-column-dupe="10" >
<label for="post-code">{ts}Post Code{/ts}&nbsp;</label>
<input type='checkbox' id ='conflicts' class='toggle-vis' data-column-main="11" >
<input type='checkbox' id ='conflicts' class='toggle-vis' data-column-main="11" >
<label for="conflicts">{ts}Conflicts{/ts}&nbsp; </label>
<input type='checkbox' id ='threshold' class='toggle-vis' data-column-main="12" >
<input type='checkbox' id ='threshold' class='toggle-vis' data-column-main="12" >
<label for="threshold">{ts}Threshold{/ts}&nbsp;</label>
</div><br/>
<span id="dupePairs_length_selection">
<input type='checkbox' id ='crm-dedupe-display-selection' name="display-selection">
<label for="display-selection">{ts}Within Selections{/ts}&nbsp;</label>
<label for="display-selection">{ts}Within Selections{/ts}&nbsp;</label>
</span>
<table id="dupePairs"
......@@ -96,7 +96,7 @@
data-order='[]',
data-column-defs='{literal}[{"targets": [0,1,3,13], "orderable":false}, {"targets": [7,8,9,10,11,12], "visible":false}]{/literal}'>
<thead>
<tr class="columnheader">
<tr class="columnheader">
<th data-data="is_selected_input" class="crm-dedupe-selection"><input type="checkbox" value="0" name="pnid_all" class="crm-dedupe-select-all"></th>
<th data-data="src_image" class="crm-empty">&nbsp;</th>
<th data-data="src" class="crm-contact">{ts}Contact{/ts} 1</th>
......@@ -135,7 +135,7 @@
</div>
{if $context eq 'search'}
{crmButton href=$backURL icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton href=$backURL icon="times"}{ts}Done{/ts}{/crmButton}
{elseif $context eq 'conflicts'}
{if call_user_func(array('CRM_Core_Permission','check'), 'force merge duplicate contacts')}
{if $gid}
......@@ -234,7 +234,7 @@
}
CRM.$('table#dupePairs').DataTable().ajax.url(reloadUrl).draw();
});
$('#dupePairs_length_selection').appendTo('#dupePairs_length');
// apply selected class on click of a row
......@@ -283,7 +283,7 @@
$('input.toggle-vis').on('click', function (e) {
var column = table.column( $(this).attr('data-column-main') );
column.visible( ! column.visible() );
// nowrap to conflicts column is applied only during initial rendering
// for show / hide clicks we need to set it explicitly
var col = CRM.$('table#dupePairs thead th.crm-contact-conflicts').index() + 1;
......@@ -296,14 +296,14 @@
column.visible( ! column.visible() );
}
});
// keep the conflicts checkbox checked when context is "conflicts"
if(context == 'conflicts') {
$('#conflicts').attr('checked', true);
$('#conflicts').attr('checked', true);
var column = table.column( $('#conflicts').attr('data-column-main') );
column.visible( ! column.visible() );
}
// on click of flip link of a row
$('#dupePairs tbody').on('click', 'tr .crm-dedupe-flip', function(e) {
e.stopPropagation();
......@@ -324,7 +324,7 @@
$('input.crm-dedupe-select', $elTr).prop('checked', $elTr.hasClass('crm-row-selected'));
});
});
$(".crm-dedupe-flip-selections").on('click', function(e) {
var ids = [];
$('.crm-row-selected').each(function() {
......@@ -365,14 +365,14 @@
});
var is_selected = CRM.$('.crm-dedupe-select-all').prop('checked') ? 1 : 0;
}
var dataUrl = {/literal}"{crmURL p='civicrm/ajax/toggleDedupeSelect' h=0 q='snippet=4'}"{literal};
var rgid = {/literal}"{$rgid}"{literal};
var gid = {/literal}"{$gid}"{literal};
rgid = rgid.length > 0 ? rgid : 0;
gid = gid.length > 0 ? gid : 0;
CRM.$.post(dataUrl, {pnid: id, rgid: rgid, gid: gid, is_selected: is_selected}, function (data) {
// nothing to do for now
}, 'json');
......
......@@ -61,7 +61,7 @@
{/strip}
</div>
<div style="float:right">
{crmButton q="action=add&contact_type=$contactType&reset=1" icon="circle-plus"}{ts 1=$contactType}Add Rule for %1s{/ts}{/crmButton}
{crmButton q="action=add&contact_type=$contactType&reset=1" icon="plus-circle"}{ts 1=$contactType}Add Rule for %1s{/ts}{/crmButton}
</div>
</div>
{/foreach}
......
......@@ -32,7 +32,7 @@
<dt>{ts}To{/ts}</dt><dd>{$toName|escape}</dd>
<dt>{ts}Subject{/ts}</dt><dd>{$subject}</dd>
<dt>{ts}Message{/ts}</dt><dd>{$message}</dd>
<dt>&nbsp;</dt><dd>{crmButton class="cancel" icon="close" p='civicrm/contact/view' q="history=1&show=1&selectedChild=activity"}">{ts}Done{/ts}{/crmButton}</dd>
<dt>&nbsp;</dt><dd>{crmButton class="cancel" icon="times" p='civicrm/contact/view' q="history=1&show=1&selectedChild=activity"}">{ts}Done{/ts}{/crmButton}</dd>
</dl>
</fieldset>
</div>
......@@ -38,7 +38,7 @@
{/if}
</table>
<div class="crm-submit-buttons">
{crmButton class="cancel" icon="close" p='civicrm/contact/view' q="selectedChild=note&reset=1&cid=`$contactId`"}{ts}Done{/ts}{/crmButton}
{crmButton class="cancel" icon="times" p='civicrm/contact/view' q="selectedChild=note&reset=1&cid=`$contactId`"}{ts}Done{/ts}{/crmButton}
</div>
{if $comments}
......
......@@ -30,7 +30,7 @@
<div id="contact-summary-relationship-tab" class="view-content">
{if $permission EQ 'edit'}
<div class="action-link">
{crmButton accesskey="N" p='civicrm/contact/view/rel' q="cid=`$contactId`&action=add&reset=1" icon="circle-plus"}{ts}Add Relationship{/ts}{/crmButton}
{crmButton accesskey="N" p='civicrm/contact/view/rel' q="cid=`$contactId`&action=add&reset=1" icon="plus-circle"}{ts}Add Relationship{/ts}{/crmButton}
</div>
{/if}
......@@ -63,4 +63,3 @@
</script>
{/literal}
{/if} {* close of custom data else*}
......@@ -33,7 +33,7 @@
<dt>{ts}Message{/ts}</dt><dd>{$message}</dd>
<dt>&nbsp;</dt>
<dd class="crm-submit-buttons">
{crmButton class="cancel" icon="close" p='civicrm/contact/view/activity' q="history=1&show=1"}">{ts}Done{/ts}{/crmButton}
{crmButton class="cancel" icon="times" p='civicrm/contact/view/activity' q="history=1&show=1"}">{ts}Done{/ts}{/crmButton}
</dd>
</dl>
</fieldset>
......
......@@ -71,8 +71,8 @@
{/if}
{if $action ne 1 and $action ne 2}
<div class="action-link">
{crmButton q="action=add&reset=1" id="newContributionType" icon="circle-plus"}{ts}Add Financial Type{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newContributionType" icon="plus-circle"}{ts}Add Financial Type{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
{/if}
......@@ -71,7 +71,7 @@
{/strip}
{if $action ne 1 and $action ne 2}
<div class="action-link">
{crmButton q="action=add&reset=1" id="newManagePremium" icon="circle-plus"}{ts}Add Premium{/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newManagePremium" icon="plus-circle"}{ts}Add Premium{/ts}{/crmButton}
</div>
{/if}
</div>
......
......@@ -78,7 +78,7 @@
{if $action eq 2 or $action eq 4} {* Update or View*}
<p></p>
<div class="action-link">
{crmButton p='civicrm/admin/custom/group/field' q="action=browse&reset=1&gid=$gid"}{ts}Custom Fields for this Set{/ts}{/crmButton}
{crmButton p='civicrm/admin/custom/group/field' q="action=browse&reset=1&gid=$gid" icon="th-list"}{ts}Custom Fields for this Set{/ts}{/crmButton}
</div>
{/if}
{$initHideBlocks}
......
......@@ -77,9 +77,7 @@
{/if}
{/if}
<div class="action-link">
{crmButton p='civicrm/admin/custom/group/field/add' q="reset=1&action=add&gid=$gid" id="newCustomField" class="action-item" icon="circle-plus"}{ts}Add Custom Field{/ts}{/crmButton}
{crmButton p="civicrm/admin/custom/group" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton p='civicrm/admin/custom/group/field/add' q="reset=1&action=add&gid=$gid" id="newCustomField" class="action-item" icon="plus-circle"}{ts}Add Custom Field{/ts}{/crmButton}
{crmButton p="civicrm/admin/custom/group" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
......@@ -70,7 +70,7 @@
{if NOT ($action eq 1 or $action eq 2) }
<div class="action-link">
{crmButton p='civicrm/admin/custom/group' q="action=add&reset=1" id="newCustomDataGroup" icon="circle-plus"}{ts}Add Set of Custom Fields{/ts}{/crmButton}
{crmButton p='civicrm/admin/custom/group' q="action=add&reset=1" id="newCustomDataGroup" icon="plus-circle"}{ts}Add Set of Custom Fields{/ts}{/crmButton}
</div>
{/if}
......@@ -87,4 +87,3 @@
{/if}
{/if}
{/if}
......@@ -158,8 +158,8 @@
{/literal}
<div class="action-link">
{crmButton q="reset=1&action=add&fid=$fid&gid=$gid" class="action-item" icon="circle-plus"}{ts}Add Option{/ts}{/crmButton}
{crmButton p="civicrm/admin/custom/group/field" q="reset=1&action=browse&gid=$gid" class="action-item cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton q="reset=1&action=add&fid=$fid&gid=$gid" class="action-item" icon="plus-circle"}{ts}Add Option{/ts}{/crmButton}
{crmButton p="civicrm/admin/custom/group/field" q="reset=1&action=browse&gid=$gid" class="action-item cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
</div>
</div>
......
......@@ -74,8 +74,8 @@
{/if}
{if $action ne 1 and $action ne 2}
<div class="action-link">
{crmButton q="action=add&reset=1" id="newFinancialType" icon="circle-plus"}{ts}Add Financial Type{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
{crmButton q="action=add&reset=1" id="newFinancialType" icon="plus-circle"}{ts}Add Financial Type{/ts}{/crmButton}
{crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
</div>
{/if}
{/if}
......@@ -31,7 +31,7 @@
<div class="form-item">
{if $action ne 1 and $action ne 2}
<div class="action-link">
{crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount" icon="circle-plus"}{ts}Assign Account{/ts}{/crmButton}
{crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount" icon="plus-circle"}{ts}Assign Account{/ts}{/crmButton}
{crmButton p="civicrm/admin/financial/financialType" q="action=update&id=`$aid`&reset=1" icon="pencil"}{ts}Edit Financial Type{/ts}{/crmButton}
</div>
{/if}
......@@ -64,7 +64,7 @@
{if $action ne 1 and $action ne 2}
<div class="action-link">
{crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount" icon="circle-plus"}{ts}Assign Account{/ts}{/crmButton}
{crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount" icon="plus-circle"}{ts}Assign Account{/ts}{/crmButton}
{crmButton p="civicrm/admin/financial/financialType" q="action=update&id=`$aid`&reset=1" icon="pencil"}{ts}Edit Financial Type{/ts}{/crmButton}
</div>
{/if}
......
......@@ -37,7 +37,7 @@
{if $showLinks}
<div class="action-link">
{crmButton accesskey="N" p=$newMassUrl q='reset=1' icon="mail-closed"}{ts}{$linkTitle}{/ts}{/crmButton}<br/><br/>
{crmButton accesskey="N" p=$newMassUrl q='reset=1' icon="envelope"}{ts}{$linkTitle}{/ts}{/crmButton}<br/><br/>
</div>
{/if}
{include file="CRM/Mailing/Form/Search.tpl"}
......@@ -84,7 +84,7 @@
{include file="CRM/common/pager.tpl" location="bottom"}
{if $showLinks}
<div class="action-link">
{crmButton accesskey="N" p=$newMassUrl q='reset=1' icon="mail-closed"}{ts}{$linkTitle}{/ts}{/crmButton}<br/>
{crmButton accesskey="N" p=$newMassUrl q='reset=1' icon="envelope"}{ts}{$linkTitle}{/ts}{/crmButton}<br/>
</div>