CRM-15789 - Put {crmButton} into general use

----------------------------------------
* CRM-15789: Add icons to submit buttons
  https://issues.civicrm.org/jira/browse/CRM-15789

diff --git a/templates/CRM/ACL/Page/ACL.tpl b/templates/CRM/ACL/Page/ACL.tpl
index 79ac8e8863aaadce8d181cd6cf4af44acd29c5f7..2cb74e28659911b5cf14b86ced0bc8644d0c3a32 100644 (file)
--- a/templates/CRM/ACL/Page/ACL.tpl
+++ b/templates/CRM/ACL/Page/ACL.tpl
@@ -74,7 +74,7 @@
 
         {if $action ne 1 and $action ne 2}
           <div class="action-link">
-            <a href="{crmURL q="action=add&reset=1"}" id="newACL" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add ACL{/ts}</span></a>
+            {crmButton q="action=add&reset=1" id="newACL"  icon="circle-plus"}{ts}Add ACL{/ts}{/crmButton}
           </div>
         {/if}
       </div>

diff --git a/templates/CRM/ACL/Page/EntityRole.tpl b/templates/CRM/ACL/Page/EntityRole.tpl
index b9f777dcc080508d8259c643f2d2af5be3ca08f5..cea9403af4dab6ffb0151217aae1d4d450248471 100644 (file)
--- a/templates/CRM/ACL/Page/EntityRole.tpl
+++ b/templates/CRM/ACL/Page/EntityRole.tpl
@@ -67,7 +67,7 @@
 
         {if $action ne 1 and $action ne 2}
       <div class="crm-submit-buttons">
-            <a href="{crmURL q="action=add&reset=1"}" id="newACL" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Role Assignment{/ts}</span></a>
+            {crmButton q="action=add&reset=1" id="newACL"  icon="circle-plus"}{ts}Add Role Assignment{/ts}{/crmButton}
         </div>
         {/if}
 </div>

diff --git a/templates/CRM/Admin/Page/ContactType.tpl b/templates/CRM/Admin/Page/ContactType.tpl
index 3f581322200790e353f76733fa0563fa158264a7..4f16d9866e35929e0dd09d31add268d4fce287d0 100644 (file)
--- a/templates/CRM/Admin/Page/ContactType.tpl
+++ b/templates/CRM/Admin/Page/ContactType.tpl
@@ -63,7 +63,7 @@
     </div>
   {/if}
   <div class="action-link">
-    <a href="{crmURL q="action=add&reset=1"}" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Contact Type{/ts}</span></a>
-    <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+    {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}
   </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/EventTemplate.tpl b/templates/CRM/Admin/Page/EventTemplate.tpl
index 3d768947bc0bad9c4e804df9d4f95ea87b2e8685..3afc0b48ba44dc37824282ddd9ba33c97c5743e0 100644 (file)
--- a/templates/CRM/Admin/Page/EventTemplate.tpl
+++ b/templates/CRM/Admin/Page/EventTemplate.tpl
@@ -30,8 +30,7 @@
 <div class="crm-content-block">
 {if $action ne 1 and $action ne 2}
       <div class="action-link">
-        <a href="{crmURL p="civicrm/event/add" q="action=add&is_template=1&reset=1"}" id="newEventTemplate" class="button">
-        <span><div class="icon ui-icon-circle-plus"></div>{ts}Add Event Template{/ts}</span></a>
+        {crmButton p="civicrm/event/add" q="action=add&is_template=1&reset=1" id="newEventTemplate"  icon="circle-plus"}{ts}Add Event Template{/ts}{/crmButton}
         <div class="clear"></div>
       </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/Extensions/Refresh.tpl b/templates/CRM/Admin/Page/Extensions/Refresh.tpl
index 3b31575e3be6817c42d12a4c10ea638a4d0fe3d6..c13518e7f442de58bc3470d1b0f8169e943a210d 100644 (file)
--- a/templates/CRM/Admin/Page/Extensions/Refresh.tpl
+++ b/templates/CRM/Admin/Page/Extensions/Refresh.tpl
@@ -1,3 +1,3 @@
 <div class="action-link">
-    <a href="{crmURL q="reset=1"}" id="new" class="button crm-extensions-refresh"><span><div class="icon ui-icon-refresh"></div>{ts}Refresh{/ts}</span></a>
+    {crmButton q="reset=1" id="new" class="crm-extensions-refresh" icon="refresh"}{ts}Refresh{/ts}{/crmButton}
 </div>
\ No newline at end of file

diff --git a/templates/CRM/Admin/Page/Job.tpl b/templates/CRM/Admin/Page/Job.tpl
index 35fe4c35ac7542522ede83705a8a72d0a318d237..947dc6c1b5a9a887dae0e503b4ea644e9d40396b 100644 (file)
--- a/templates/CRM/Admin/Page/Job.tpl
+++ b/templates/CRM/Admin/Page/Job.tpl
@@ -36,8 +36,8 @@
 
       {if $action ne 1 and $action ne 2}
         <div class="action-link">
-          <a href="{crmURL q="action=add&reset=1"}" id="newJob" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add New Scheduled Job{/ts}</span></a>
-          <a href="{crmURL p='civicrm/admin/joblog' q="reset=1"}" id="jobLog" class="button"><span><div class="icon ui-icon-zoomin"></div>{ts}View Log (all jobs){/ts}</span></a>
+          {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}
         </div>
       {/if}
 

diff --git a/templates/CRM/Admin/Page/LocationType.tpl b/templates/CRM/Admin/Page/LocationType.tpl
index 9e2751c58bc7c6dc1ae0771d8395e0d698f9a13f..d421d1fe05490b46c4376a656e4daa6d2bbe32e4 100644 (file)
--- a/templates/CRM/Admin/Page/LocationType.tpl
+++ b/templates/CRM/Admin/Page/LocationType.tpl
@@ -69,7 +69,7 @@
     </div>
   {/if}
   <div class="action-link">
-    <a href="{crmURL q="action=add&reset=1"}" id="newLocationType" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Option{/ts}</span></a>
-    <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+    {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}
   </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/MailSettings.tpl b/templates/CRM/Admin/Page/MailSettings.tpl
index 12e17cf253e79550b4349b74a1f115c38a04c9ce..939dc91c1627cdc74d5af8152b2569b9b452661c 100644 (file)
--- a/templates/CRM/Admin/Page/MailSettings.tpl
+++ b/templates/CRM/Admin/Page/MailSettings.tpl
@@ -75,7 +75,7 @@
     </div>
 {/if}
   <div class="action-link">
-    <a href="{crmURL q="action=add&reset=1"}" id="newMailSettings" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Mail Account{/ts}</span></a>
-    <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+    {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}
   </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl
index 83f40a3d51757ae0536510842af964a8572efd95..13f5d8bbb3f8c6f5fdd85a4b4e397de9af238975 100644 (file)
--- a/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -140,7 +140,7 @@
 
             {if $action ne 1 and $action ne 2 and $type eq 'userTemplates'}
               <div class="action-link">
-                <a href="{crmURL p='civicrm/admin/messageTemplates/add' q="action=add&reset=1"}" id="newMessageTemplates" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Message Template{/ts}</span></a>
+                {crmButton p='civicrm/admin/messageTemplates/add' q="action=add&reset=1" id="newMessageTemplates"  icon="circle-plus"}{ts}Add Message Template{/ts}{/crmButton}
               </div>
               <div class="spacer"></div>
             {/if}

diff --git a/templates/CRM/Admin/Page/OptionGroup.tpl b/templates/CRM/Admin/Page/OptionGroup.tpl
index 038b981c426747b1652c21381fb62c8de68ee7c3..2fb2ea86ec0ef05b2897ea12fe2950467eae5ca8 100644 (file)
--- a/templates/CRM/Admin/Page/OptionGroup.tpl
+++ b/templates/CRM/Admin/Page/OptionGroup.tpl
@@ -57,8 +57,8 @@
 
     {if $action ne 1 and $action ne 2}
       <div class="action-link">
-          <a href="{crmURL q="action=add&reset=1"}" id="newOptionGroup" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Option Group{/ts}</span></a>
-          <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+          {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}
         </div>
     {/if}
 </div>

diff --git a/templates/CRM/Admin/Page/Options.tpl b/templates/CRM/Admin/Page/Options.tpl
index e37661af01e59cfafddddf6e7af8953b3e1286dd..ed4b986c880f311db96140c0f66d52a2b5c406c0 100644 (file)
--- a/templates/CRM/Admin/Page/Options.tpl
+++ b/templates/CRM/Admin/Page/Options.tpl
@@ -74,7 +74,7 @@
 {if $rows}
 {if $isLocked ne 1}
     <div class="action-link">
-        <a href="{crmURL p="civicrm/admin/options/$gName" q='action=add&reset=1'}" class="button new-option"><span><div class="icon ui-icon-circle-plus"></div>{ts 1=$gLabel}Add %1{/ts}</span></a>
+        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="circle-plus"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
     </div>
 {/if}
 <div id={$gName}>
@@ -160,9 +160,9 @@
 {/if}
     <div class="action-link">
       {if $isLocked ne 1}
-        <a href="{crmURL p="civicrm/admin/options/$gName" q='action=add&reset=1'}" class="button new-option"><span><div class="icon ui-icon-circle-plus"></div>{ts 1=$gLabel}Add %1{/ts}</span></a>
+        {crmButton p="civicrm/admin/options/$gName" q='action=add&reset=1' class="new-option" icon="circle-plus"}{ts 1=$gLabel}Add %1{/ts}{/crmButton}
       {/if}
-      <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+      {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
     </div>
 </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/ParticipantStatusType.tpl b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
index 24ad63e4c0613861e9f4d4b41bc97f23333dd51e..696977d358427e04e3c8b519c5ecda3d88002a42 100644 (file)
--- a/templates/CRM/Admin/Page/ParticipantStatusType.tpl
+++ b/templates/CRM/Admin/Page/ParticipantStatusType.tpl
@@ -62,8 +62,8 @@
 
   {if $action ne 1 and $action ne 2}
     <div class="action-link">
-      <a href="{crmURL q="action=add&reset=1"}" class="button"><span><div class="icon ui-icon-circle-plus"></div> {ts}Add Participant Status{/ts}</span></a>
-      <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+      {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}
     </div>
   {/if}
 </div>

diff --git a/templates/CRM/Admin/Page/PaymentProcessor.tpl b/templates/CRM/Admin/Page/PaymentProcessor.tpl
index 2e26d912db2ddbdbca8b95d6290a0f8b15d37271..a811acd24c4b3193496b8cc4b1a53ed17aa59347 100644 (file)
--- a/templates/CRM/Admin/Page/PaymentProcessor.tpl
+++ b/templates/CRM/Admin/Page/PaymentProcessor.tpl
@@ -62,7 +62,7 @@
 
         {if $action ne 1 and $action ne 2}
         <div class="action-link">
-          <a href="{crmURL q="action=add&reset=1&pp=$defaultPaymentProcessorType"}" id="newPaymentProcessor" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Payment Processor{/ts}</span></a>
+          {crmButton q="action=add&reset=1&pp=$defaultPaymentProcessorType" id="newPaymentProcessor"  icon="circle-plus"}{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">
-       <a href="{crmURL p='civicrm/admin/paymentProcessor' q="action=add&reset=1&pp=$defaultPaymentProcessorType"}" id="newPaymentProcessor" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Payment Processor{/ts}</span></a>
+       {crmButton p='civicrm/admin/paymentProcessor' q="action=add&reset=1&pp=$defaultPaymentProcessorType" id="newPaymentProcessor"  icon="circle-plus"}{ts}Add Payment Processor{/ts}{/crmButton}
      </div>
 {/if}
 {/if}

diff --git a/templates/CRM/Admin/Page/PaymentProcessorType.tpl b/templates/CRM/Admin/Page/PaymentProcessorType.tpl
index 4697f1280c07def6a03c150fc524e864d572872b..7f8d2408351c91fdf6eeeafb72efc1893f4d6b14 100644 (file)
--- a/templates/CRM/Admin/Page/PaymentProcessorType.tpl
+++ b/templates/CRM/Admin/Page/PaymentProcessorType.tpl
@@ -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>
-          <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+          {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
         </div>
         {/if}
     </div>

diff --git a/templates/CRM/Admin/Page/PdfFormats.tpl b/templates/CRM/Admin/Page/PdfFormats.tpl
index 5269d73c205191d182faf4e7173512018786cf21..c54ed251e8c6d3db7c171d709d1d24a2f4371f16 100644 (file)
--- a/templates/CRM/Admin/Page/PdfFormats.tpl
+++ b/templates/CRM/Admin/Page/PdfFormats.tpl
@@ -65,7 +65,7 @@
 {/if}
     <div class="spacer"></div>
     <div class="action-link">
-      <a href="{crmURL q="action=add&reset=1"}" id="newPdfFormat" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add PDF Page Format{/ts}</span></a>
-      <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+      {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}
     </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/Persistent.tpl b/templates/CRM/Admin/Page/Persistent.tpl
index 85e70d2b2a64da7378bcd2e60f4665701a279da6..bac43642be59ddfea8d51af3e51d6b4590a1c098 100644 (file)
--- a/templates/CRM/Admin/Page/Persistent.tpl
+++ b/templates/CRM/Admin/Page/Persistent.tpl
@@ -2,11 +2,7 @@
 {if $type eq 'configTemplates'}
     <table class="report-layout">
       <div class="action-link">
-        <a href="{crmURL p='civicrm/admin/tplstrings/add' q='reset=1&action=add'}"  class="button">
-          <span>
-             <div class="icon ui-icon-circle-plus"></div>{ts}Add New String{/ts}
-          </span>
-        </a>
+        {crmButton p='civicrm/admin/tplstrings/add' q='reset=1&action=add' icon="circle-plus"}{ts}Add New String{/ts}{/crmButton}
       </div>
       {if !empty( $template_row) }
       <tr>
@@ -37,11 +33,7 @@
       </head>
       <br/>
       <div class="action-link">
-         <a href="{crmURL p='civicrm/admin/tplstrings/add' q='reset=1&action=add&config=1'}"  class="button">
-           <span>
-              <div class="icon ui-icon-circle-plus"></div>{ts}Add New Config{/ts}
-           </span>
-         </a>
+         {crmButton p='civicrm/admin/tplstrings/add' q='reset=1&action=add&config=1' icon="circle-plus"}{ts}Add New Config{/ts}{/crmButton}
       </div>
       <br/>
       {if !empty( $template_row) }

diff --git a/templates/CRM/Admin/Page/RelationshipType.tpl b/templates/CRM/Admin/Page/RelationshipType.tpl
index 58652ada11f8da7fb17eb82557ac7fe3ecc3ce47..2c06e8d9ec33cecec035bedc9d0f09c2f485d347 100644 (file)
--- a/templates/CRM/Admin/Page/RelationshipType.tpl
+++ b/templates/CRM/Admin/Page/RelationshipType.tpl
@@ -36,7 +36,7 @@
 {if $rows}
 {if !($action eq 1 and $action eq 2)}
     <div class="action-link">
-      <a href="{crmURL q="action=add&reset=1"}" class="button newRelationshipType"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Relationship Type{/ts}</span></a>
+      {crmButton q="action=add&reset=1" class="newRelationshipType" icon="circle-plus"}{ts}Add Relationship Type{/ts}{/crmButton}
     </div>
 {/if}
 
@@ -82,7 +82,7 @@
     </div>
 {/if}
   <div class="action-link">
-    <a href="{crmURL q="action=add&reset=1"}" class="button newRelationshipType"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Relationship Type{/ts}</span></a>
-    <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+    {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}
   </div>
 {/if}

diff --git a/templates/CRM/Admin/Page/ScheduleReminders.tpl b/templates/CRM/Admin/Page/ScheduleReminders.tpl
index c6b5b7aa12e846938be152e31af2b31076126aee..7f6cb7eaba9fa90d73d6d4661cf3cc18e1def6f6 100644 (file)
--- a/templates/CRM/Admin/Page/ScheduleReminders.tpl
+++ b/templates/CRM/Admin/Page/ScheduleReminders.tpl
@@ -58,7 +58,7 @@
     {else}
       {assign var='urlParams' value="action=add&reset=1"}
     {/if}
-    <a href="{crmURL p=$link q=$urlParams}" id="newScheduleReminder" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Reminder{/ts}</span></a>
+    {crmButton p=$link q=$urlParams id="newScheduleReminder"  icon="circle-plus"}{ts}Add Reminder{/ts}{/crmButton}
   </div>
 {/if}
 {/if}

diff --git a/templates/CRM/Admin/Page/Tag.tpl b/templates/CRM/Admin/Page/Tag.tpl
index 909bba7460e62584e468784ad6763201b6555691..b3e88ee4138ee52b44baa151badb1118e3180030 100644 (file)
--- a/templates/CRM/Admin/Page/Tag.tpl
+++ b/templates/CRM/Admin/Page/Tag.tpl
@@ -38,9 +38,9 @@
         {if !($action eq 1 and $action eq 2)}
             <div class="crm-submit-buttons">
               <div class="action-link">
-                    <a href="{crmURL q="action=add&reset=1"}" id="newTag" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Tag{/ts}</span></a>
+                    {crmButton q="action=add&reset=1" id="newTag"  icon="circle-plus"}{ts}Add Tag{/ts}{/crmButton}
                     {if $adminTagSet}
-                        <a href="{crmURL q="action=add&reset=1&tagset=1"}" id="newTagSet" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Tag Set{/ts}</span></a>
+                        {crmButton q="action=add&reset=1&tagset=1" id="newTagSet"  icon="circle-plus"}{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">
-                    <a href="{crmURL q="action=add&reset=1"}" id="newTag" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Tag{/ts}</span></a>
+                    {crmButton q="action=add&reset=1" id="newTag"  icon="circle-plus"}{ts}Add Tag{/ts}{/crmButton}
                     {if $adminTagSet}
-                        <a href="{crmURL q="action=add&reset=1&tagset=1"}" id="newTagSet" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Tag Set{/ts}</span></a>
+                        {crmButton q="action=add&reset=1&tagset=1" id="newTagSet"  icon="circle-plus"}{ts}Add Tag Set{/ts}{/crmButton}
                     {/if}
                 </div>
             </div>

diff --git a/templates/CRM/Campaign/Form/Search/Petition.tpl b/templates/CRM/Campaign/Form/Search/Petition.tpl
index 0007b361bcb336b2a1b4d143544c20228cfc1ebb..cd0e32f6fcbbd42ba67931c695d01f41a46943bb 100755 (executable)
--- a/templates/CRM/Campaign/Form/Search/Petition.tpl
+++ b/templates/CRM/Campaign/Form/Search/Petition.tpl
@@ -31,7 +31,7 @@
     </div>
 
     <div class="action-link">
-         <a href="{crmURL p='civicrm/petition/add' q='reset=1' h=0 }" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Petition{/ts}</span></a>
+         {crmButton p='civicrm/petition/add' q='reset=1' h=0  icon="circle-plus"}{ts}Add Petition{/ts}{/crmButton}
     </div>
 
 {elseif $buildSelector}
@@ -72,7 +72,7 @@
 {else}
 
    <div class="action-link">
-      <a href="{crmURL p='civicrm/petition/add' q='reset=1' h=0 }" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Petition{/ts}</span></a>
+      {crmButton p='civicrm/petition/add' q='reset=1' h=0  icon="circle-plus"}{ts}Add Petition{/ts}{/crmButton}
    </div>
 
     {* build search form here *}

diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl
index 0947af09ad9a1100aa48d702744a7bad3ba943ad..7740b3c652ecdc8630c2236b138f3fd76644ba51 100755 (executable)
--- a/templates/CRM/Campaign/Form/Search/Survey.tpl
+++ b/templates/CRM/Campaign/Form/Search/Survey.tpl
@@ -31,7 +31,7 @@
     </div>
 
     <div class="action-link">
-         <a href="{crmURL p='civicrm/survey/add' q='reset=1' h=0 }" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Survey{/ts}</span></a>
+         {crmButton p='civicrm/survey/add' q='reset=1' h=0  icon="circle-plus"}{ts}Add Survey{/ts}{/crmButton}
     </div>
 
 {elseif $buildSelector}
@@ -76,7 +76,7 @@
 {else}
 
    <div class="action-link">
-      <a href="{crmURL p='civicrm/survey/add' q='reset=1' h=0 }" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Survey{/ts}</span></a>
+      {crmButton p='civicrm/survey/add' q='reset=1' h=0  icon="circle-plus"}{ts}Add Survey{/ts}{/crmButton}
    </div>
 
     {* build search form here *}

diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl
index 0cd707c2893ecbff777bd0899c412489a099fa0f..48add0ae57d6d18840868f051f1401420a72dad8 100644 (file)
--- a/templates/CRM/Case/Form/CaseView.tpl
+++ b/templates/CRM/Case/Form/CaseView.tpl
@@ -250,12 +250,10 @@
       {ts}Other Relationships{/ts}
     </div><!-- /.crm-accordion-header -->
     <div class="crm-accordion-body">
-      {capture assign=relUrl}{crmURL p='civicrm/contact/view/rel' q="action=add&reset=1&cid=`$contactId`&caseID=`$caseID`"}{/capture}
+      <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}
+      </div>
       {if $clientRelationships}
-        <div class="crm-submit-buttons">
-          <a class="button" href="{$relUrl}">
-          <div class="icon ui-icon-circle-plus"></div>{ts}Add client relationship{/ts}</a>
-        </div>
         <table id="clientRelationships-selector-{$caseID}"  class="report-layout">
           <thead><tr>
             <th>{ts}Client Relationship{/ts}</th>
@@ -267,8 +265,7 @@
         {else}
         <div class="messages status no-popup">
           <div class="icon inform-icon"></div>
-          {capture assign=link}class="action-item" href="{$relUrl}"{/capture}
-          {ts 1=$link}There are no Relationships entered for this client. You can <a %1>add one</a>.{/ts}
+          {ts}None found.{/ts}
         </div>
       {/if}
  {literal}

diff --git a/templates/CRM/Case/Page/CustomDataView.tpl b/templates/CRM/Case/Page/CustomDataView.tpl
index bc9b41918c2eedc68f202d890ff31713fa1972aa..2940e4e9e6cd9221c7d327d40f646f01b9eafc1a 100644 (file)
--- a/templates/CRM/Case/Page/CustomDataView.tpl
+++ b/templates/CRM/Case/Page/CustomDataView.tpl
@@ -69,9 +69,7 @@
         </table>
       {/foreach}
       <div>
-        <a href="{crmURL p="civicrm/case/cd/edit" q="cgcount=1&action=update&reset=1&type=Case&entityID=$caseID&groupID=$customGroupId&cid=$contactID&subType=$caseTypeID"}" class="button">
-          <span><div class="icon ui-icon-pencil"></div>{ts}Edit{/ts}</span>
-        </a>
+        {crmButton p="civicrm/case/cd/edit" q="cgcount=1&action=update&reset=1&type=Case&entityID=$caseID&groupID=$customGroupId&cid=$contactID&subType=$caseTypeID" icon="pencil"}{ts}Edit{/ts}{/crmButton}
       </div>
       <br/>
       <div class="clear"></div>

diff --git a/templates/CRM/Contact/Page/DedupeRules.tpl b/templates/CRM/Contact/Page/DedupeRules.tpl
index 0217632c6114764cea11a41bacc982a4ed127fe9..04d3bda3fc2c228a6a10092b0324a318c5802f7d 100644 (file)
--- a/templates/CRM/Contact/Page/DedupeRules.tpl
+++ b/templates/CRM/Contact/Page/DedupeRules.tpl
@@ -61,7 +61,7 @@
         {/strip}
        </div>
        <div style="float:right">
-            <a href="{crmURL q="action=add&contact_type=$contactType&reset=1"}" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts 1=$contactType}Add Rule for %1s{/ts}</span></a>
+            {crmButton q="action=add&contact_type=$contactType&reset=1" icon="circle-plus"}{ts 1=$contactType}Add Rule for %1s{/ts}{/crmButton}
         </div>
       </div>
     {/foreach}

diff --git a/templates/CRM/Contact/Page/View/Relationship.tpl b/templates/CRM/Contact/Page/View/Relationship.tpl
index cba2e0d2dd4e5883edea8c67e208fa0684999f56..3a3083d9d8778370ed043dfe391ed288a95a5b59 100644 (file)
--- a/templates/CRM/Contact/Page/View/Relationship.tpl
+++ b/templates/CRM/Contact/Page/View/Relationship.tpl
@@ -32,8 +32,7 @@
   <div id="contact-summary-relationship-tab" class="view-content">
     {if $permission EQ 'edit'}
       <div class="action-link">
-        <a accesskey="N" href="{crmURL p='civicrm/contact/view/rel' q="cid=`$contactId`&action=add&reset=1"}"
-           class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Relationship{/ts}</span></a>
+        {crmButton accesskey="N"  p='civicrm/contact/view/rel' q="cid=`$contactId`&action=add&reset=1" icon="circle-plus"}{ts}Add Relationship{/ts}{/crmButton}
       </div>
     {/if}
 

diff --git a/templates/CRM/Contribute/Page/ContributionType.tpl b/templates/CRM/Contribute/Page/ContributionType.tpl
index f5002ae7b4fd985ae00a49e6eaf0c8de8b0b6103..4abef5d6ff3f976729cb4ab3b1da842b4ffdebca 100644 (file)
--- a/templates/CRM/Contribute/Page/ContributionType.tpl
+++ b/templates/CRM/Contribute/Page/ContributionType.tpl
@@ -71,8 +71,8 @@
 {/if}
   {if $action ne 1 and $action ne 2}
     <div class="action-link">
-      <a href="{crmURL q="action=add&reset=1"}" id="newContributionType" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Financial Type{/ts}</span></a>
-      <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+      {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}
     </div>
   {/if}
 {/if}

diff --git a/templates/CRM/Contribute/Page/ManagePremiums.tpl b/templates/CRM/Contribute/Page/ManagePremiums.tpl
index 433717b2f6d87b27dca0e6df82a87e2bf0e94a7b..32a826a97e19db2e28e6d57f1dc2547ce3523201 100644 (file)
--- a/templates/CRM/Contribute/Page/ManagePremiums.tpl
+++ b/templates/CRM/Contribute/Page/ManagePremiums.tpl
@@ -71,7 +71,7 @@
     {/strip}
     {if $action ne 1 and $action ne 2}
       <div class="action-link">
-      <a href="{crmURL q="action=add&reset=1"}" id="newManagePremium" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Premium{/ts}</span></a>
+      {crmButton q="action=add&reset=1" id="newManagePremium"  icon="circle-plus"}{ts}Add Premium{/ts}{/crmButton}
         </div>
     {/if}
 </div>

diff --git a/templates/CRM/Custom/Form/Field.tpl b/templates/CRM/Custom/Form/Field.tpl
index 9a7f25297cdfcc12b45a15baea1ea979892cfc8e..5b463bfced13c12bc674d0e7968313cf7356af01 100644 (file)
--- a/templates/CRM/Custom/Form/Field.tpl
+++ b/templates/CRM/Custom/Form/Field.tpl
@@ -349,8 +349,6 @@ function custom_option_html_type( ) {
 {* Give link to view/edit choice options if in edit mode and html_type is one of the multiple choice types *}
 {if $action eq 2 AND ($form.data_type.value.1.0 eq 'CheckBox' OR ($form.data_type.value.1.0 eq 'Radio' AND $form.data_type.value.0.0 neq 6) OR $form.data_type.value.1.0 eq 'Select' OR ($form.data_type.value.1.0 eq 'Multi-Select' AND $dontShowLink neq 1 ) ) }
     <div class="action-link">
-      <a href="{crmURL p="civicrm/admin/custom/group/field/option" q="reset=1&action=browse&fid=`$id`&gid=`$gid`"}" class="button">
-        <span><div class="icon ui-icon-pencil"></div>{ts}View / Edit Multiple Choice Options{/ts}</span>
-      </a>
+      {crmButton p="civicrm/admin/custom/group/field/option" q="reset=1&action=browse&fid=`$id`&gid=`$gid`" icon="pencil"}{ts}View / Edit Multiple Choice Options{/ts}{/crmButton}
     </div>
 {/if}

diff --git a/templates/CRM/Custom/Form/Group.tpl b/templates/CRM/Custom/Form/Group.tpl
index 1908d6631bf0fbbea38fc30bbeef6d8e151f46f8..7564379560100937cc35642c1f37bcbb5e083045 100644 (file)
--- a/templates/CRM/Custom/Form/Group.tpl
+++ b/templates/CRM/Custom/Form/Group.tpl
@@ -78,7 +78,7 @@
 {if $action eq 2 or $action eq 4} {* Update or View*}
     <p></p>
     <div class="action-link">
-    <a href="{crmURL p='civicrm/admin/custom/group/field' q="action=browse&reset=1&gid=$gid"}" class="button"><span>{ts}Custom Fields for this Set{/ts}</span></a>
+      {crmButton p='civicrm/admin/custom/group/field' q="action=browse&reset=1&gid=$gid"}{ts}Custom Fields for this Set{/ts}{/crmButton}
     </div>
 {/if}
 {$initHideBlocks}

diff --git a/templates/CRM/Custom/Page/Field.tpl b/templates/CRM/Custom/Page/Field.tpl
index c19f3cb072eecdf5d04ad8168d6099bc902a903b..933c3be8c56d1db8b94d92dbaa71d99adfd81a13 100644 (file)
--- a/templates/CRM/Custom/Page/Field.tpl
+++ b/templates/CRM/Custom/Page/Field.tpl
@@ -77,8 +77,8 @@
         {/if}
     {/if}
     <div class="action-link">
-      <a href="{crmURL p='civicrm/admin/custom/group/field/add' q="reset=1&action=add&gid=$gid"}" id="newCustomField" class="button action-item"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Custom Field{/ts}</span></a>
-      <a href="{crmURL p="civicrm/admin/custom/group" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+      {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}
     </div>
 {/if}
 

diff --git a/templates/CRM/Custom/Page/Group.tpl b/templates/CRM/Custom/Page/Group.tpl
index 856fce896ec58cb502310617c0e6d14b22eb654c..29f3298cd265727f4c2e6552f43febb204f9b0de 100644 (file)
--- a/templates/CRM/Custom/Page/Group.tpl
+++ b/templates/CRM/Custom/Page/Group.tpl
@@ -70,7 +70,7 @@
 
         {if NOT ($action eq 1 or $action eq 2) }
         <div class="action-link">
-        <a href="{crmURL p='civicrm/admin/custom/group' q="action=add&reset=1"}" id="newCustomDataGroup" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Set of Custom Fields{/ts}</span></a>
+        {crmButton p='civicrm/admin/custom/group' q="action=add&reset=1" id="newCustomDataGroup"  icon="circle-plus"}{ts}Add Set of Custom Fields{/ts}{/crmButton}
         </div>
         {/if}
 

diff --git a/templates/CRM/Custom/Page/Option.tpl b/templates/CRM/Custom/Page/Option.tpl
index 301c38d5376d5c17c7ccd2fbf1d8e19a605154f5..697cd93e635baeb888f8343b85b697800d08324e 100644 (file)
--- a/templates/CRM/Custom/Page/Option.tpl
+++ b/templates/CRM/Custom/Page/Option.tpl
@@ -62,8 +62,8 @@
         {/strip}
 
         <div class="action-link">
-            <a href="{crmURL q="reset=1&action=add&fid=$fid&gid=$gid"}" class="button action-item"><span><div class="icon ui-icon-circle-plus"></div> {ts}Add Option{/ts}</span></a>
-            <a href="{crmURL p="civicrm/admin/custom/group/field" q="reset=1&action=browse&gid=$gid"}" class="button action-item cancel"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+            {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}
         </div>
       </div>
     </div>

diff --git a/templates/CRM/Financial/Page/FinancialType.tpl b/templates/CRM/Financial/Page/FinancialType.tpl
index 7b1cc812e09830ccf3d93dcbecd6ffc1c0b4227f..8ae441acc3d115b3bfe934b505513c458e36d6f3 100644 (file)
--- a/templates/CRM/Financial/Page/FinancialType.tpl
+++ b/templates/CRM/Financial/Page/FinancialType.tpl
@@ -74,8 +74,8 @@
 {/if}
   {if $action ne 1 and $action ne 2}
     <div class="action-link">
-      <a href="{crmURL q="action=add&reset=1"}" id="newFinancialType" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Financial Type{/ts}</span></a>
-      <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+      {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}
     </div>
   {/if}
 {/if}

diff --git a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
index 12808180fb1d1da741d68f398a314bc488c613ee..1315f4dbc61070d10204eccbaa7a0709f6a10a95 100644 (file)
--- a/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
+++ b/templates/CRM/Financial/Page/FinancialTypeAccount.tpl
@@ -31,8 +31,8 @@
   <div class="form-item">
     {if $action ne 1 and $action ne 2}
       <div class="action-link">
-      <a href="{crmURL q="action=add&reset=1&aid=$aid"}" id="newfinancialTypeAccount" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Assign Account{/ts}</span></a>
-  <a href="{crmURL p="civicrm/admin/financial/financialType" q="action=update&id=`$aid`&reset=1"}" class="button"><span><div class="icon ui-icon-pencil"></div>{ts}Edit Financial Type{/ts}</span></a>
+      {crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount"  icon="circle-plus"}{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}
     {strip}
@@ -64,8 +64,8 @@
 
     {if $action ne 1 and $action ne 2}
       <div class="action-link">
-      <a href="{crmURL q="action=add&reset=1&aid=$aid"}" id="newfinancialTypeAccount" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Assign Account{/ts}</span></a>
-  <a href="{crmURL p="civicrm/admin/financial/financialType" q="action=update&id=`$aid`&reset=1"}" class="button"><span><div class="icon ui-icon-pencil"></div>{ts}Edit Financial Type{/ts}</span></a>
+      {crmButton q="action=add&reset=1&aid=$aid" id="newfinancialTypeAccount"  icon="circle-plus"}{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}
     </div>

diff --git a/templates/CRM/Mailing/Page/Browse.tpl b/templates/CRM/Mailing/Page/Browse.tpl
index d161345813c9ca036b0a511743e5a9773db83ef6..19086374b4b8433c626144f28ca816295092d846 100644 (file)
--- a/templates/CRM/Mailing/Page/Browse.tpl
+++ b/templates/CRM/Mailing/Page/Browse.tpl
@@ -37,7 +37,7 @@
 
 {if $showLinks}
     <div class="action-link">
-      <a accesskey="N" href="{crmURL p=$newMassUrl q='reset=1'}" class="button"><span><div class="icon ui-icon-mail-closed"></div>{ts}{$linkTitle}{/ts}</span></a><br/><br/>
+      {crmButton accesskey="N"  p=$newMassUrl q='reset=1' icon="mail-closed"}{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">
-            <a accesskey="N" href="{crmURL p=$newMassUrl q='reset=1'}" class="button"><span><div class="icon ui-icon-mail-closed"></div>{ts}{$linkTitle}{/ts}</span></a><br/>
+            {crmButton accesskey="N"  p=$newMassUrl q='reset=1' icon="mail-closed"}{ts}{$linkTitle}{/ts}{/crmButton}<br/>
       </div>
     {/if}
 

diff --git a/templates/CRM/Mailing/Page/Component.tpl b/templates/CRM/Mailing/Page/Component.tpl
index a0a2cdcb7565d6850131030f3fcb103b6ad92945..f009e9c555ff203eeb7c1c1b83d7273db052f9c2 100644 (file)
--- a/templates/CRM/Mailing/Page/Component.tpl
+++ b/templates/CRM/Mailing/Page/Component.tpl
@@ -62,7 +62,7 @@
        {if $action ne 1 and $action ne 2}
   <br/>
        <div class="action-link">
-       <a href="{crmURL q="action=add&reset=1"}" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Mailing Component{/ts}</span></a>
+       {crmButton q="action=add&reset=1" icon="circle-plus"}{ts}Add Mailing Component{/ts}{/crmButton}
        </div>
        {/if}
     </div>

diff --git a/templates/CRM/Member/Page/MembershipStatus.tpl b/templates/CRM/Member/Page/MembershipStatus.tpl
index 78809c529eaa4e60a857de18c52265998daa448a..c0d730188d08bb16dd148be8b4bc8ee965fee68b 100644 (file)
--- a/templates/CRM/Member/Page/MembershipStatus.tpl
+++ b/templates/CRM/Member/Page/MembershipStatus.tpl
@@ -67,8 +67,8 @@
 
         {if $action ne 1 and $action ne 2}
         <div class="action-link">
-          <a href="{crmURL q="action=add&reset=1"}" id="newMembershipStatus" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Membership Status{/ts}</span></a>
-          <a href="{crmURL p="civicrm/admin" q="reset=1"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+          {crmButton q="action=add&reset=1" id="newMembershipStatus"  icon="circle-plus"}{ts}Add Membership Status{/ts}{/crmButton}
+          {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
         </div>
         {/if}
     </div>

diff --git a/templates/CRM/Member/Page/MembershipType.tpl b/templates/CRM/Member/Page/MembershipType.tpl
index 8f60dbd1c341c8d57467f806f643a2a2b0ec831d..c23342aae972a4146d6ebdf99c4167c79237cf8e 100644 (file)
--- a/templates/CRM/Member/Page/MembershipType.tpl
+++ b/templates/CRM/Member/Page/MembershipType.tpl
@@ -73,7 +73,7 @@
 
   {if $action ne 1 and $action ne 2}
     <div class="action-link">
-      <a href="{crmURL p='civicrm/admin/member/membershipType/add' q="action=add&reset=1"}" id="newMembershipType" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Membership Type{/ts}</span></a>
+      {crmButton p='civicrm/admin/member/membershipType/add' q="action=add&reset=1" id="newMembershipType"  icon="circle-plus"}{ts}Add Membership Type{/ts}{/crmButton}
     </div>
   {/if}
 </div>

diff --git a/templates/CRM/Price/Page/Field.tpl b/templates/CRM/Price/Page/Field.tpl
index caea3f906097588df547eaaa3ceea15756e99b89..550c6acd91f4fce434e631de0710467620fe4642 100644 (file)
--- a/templates/CRM/Price/Page/Field.tpl
+++ b/templates/CRM/Price/Page/Field.tpl
@@ -45,9 +45,9 @@
 {if $action NEQ 8 and $priceField}
   <div class="action-link">
     {if !$isReserved}
-      <a href="{crmURL q="reset=1&action=add&sid=$sid"}" id="newPriceField" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Price Field{/ts}</span></a>
+      {crmButton q="reset=1&action=add&sid=$sid" id="newPriceField"  icon="circle-plus"}{ts}Add Price Field{/ts}{/crmButton}
     {/if}
-      <a href="{crmURL p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field"}" class="button"><span><div class="icon ui-icon-zoomin"></div>{ts}Preview (all fields){/ts}</span></a>
+      {crmButton p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field" icon="zoomin"}{ts}Preview (all fields){/ts}{/crmButton}
   </div>
   <div id="field_page">
   {strip}
@@ -96,9 +96,9 @@
   </div>
   <div class="action-link">
     {if !$isReserved}
-      <a href="{crmURL q="reset=1&action=add&sid=$sid"}" id="newPriceField" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Price Field{/ts}</span></a>
+      {crmButton q="reset=1&action=add&sid=$sid" id="newPriceField"  icon="circle-plus"}{ts}Add Price Field{/ts}{/crmButton}
     {/if}
-    <a href="{crmURL p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field"}" class="button"><span><div class="icon ui-icon-zoomin"></div>{ts}Preview (all fields){/ts}</span></a>
+    {crmButton p="civicrm/admin/price" q="action=preview&sid=`$sid`&reset=1&context=field" icon="zoomin"}{ts}Preview (all fields){/ts}{/crmButton}
   </div>
 
 {else}
@@ -108,7 +108,7 @@
       {ts}None found.{/ts}
     </div>
     <div class="action-link">
-      <a href="{crmURL q="reset=1&action=add&sid=$sid"}" id="newPriceField" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Price Field{/ts}</span></a>
+      {crmButton q="reset=1&action=add&sid=$sid" id="newPriceField"  icon="circle-plus"}{ts}Add Price Field{/ts}{/crmButton}
     </div>
   {/if}
 {/if}

diff --git a/templates/CRM/Price/Page/Option.tpl b/templates/CRM/Price/Page/Option.tpl
index 1f4c8273eb02bdfeb16297958792a9e308a9fc45..1030129b9466d92fb43dd3cac61a11f0c48036a9 100644 (file)
--- a/templates/CRM/Price/Page/Option.tpl
+++ b/templates/CRM/Price/Page/Option.tpl
@@ -99,8 +99,8 @@
   {/if}
   {if $addMoreFields && !$isReserved}
     <div class="action-link">
-      <a href="{crmURL q="reset=1&action=add&fid=$fid&sid=$sid"}" class="button"><span><div class="icon ui-icon-circle-plus"></div> {ts 1=$fieldTitle}New Option for '%1'{/ts}</span></a>
-      <a href="{crmURL p="civicrm/admin/price/field" q="reset=1&sid=$sid"}" class="button cancel no-popup"><span><div class="icon ui-icon-close"></div> {ts}Done{/ts}</span></a>
+      {crmButton q="reset=1&action=add&fid=$fid&sid=$sid" icon="circle-plus"}{ts 1=$fieldTitle}New Option for '%1'{/ts}{/crmButton}
+      {crmButton p="civicrm/admin/price/field" q="reset=1&sid=$sid" class="cancel" icon="close"}{ts}Done{/ts}{/crmButton}
     </div>
   {/if}
 {/if}

diff --git a/templates/CRM/Price/Page/Set.tpl b/templates/CRM/Price/Page/Set.tpl
index 550b1e25e23ba9a1f11c1d82a85d34062462fc25..f7f4058246ddbcfa55057305d3c92993a7a2fa9f 100644 (file)
--- a/templates/CRM/Price/Page/Set.tpl
+++ b/templates/CRM/Price/Page/Set.tpl
@@ -76,7 +76,7 @@
 
         {if NOT ($action eq 1 or $action eq 2) }
         <div class="action-link">
-            <a href="{crmURL p='civicrm/admin/price' q="action=add&reset=1"}" id="newPriceSet" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Set of Price Fields{/ts}</span></a>
+            {crmButton p='civicrm/admin/price' q="action=add&reset=1" id="newPriceSet"  icon="circle-plus"}{ts}Add Set of Price Fields{/ts}{/crmButton}
         </div>
         {/if}
 

diff --git a/templates/CRM/SMS/Page/Provider.tpl b/templates/CRM/SMS/Page/Provider.tpl
index fffb2c2598445d69bb490171effda05f6a1c8ca4..8826f2107f7e82c1e82922ede5ea192c7c5474dd 100644 (file)
--- a/templates/CRM/SMS/Page/Provider.tpl
+++ b/templates/CRM/SMS/Page/Provider.tpl
@@ -68,6 +68,6 @@
 
   {/if}
   <div class="action-link">
-    <a href="{crmURL p='civicrm/admin/sms/provider' q="action=add&reset=1"}" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add SMS Provider{/ts}</span></a>
+    {crmButton p='civicrm/admin/sms/provider' q="action=add&reset=1" icon="circle-plus"}{ts}Add SMS Provider{/ts}{/crmButton}
   </div>
 {/if}

diff --git a/templates/CRM/UF/Page/Field.tpl b/templates/CRM/UF/Page/Field.tpl
index 85876281fc49ddf6a41069919a24ceec054a5e6d..7494571bd3575799ca18610ac758f19933a6319b 100644 (file)
--- a/templates/CRM/UF/Page/Field.tpl
+++ b/templates/CRM/UF/Page/Field.tpl
@@ -37,7 +37,7 @@
         <div id="field_page">
         {if not ($action eq 2 or $action eq 1)}
             <div class="action-link">
-                <a href="{crmURL p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid"}" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Field{/ts}</span></a>{if !$isGroupReserved}<a href="{crmURL p="civicrm/admin/uf/group/update" q="action=update&id=`$gid`&reset=1&context=field"}" class="button"><span><div class="icon ui-icon-pencil"></div>{ts}Edit Settings{/ts}</span></a>{/if}<a href="{crmURL p="civicrm/admin/uf/group" q="action=preview&id=`$gid`&reset=1&field=0&context=field"}" class="button"><span><div class="icon ui-icon-zoomin"></div>{ts}Preview (all fields){/ts}</span></a>{if !$skipCreate }<a href="{crmURL p="civicrm/profile/create" q="gid=$gid&reset=1"}" class="button"><span><div class="icon ui-icon-play"></div>{ts}Use (create mode){/ts}</span></a>{/if}
+                {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="circle-plus"}{ts}Add Field{/ts}{/crmButton}{if !$isGroupReserved}{crmButton p="civicrm/admin/uf/group/update" q="action=update&id=`$gid`&reset=1&context=field" icon="pencil"}{ts}Edit Settings{/ts}{/crmButton}{/if}{crmButton p="civicrm/admin/uf/group" q="action=preview&id=`$gid`&reset=1&field=0&context=field" icon="zoomin"}{ts}Preview (all fields){/ts}{/crmButton}{if !$skipCreate }{crmButton p="civicrm/profile/create" q="gid=$gid&reset=1" icon="play"}{ts}Use (create mode){/ts}{/crmButton}{/if}
                 <div class="clear"></div>
             </div>
         {/if}
@@ -79,7 +79,7 @@
         {/strip}
         {if not ($action eq 2 or $action eq 1)}
             <div class="action-link">
-                <a href="{crmURL p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid"}" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Field{/ts}</span></a>{if !$isGroupReserved}<a href="{crmURL p="civicrm/admin/uf/group" q="action=update&id=`$gid`&reset=1&context=field"}" class="button"><span><div class="icon ui-icon-pencil"></div>{ts}Edit Settings{/ts}</span></a>{/if}<a href="{crmURL p="civicrm/admin/uf/group" q="action=preview&id=`$gid`&reset=1&field=0&context=field"}" class="button"><span><div class="icon ui-icon-zoomin"></div>{ts}Preview (all fields){/ts}</span></a>{if !$skipCreate }<a href="{crmURL p="civicrm/profile/create" q="gid=$gid&reset=1"}" class="button"><span><div class="icon ui-icon-play"></div>{ts}Use (create mode){/ts}</span></a>{/if}
+                {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="circle-plus"}{ts}Add Field{/ts}{/crmButton}{if !$isGroupReserved}{crmButton p="civicrm/admin/uf/group" q="action=update&id=`$gid`&reset=1&context=field" icon="pencil"}{ts}Edit Settings{/ts}{/crmButton}{/if}{crmButton p="civicrm/admin/uf/group" q="action=preview&id=`$gid`&reset=1&field=0&context=field" icon="zoomin"}{ts}Preview (all fields){/ts}{/crmButton}{if !$skipCreate }{crmButton p="civicrm/profile/create" q="gid=$gid&reset=1" icon="play"}{ts}Use (create mode){/ts}{/crmButton}{/if}
                 <div class="clear"></div>
             </div>
         {/if}
@@ -93,7 +93,7 @@
           {ts}None found.{/ts}
         </div>
         <div class="action-link">
-          <a href="{crmURL p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid"}" class="button"><span><div class="icon ui-icon-circle-plus"></div>{ts}Add Field{/ts}</span></a>
+          {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="circle-plus"}{ts}Add Field{/ts}{/crmButton}
         </div>
         {/if}
     {/if}