CRM-16415 merge stuff in old commit

----------------------------------------
* CRM-16415: Implement Font Awesome icon font
  https://issues.civicrm.org/jira/browse/CRM-16415

diff --git a/js/crm.ajax.js b/js/crm.ajax.js
index 9dc1982e36f4176f52765efb15043b5c4ae2be55..96a6df73770fa27bcdff0b86b2d89602678f84f3 100644 (file)
--- a/js/crm.ajax.js
+++ b/js/crm.ajax.js
@@ -497,18 +497,6 @@
           $el.parents(buttonContainers).css({height: 0, padding: 0, margin: 0, overflow: 'hidden'}).find('.crm-button-icon').hide();
         });
         $el.dialog('option', 'buttons', buttons);
-<<<<<<< HEAD
-=======
-
-        // Show done button for non-ajax dialogs (e.g. file downloads)
-        $(this).on('submit', "form[data-no-ajax-submit=true]", function() {
-          $el.dialog('option', 'buttons', [{
-            text: ts('Done'),
-            icons: {primary: 'fa-times'},
-            click: function() {$(this).dialog('close');}
-          }]);
-        });
->>>>>>> 11e4f91... CRM-16415 Print icons and more
       }
       // Allow a button to prevent ajax submit
       $('input[data-no-ajax-submit=true]').click(function() {