From 44f15f74ef82e6312660d1db07eacf4335a3e16f Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Sun, 27 Sep 2015 23:03:36 -0400 Subject: [PATCH] CRM-16415 fa-times instead of ui-icon-close ---------------------------------------- * CRM-16415: Implement Font Awesome icon font https://issues.civicrm.org/jira/browse/CRM-16415 --- css/civicrm.css | 8 ++++++++ css/dashboard.css | 3 ++- templates/CRM/Admin/Page/APIExplorer.tpl | 16 ++++++++-------- templates/CRM/Badge/Form/Layout.tpl | 4 ++-- .../CRM/Contact/Form/Search/AdvancedCriteria.tpl | 2 +- templates/CRM/Contact/Form/Search/table.tpl | 2 +- templates/CRM/Contact/Form/Selector.tpl | 2 +- templates/CRM/Contact/Form/Task/Email.tpl | 4 ++-- templates/CRM/Contact/Page/Dashlet.tpl | 6 +++--- templates/CRM/Contact/Page/DedupeFind.tpl | 16 ++++++++-------- templates/CRM/Form/attachment.tpl | 5 ++--- templates/CRM/Profile/Form/Dynamic.tpl | 2 +- templates/CRM/UF/Page/ProfileTemplates.tpl | 2 +- templates/CRM/common/jcalendar.tpl | 3 +-- templates/CRM/common/success.tpl | 4 ++-- 15 files changed, 43 insertions(+), 36 deletions(-) diff --git a/css/civicrm.css b/css/civicrm.css index 514cdda996..f0a977bce4 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -2178,6 +2178,14 @@ input.crm-form-entityref { padding-left: 18px; } +.crm-container .crm-button.button-crm-i { + padding: 2px 0 1px 5px; +} + +.crm-container .crm-button.button-crm-i input { + padding-left: 0; +} + .crm-container .crm-button-icon { background-image: url("../i/icons/jquery-ui-FFFFFF.png"); height: 16px; diff --git a/css/dashboard.css b/css/dashboard.css index d641a086c9..45215905ec 100644 --- a/css/dashboard.css +++ b/css/dashboard.css @@ -177,8 +177,9 @@ width: auto; } -#crm-container .portlet-header .ui-icon { +#crm-container .portlet-header .crm-i { float: right; + color: #52534D; } #crm-container .portlet-content { diff --git a/templates/CRM/Admin/Page/APIExplorer.tpl b/templates/CRM/Admin/Page/APIExplorer.tpl index cce367b788..3c49b86adb 100644 --- a/templates/CRM/Admin/Page/APIExplorer.tpl +++ b/templates/CRM/Admin/Page/APIExplorer.tpl @@ -194,9 +194,9 @@
@@ -214,8 +214,8 @@
- - + + 
@@ -290,7 +290,7 @@
     
     
       
-      
+      
     
   
 
@@ -318,7 +318,7 @@
     
     
       
-      
+      
     
   
 
@@ -342,7 +342,7 @@
     
     
       
-      
+      
     
   
 
diff --git a/templates/CRM/Badge/Form/Layout.tpl b/templates/CRM/Badge/Form/Layout.tpl
index 68bebe0a09..b74979dc00 100644
--- a/templates/CRM/Badge/Form/Layout.tpl
+++ b/templates/CRM/Badge/Form/Layout.tpl
@@ -52,7 +52,7 @@
          
@@ -72,7 +72,7 @@
          

            

             {$form.image_1.html}
-               
+               
              

              {ts}Click above and select a file by double clicking on it.{/ts}
             

diff --git a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
index b7441518e5..a528617951 100644
--- a/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
+++ b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl
@@ -90,7 +90,7 @@ CRM.$(function($) {
     var body = $('.crm-accordion-body.' + id);
     if (header.length > 0 && body.length > 0 && !body.html()) {
       body.html('
{/literal}{ts escape='js'}Loading{/ts}{literal}...
');
-      header.append('{/literal}{literal}');
+      header.append('{/literal}{literal}');
       header.addClass('active');
       CRM.loadPage(url, {target: body, block: false});
     }
diff --git a/templates/CRM/Contact/Form/Search/table.tpl b/templates/CRM/Contact/Form/Search/table.tpl
index 0024155404..e259798202 100644
--- a/templates/CRM/Contact/Form/Search/table.tpl
+++ b/templates/CRM/Contact/Form/Search/table.tpl
@@ -41,7 +41,7 @@
                 {$form.value[$x][$i].html|crmAddClass:'required'}
               
               {if $i gt 0 or $x gt 1}
-                 
+                 
               {/if}
             
diff --git a/templates/CRM/Contact/Form/Selector.tpl b/templates/CRM/Contact/Form/Selector.tpl
index bd93277ca9..2c1b7acb3c 100644
--- a/templates/CRM/Contact/Form/Selector.tpl
+++ b/templates/CRM/Contact/Form/Selector.tpl
@@ -26,7 +26,7 @@
 {include file="CRM/common/pager.tpl" location="top"}
 
 {include file="CRM/common/pagerAToZ.tpl"}
- {ts}Reset all selections{/ts}
+ {ts}Reset all selections{/ts}

           

            {$form.image_2.html}
-              
+              
             

             {ts}Click above and select a file by double clicking on it.{/ts}
            		
           

 
 

diff --git a/templates/CRM/Contact/Form/Task/Email.tpl b/templates/CRM/Contact/Form/Task/Email.tpl
index de48a9b09e..4491597f70 100644
--- a/templates/CRM/Contact/Form/Task/Email.tpl
+++ b/templates/CRM/Contact/Form/Task/Email.tpl
@@ -45,14 +45,14 @@
       
diff --git a/templates/CRM/Contact/Page/Dashlet.tpl b/templates/CRM/Contact/Page/Dashlet.tpl
index 238dc6f4ea..c5f3ba9759 100644
--- a/templates/CRM/Contact/Page/Dashlet.tpl
+++ b/templates/CRM/Contact/Page/Dashlet.tpl
@@ -31,7 +31,7 @@
     

         {foreach from=$availableDashlets item=row key=dashID}
       

-        
{$row.label}{if $admin and !$row.is_reserved} {/if}

+        
{$row.label}{if $admin and !$row.is_reserved} {/if}

       

         {/foreach}
     

@@ -42,7 +42,7 @@
     

         {foreach from=$contactDashlets.0 item=row key=dashID}
       

-        
{$row.label}{if $admin and !$row.is_reserved} {/if}

+        
{$row.label}{if $admin and !$row.is_reserved} {/if}

       

         {/foreach}
     

@@ -50,7 +50,7 @@
     

         {foreach from=$contactDashlets.1 item=row key=dashID}
       

-        
{$row.label}{if $admin and !$row.is_reserved} {/if}

+        
{$row.label}{if $admin and !$row.is_reserved} {/if}

       

         {/foreach}
     

diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl b/templates/CRM/Contact/Page/DedupeFind.tpl
index 18a05eb01c..83d71010f0 100644
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -143,14 +143,14 @@
      {else}
        {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q="reset=1&rgid=`$rgid`&action=map&mode=aggressive" a=1}{/capture}
      {/if}
-     
{ts}Force Merge Selected Duplicates{/ts}
+      {ts}Force Merge Selected Duplicates{/ts}
 
      {if $gid}
        {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q="reset=1&rgid=`$rgid`&gid=`$gid`&action=map" a=1}{/capture}
      {else}
        {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q="reset=1&rgid=`$rgid`&action=map" a=1}{/capture}
      {/if}
-     
{ts}Safe Merge Selected Duplicates{/ts}
+      {ts}Safe Merge Selected Duplicates{/ts}
    {/if}
 
    {if $gid}
@@ -158,7 +158,7 @@
    {else}
       {capture assign=backURL}{crmURL p="civicrm/contact/dedupefind" q="reset=1&action=update&rgid=`$rgid`" a=1}{/capture}
    {/if}
-    {ts}List All Duplicates{/ts}
+    {ts}List All Duplicates{/ts}
 {else}
    {if $gid}
       {capture assign=backURL}{crmURL p="civicrm/contact/dedupefind" q="reset=1&rgid=`$rgid`&gid=`$gid`&action=renew" a=1}{/capture}
@@ -166,7 +166,7 @@
       {capture assign=backURL}{crmURL p="civicrm/contact/dedupefind" q="reset=1&rgid=`$rgid`&action=renew" a=1}{/capture}
    {/if}
    
-      {ts}Refresh Duplicates{/ts}
+      {ts}Refresh Duplicates{/ts}
    
 
    {if $gid}
@@ -174,20 +174,20 @@
    {else}
       {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q="reset=1&rgid=`$rgid`&action=map" a=1}{/capture}
    {/if}
-   
{ts}Batch Merge Selected Duplicates{/ts}
+    {ts}Batch Merge Selected Duplicates{/ts}
 
    {if $gid}
       {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q="reset=1&rgid=`$rgid`&gid=`$gid`" a=1}{/capture}
    {else}
       {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q="reset=1&rgid=`$rgid`" a=1}{/capture}
    {/if}
-   
{ts}Batch Merge All Duplicates{/ts}
+    {ts}Batch Merge All Duplicates{/ts}
 
-    {ts}Flip Selected Duplicates{/ts}
+    {ts}Flip Selected Duplicates{/ts}
 
    {capture assign=backURL}{crmURL p="civicrm/contact/deduperules" q="reset=1" a=1}{/capture}
    
-     
 {ts}Done{/ts}
+      {ts}Done{/ts}
    
 {/if}
 

diff --git a/templates/CRM/Form/attachment.tpl b/templates/CRM/Form/attachment.tpl
index 5d327ec3a5..b1847a8414 100644
--- a/templates/CRM/Form/attachment.tpl
+++ b/templates/CRM/Form/attachment.tpl
@@ -63,7 +63,7 @@
         {/if}
         
-          
@@ -84,7 +84,7 @@
             
-                
+                
@@ -149,4 +149,3 @@
 {/if}
 
 {/if} {* top level if *}
-
diff --git a/templates/CRM/Profile/Form/Dynamic.tpl b/templates/CRM/Profile/Form/Dynamic.tpl
index 2b619d87f2..3b74ad9ebe 100644
--- a/templates/CRM/Profile/Form/Dynamic.tpl
+++ b/templates/CRM/Profile/Form/Dynamic.tpl
@@ -225,7 +225,7 @@
         {include file="CRM/common/formButtons.tpl"}{if $isDuplicate}{$form._qf_Edit_upload_duplicate.html}{/if}
         
           
-            

+            
             {ts}Cancel{/ts}
           
         
diff --git a/templates/CRM/UF/Page/ProfileTemplates.tpl b/templates/CRM/UF/Page/ProfileTemplates.tpl
index 514fac23d0..93ae45e73b 100644
--- a/templates/CRM/UF/Page/ProfileTemplates.tpl
+++ b/templates/CRM/UF/Page/ProfileTemplates.tpl
@@ -36,7 +36,7 @@
       

-      
+      

         {ts}Open All{/ts}  | 
         {ts}Close All{/ts}
diff --git a/templates/CRM/common/jcalendar.tpl b/templates/CRM/common/jcalendar.tpl
index c00d4de69b..ec555b9fdc 100644
--- a/templates/CRM/common/jcalendar.tpl
+++ b/templates/CRM/common/jcalendar.tpl
@@ -66,7 +66,7 @@
 {/if}
 
 {if $action neq 1028}
-    
+    
 {/if}
 
 
-
diff --git a/templates/CRM/common/success.tpl b/templates/CRM/common/success.tpl
index 6957abd2f3..06a51b1940 100644
--- a/templates/CRM/common/success.tpl
+++ b/templates/CRM/common/success.tpl
@@ -46,11 +46,11 @@
             {ts 1=$docLink}This process may change your database structure and values. In case of emergency you may need to revert to a backup. For more detailed information, refer to the %1.{/ts}

         
           
         
-          
+          
           {ts}Cancel{/ts}
         
     
-- 
2.25.1



   
{$form.cc_id.label}
       
         {$form.cc_id.html}
-        
+        
       
     

     

       {$form.bcc_id.label}
       
         {$form.bcc_id.html}
-        
+        
       
     

     

           {$form.attachFile_1.label}{$form.attachFile_1.html} {$form.attachDesc_1.html}
+          {$form.attachFile_1.html} {$form.attachDesc_1.html}
             
{ts}Browse to the file you want to upload.{/ts}{if $maxAttachments GT 1} {ts 1=$maxAttachments}You can have a maximum of %1 attachment(s).{/ts}{/if} {ts 1=$config->maxFileSize}Each file must be less than %1M in size. You can also add a short description.{/ts}

           		
         

             

                 {$form.attachFile_1.label}{$form.$attachName.html} {$form.$attachDesc.html}{$form.$attachName.html} {$form.$attachDesc.html}
             

             

               {$form.$tagElement.label}