From aac8c264bbb2a0fab30b1357412772935d71934f Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Wed, 30 Sep 2015 16:46:10 -0400 Subject: [PATCH] CRM-16415 Pencils - Implement Font Awesome icon font https://issues.civicrm.org/jira/browse/CRM-16415 --- CRM/Activity/Page/AJAX.php | 6 +++--- css/civicrm.css | 12 ++++++++++++ templates/CRM/Activity/Form/Activity.tpl | 10 +++++----- templates/CRM/Case/Page/DashBoard.tpl | 2 +- templates/CRM/Case/Page/DashboardSelector.tpl | 4 ++-- templates/CRM/Contact/Page/DashBoardDashlet.tpl | 6 +++--- templates/CRM/Contact/Page/View/Summary.tpl | 14 +++++++------- templates/CRM/Contribute/Form/ContributionView.tpl | 14 ++++++-------- templates/CRM/Custom/Page/CustomDataView.tpl | 6 ++---- templates/CRM/Event/Form/EventFees.tpl | 2 +- templates/CRM/Event/Form/ParticipantView.tpl | 12 ++++++------ templates/CRM/Grant/Form/GrantView.tpl | 8 ++++---- templates/CRM/Member/Form/MembershipView.tpl | 9 ++++----- templates/CRM/UF/Page/ProfileTemplates.tpl | 8 ++++---- 14 files changed, 60 insertions(+), 53 deletions(-) diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php index 67c5b3442b..298deb7507 100644 --- a/CRM/Activity/Page/AJAX.php +++ b/CRM/Activity/Page/AJAX.php @@ -262,7 +262,7 @@ class CRM_Activity_Page_AJAX { } // email column links/icon if ($row['email']) { - $row['email'] = ''; + $row['email'] = ''; } // edit links $row['actions'] = ''; @@ -272,7 +272,7 @@ class CRM_Activity_Page_AJAX { switch ($row['source']) { case 'caseRel': $row['actions'] = '' . - '' . + '' . '' . '' . '' . @@ -281,7 +281,7 @@ class CRM_Activity_Page_AJAX { case 'caseRoles': $row['actions'] = '' . - '' . + '' . ''; break; } diff --git a/css/civicrm.css b/css/civicrm.css index 79fd758380..3cbf85a1a2 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -2220,6 +2220,18 @@ input.crm-form-entityref { /* Font Awesome */ +.crm-container a, +.crm-container a:link, +.crm-container a:visited, +.crm-container a:active, +.crm-container a:hover { + color: inherit; +} + +a.crm-i:hover { + text-decoration: none; +} + .crm-i.crm-i-red { color: #8A1F11; } diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl index c80c4d9142..27b7dc37bc 100644 --- a/templates/CRM/Activity/Form/Activity.tpl +++ b/templates/CRM/Activity/Form/Activity.tpl @@ -96,12 +96,12 @@ {if $action neq 4} {if !$form.target_contact_id.frozen} - + {/if} {if $activityAssigneeNotification}
- {ts}A copy of this activity will be emailed to each Assignee.{/ts} + {ts}A copy of this activity will be emailed to each Assignee.{/ts} {/if} {/if} @@ -254,7 +254,7 @@ {if ($context eq 'fulltext' || $context eq 'search') && $searchKey} {assign var='urlParams' value="reset=1&atype=$atype&action=update&reset=1&id=$entityID&cid=$contactId&context=$context&key=$searchKey"} {/if} -
{ts}Edit{/ts} + {ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete activities')} @@ -262,11 +262,11 @@ {if ($context eq 'fulltext' || $context eq 'search') && $searchKey} {assign var='urlParams' value="reset=1&atype=$atype&action=delete&reset=1&id=$entityID&cid=$contactId&context=$context&key=$searchKey"} {/if} -
{ts}Delete{/ts} + {ts}Delete{/ts} {/if} {/if} {if $action eq 4 and call_user_func(array('CRM_Case_BAO_Case','checkPermission'), $activityId, 'File On Case', $atype)} -
{ts}File on Case{/ts} + {ts}File on Case{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="bottom"} diff --git a/templates/CRM/Case/Page/DashBoard.tpl b/templates/CRM/Case/Page/DashBoard.tpl index 058d4e2bfb..9a6fa0967a 100644 --- a/templates/CRM/Case/Page/DashBoard.tpl +++ b/templates/CRM/Case/Page/DashBoard.tpl @@ -36,7 +36,7 @@ {if $newClient and $allowToAddNewCase} {ts}Add Case{/ts} {/if} - {ts}Find My Cases{/ts} + {ts}Find My Cases{/ts}
{if $myCases} diff --git a/templates/CRM/Case/Page/DashboardSelector.tpl b/templates/CRM/Case/Page/DashboardSelector.tpl index 60b6d471c6..f2b4c28842 100644 --- a/templates/CRM/Case/Page/DashboardSelector.tpl +++ b/templates/CRM/Case/Page/DashboardSelector.tpl @@ -69,7 +69,7 @@ {/if}    {if $row.case_upcoming_activity_editable} - + {/if}
{$row.case_scheduled_activity_date|crmDate} @@ -82,7 +82,7 @@ {else} {$row.case_recent_activity_type} {/if} - {if $row.case_recent_activity_editable and $row.case_recent_activity_type_name != 'Inbound Email' && $row.case_recent_activity_type_name != 'Email'}   + {if $row.case_recent_activity_editable and $row.case_recent_activity_type_name != 'Inbound Email' && $row.case_recent_activity_type_name != 'Email'}   {/if}
{$row.case_recent_activity_date|crmDate} diff --git a/templates/CRM/Contact/Page/DashBoardDashlet.tpl b/templates/CRM/Contact/Page/DashBoardDashlet.tpl index d61b5c7164..7e1338e952 100644 --- a/templates/CRM/Contact/Page/DashBoardDashlet.tpl +++ b/templates/CRM/Contact/Page/DashBoardDashlet.tpl @@ -29,15 +29,15 @@ {$communityMessages}
- {ts}Configure Your Dashboard{/ts} + {ts}Configure Your Dashboard{/ts} - {ts}Refresh Dashboard Data{/ts} + {ts}Refresh Dashboard Data{/ts}
diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl index 1aca2d7e60..602f801249 100644 --- a/templates/CRM/Contact/Page/View/Summary.tpl +++ b/templates/CRM/Contact/Page/View/Summary.tpl @@ -57,7 +57,7 @@
  • {assign var='editParams' value=$urlParams|cat:"&action=update&cid=$contactId"} -
    {ts}Edit{/ts}     + {ts}Edit{/ts}
    • {/if} @@ -68,14 +68,14 @@ $is_deleted)}
  • -
    {ts}Restore from Trash{/ts}     + {ts}Restore from Trash{/ts}
    • {if call_user_func(array('CRM_Core_Permission','check'), 'delete contacts')}
  • -
    {ts}Delete Permanently{/ts}     + {ts}Delete Permanently{/ts}
    • {/if} @@ -84,7 +84,7 @@ {assign var='deleteParams' value="&reset=1&delete=1&cid=$contactId"}
  • -
    {ts}Delete Contact{/ts}     + {ts}Delete Contact{/ts}
    • {/if} @@ -99,7 +99,7 @@ {assign var='viewParams' value=$urlParams|cat:"&cid=$nextContactID"}
  • -
    {ts}Next{/ts}     + {ts}Next{/ts}
    • {/if} @@ -107,7 +107,7 @@ {assign var='viewParams' value=$urlParams|cat:"&cid=$prevContactID"}
  • -
    {ts}Previous{/ts}     + {ts}Previous{/ts}
    • {/if} @@ -116,7 +116,7 @@ {if !empty($groupOrganizationUrl)}
  • -
    {ts}Associated Multi-Org Group{/ts}     + {ts}Associated Multi-Org Group{/ts}
    • {/if} diff --git a/templates/CRM/Contribute/Form/ContributionView.tpl b/templates/CRM/Contribute/Form/ContributionView.tpl index 64b19ece33..dce14466d8 100644 --- a/templates/CRM/Contribute/Form/ContributionView.tpl +++ b/templates/CRM/Contribute/Form/ContributionView.tpl @@ -33,7 +33,7 @@ {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&key=$searchKey"} {/if} -
    {ts}Edit{/ts}     + {ts}Edit{/ts}     {/if} {if (call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviContribute') && call_user_func(array('CRM_Core_Permission', 'check'), "delete contributions of type $financial_type") && $canDelete) || (call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviContribute') && $noACL)} @@ -42,7 +42,7 @@ {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&key=$searchKey"} {/if} -
    {ts}Delete{/ts}     + {ts}Delete{/ts}     {/if} {include file="CRM/common/formButtons.tpl" location="top"} @@ -51,14 +51,14 @@ {if $invoicing}
    -
    + {if $contribution_status != 'Refunded' && $contribution_status != 'Cancelled' } {ts}Print Invoice{/ts}     {else} {ts}Print Invoice and Credit Note{/ts} {/if} -
    + {ts}Email Invoice{/ts}
    {/if} @@ -316,16 +316,14 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&key=$searchKey"} {/if} -
    {ts}Edit{/ts}     + {ts}Edit{/ts} {/if} {if (call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviContribute') && call_user_func(array('CRM_Core_Permission', 'check'), "delete contributions of type $financial_type") && $canDelete) || (call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviContribute') && $noACL)} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context"} {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&key=$searchKey"} {/if} -
    {ts}Delete{/ts}     + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="bottom"}
    diff --git a/templates/CRM/Custom/Page/CustomDataView.tpl b/templates/CRM/Custom/Page/CustomDataView.tpl index 6e58cec009..9d37f7b88d 100644 --- a/templates/CRM/Custom/Page/CustomDataView.tpl +++ b/templates/CRM/Custom/Page/CustomDataView.tpl @@ -36,8 +36,7 @@
    {ts 1=$cd_edit.title}Edit %1{/ts}

    + class="button" style="margin-left: 6px;"> {ts 1=$cd_edit.title}Edit %1{/ts}

    {/if} @@ -56,7 +55,7 @@ - {ts}Delete{/ts} + {ts}Delete{/ts} {/if} @@ -205,4 +204,3 @@ {/literal} {/if} - diff --git a/templates/CRM/Event/Form/EventFees.tpl b/templates/CRM/Event/Form/EventFees.tpl index 664528f11d..fbef349fd5 100644 --- a/templates/CRM/Event/Form/EventFees.tpl +++ b/templates/CRM/Event/Form/EventFees.tpl @@ -54,7 +54,7 @@ - {ts}Change Selections{/ts} + {ts}Change Selections{/ts} {else} {* New participant *} diff --git a/templates/CRM/Event/Form/ParticipantView.tpl b/templates/CRM/Event/Form/ParticipantView.tpl index 2d768f6dab..60adf43934 100644 --- a/templates/CRM/Event/Form/ParticipantView.tpl +++ b/templates/CRM/Event/Form/ParticipantView.tpl @@ -32,14 +32,14 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&selectedChild=event&key=$searchKey"} {/if} -
    {ts}Edit{/ts}     + {ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviEvent')} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&selectedChild=event"} {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&selectedChild=event&key=$searchKey"} {/if} -
    {ts}Delete{/ts}     + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="top"} @@ -50,7 +50,7 @@ {$displayName}
    - {ts}Print Name Badge{/ts} + {ts}Print Name Badge{/ts}
    @@ -111,7 +111,7 @@ {include file="CRM/Price/Page/LineItem.tpl" context="Event"} {if call_user_func(array('CRM_Core_Permission','check'), 'edit event participants')} {if $hasPayment or $parentHasPayment} - {ts}Change Selections{/ts} + {ts}Change Selections{/ts} {/if} {/if} @@ -141,14 +141,14 @@ {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&selectedChild=event&key=$searchKey"} {/if} -
    {ts}Edit{/ts}     + {ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviEvent')} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&selectedChild=event"} {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&selectedChild=event&key=$searchKey"} {/if} -
    {ts}Delete{/ts}     + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="bottom"} diff --git a/templates/CRM/Grant/Form/GrantView.tpl b/templates/CRM/Grant/Form/GrantView.tpl index 39078e1611..8dd14900e2 100644 --- a/templates/CRM/Grant/Form/GrantView.tpl +++ b/templates/CRM/Grant/Form/GrantView.tpl @@ -31,14 +31,14 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=update&context=$context&key=$searchKey"} {/if} -
    {ts}Edit{/ts}     + {ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviGrant')} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context"} {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context&key=$searchKey"} {/if} -
    {ts}Delete{/ts}     + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="top"} @@ -68,14 +68,14 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=update&context=$context&key=$searchKey"} {/if} -
    {ts}Edit{/ts}     + {ts}Edit{/ts} {/if} {if call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviGrant')} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context"} {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contactId&action=delete&context=$context&key=$searchKey"} {/if} -
    {ts}Delete{/ts}     + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="bottom"} diff --git a/templates/CRM/Member/Form/MembershipView.tpl b/templates/CRM/Member/Form/MembershipView.tpl index 5fd9eb59a1..6502bd9dd5 100644 --- a/templates/CRM/Member/Form/MembershipView.tpl +++ b/templates/CRM/Member/Form/MembershipView.tpl @@ -33,7 +33,7 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&key=$searchKey"} {/if} -
    {ts}Edit{/ts}     + {ts}Edit{/ts} {/if} {if ! ($owner_contact_id AND call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviMember')) && (call_user_func(array('CRM_Core_Permission', 'check'), "delete contributions of type $financialTypeId") || $noACL)} @@ -41,7 +41,7 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&key=$searchKey"} {/if} -
    {ts}Delete{/ts}     + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="bottom"} @@ -91,7 +91,7 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=update&context=$context&key=$searchKey"} {/if} -
    {ts}Edit{/ts}     + {ts}Edit{/ts} {/if} {if ! ($owner_contact_id AND call_user_func(array('CRM_Core_Permission','check'), 'delete in CiviMember')) && (call_user_func(array('CRM_Core_Permission', 'check'), "delete contributions of type $financialTypeId") || $noACL)} @@ -99,9 +99,8 @@ {if ( $context eq 'fulltext' || $context eq 'search' ) && $searchKey} {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id&action=delete&context=$context&key=$searchKey"} {/if} -
    {ts}Delete{/ts}     + {ts}Delete{/ts} {/if} {include file="CRM/common/formButtons.tpl" location="bottom"} - diff --git a/templates/CRM/UF/Page/ProfileTemplates.tpl b/templates/CRM/UF/Page/ProfileTemplates.tpl index 93ae45e73b..b5e8a1b400 100644 --- a/templates/CRM/UF/Page/ProfileTemplates.tpl +++ b/templates/CRM/UF/Page/ProfileTemplates.tpl @@ -65,8 +65,8 @@ *} @@ -114,7 +114,7 @@