From a2c70872e4b551fd15761e88d67b496a56395c8e Mon Sep 17 00:00:00 2001 From: Andrew Hunt Date: Mon, 28 Sep 2015 00:59:03 -0400 Subject: [PATCH] CRM-16415 Replacing plus-circle icon ---------------------------------------- * CRM-16415: Implement Font Awesome icon font https://issues.civicrm.org/jira/browse/CRM-16415 --- CRM/Core/Resources.php | 2 ++ css/civicrm.css | 21 ++++++++--------- css/crm-i.css | 12 ++++++++++ templates/CRM/ACL/Page/ACLBasic.tpl | 2 +- templates/CRM/Admin/Form/WordReplacements.tpl | 2 +- templates/CRM/Admin/Page/Job.tpl | 6 ++--- templates/CRM/Admin/Page/LabelFormats.tpl | 3 +-- templates/CRM/Admin/Page/Navigation.tpl | 2 +- templates/CRM/Badge/Page/Layout.tpl | 2 +- templates/CRM/Batch/Form/Search.tpl | 2 +- .../CRM/Campaign/Form/Search/Campaign.tpl | 6 ++--- templates/CRM/Campaign/Page/Petition.tpl | 4 ++-- templates/CRM/Campaign/Page/SurveyType.tpl | 4 ++-- templates/CRM/Case/Form/CaseView.tpl | 18 +++++++-------- templates/CRM/Case/Page/DashBoard.tpl | 4 ++-- templates/CRM/Case/Page/Tab.tpl | 2 +- templates/CRM/Contact/Form/Edit/Address.tpl | 2 +- templates/CRM/Contact/Form/Search/Intro.tpl | 4 ++-- templates/CRM/Contact/Page/View/Note.tpl | 8 +++---- templates/CRM/Contribute/Form/SoftCredit.tpl | 2 +- .../CRM/Contribute/Page/ContributionPage.tpl | 2 +- templates/CRM/Contribute/Page/DashBoard.tpl | 2 +- templates/CRM/Contribute/Page/PaymentInfo.tpl | 4 ++-- templates/CRM/Contribute/Page/Tab.tpl | 4 ++-- templates/CRM/Custom/Form/CustomData.tpl | 4 ++-- templates/CRM/Dashlet/Page/CaseDashboard.tpl | 2 +- templates/CRM/Event/Page/DashBoard.tpl | 18 +++++++-------- templates/CRM/Event/Page/ManageEvent.tpl | 23 +++++-------------- templates/CRM/Event/Page/Tab.tpl | 4 ++-- templates/CRM/Financial/Form/Search.tpl | 2 +- .../CRM/Financial/Page/FinancialAccount.tpl | 4 ++-- templates/CRM/Grant/Page/Tab.tpl | 2 +- templates/CRM/Group/Page/Group.tpl | 4 ++-- templates/CRM/Member/Page/Tab.tpl | 4 ++-- templates/CRM/Pledge/Page/Tab.tpl | 2 +- .../Page/MultipleRecordFieldsListing.tpl | 4 ++-- templates/CRM/Report/Page/InstanceList.tpl | 4 ++-- templates/CRM/Report/Page/Options.tpl | 4 ++-- templates/CRM/UF/Page/Group.tpl | 6 ++--- 39 files changed, 102 insertions(+), 105 deletions(-) create mode 100644 css/crm-i.css diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php index bb95f7f1b6..96c0c844f0 100644 --- a/CRM/Core/Resources.php +++ b/CRM/Core/Resources.php @@ -647,6 +647,8 @@ class CRM_Core_Resources { if (!CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'disable_core_css')) { $this->addStyleFile('civicrm', 'css/civicrm.css', -99, $region); } + // crm-i.css added ahead of other styles so it can be overridden by FA. + $this->addStyleFile('civicrm', 'css/crm-i.css', -101, $region); } return $this; } diff --git a/css/civicrm.css b/css/civicrm.css index f0a977bce4..ec4e01d5de 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -1781,6 +1781,15 @@ input.crm-form-entityref { float: right; } +.crm-container a.crm-event-feed-link { + margin: 0 1ex; + color: #52534D; +} + +.crm-container a.crm-event-feed-link:hover { + color: #2786c2; +} + .crm-container table.criteria-group { margin-bottom: .1em; } @@ -2211,18 +2220,6 @@ input.crm-form-entityref { /* Font Awesome */ -/* Direct copy of .fa from font-awesome.css -This is separate to avoid conflict with a site theme's implementation of FA. */ -.crm-i { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; - font-size: inherit; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - transform: translate(0, 0); -} - .crm-i.crm-i-red { color: #8A1F11; } diff --git a/css/crm-i.css b/css/crm-i.css new file mode 100644 index 0000000000..12514a9208 --- /dev/null +++ b/css/crm-i.css @@ -0,0 +1,12 @@ +/* Direct copy of .fa from font-awesome.css +This is separate to avoid conflict with a site theme's implementation of FA. It +is loaded before font-awesome.css so that .fa-XXX classes can modify it. */ +.crm-i { + display: inline-block; + font: normal normal normal 14px/1 FontAwesome; + font-size: inherit; + text-rendering: auto; + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; + transform: translate(0, 0); +} diff --git a/templates/CRM/ACL/Page/ACLBasic.tpl b/templates/CRM/ACL/Page/ACLBasic.tpl index fc0cede753..ae22584c19 100644 --- a/templates/CRM/ACL/Page/ACLBasic.tpl +++ b/templates/CRM/ACL/Page/ACLBasic.tpl @@ -55,7 +55,7 @@ {if $action ne 1 and $action ne 2}
-
{ts}Add ACL{/ts} + {ts}Add ACL{/ts}
{/if} diff --git a/templates/CRM/Admin/Form/WordReplacements.tpl b/templates/CRM/Admin/Form/WordReplacements.tpl index a317015128..2b127df6fa 100644 --- a/templates/CRM/Admin/Form/WordReplacements.tpl +++ b/templates/CRM/Admin/Form/WordReplacements.tpl @@ -61,7 +61,7 @@ {/section} -     {ts}Add row{/ts} +     {ts}Add row{/ts} diff --git a/templates/CRM/Admin/Page/Job.tpl b/templates/CRM/Admin/Page/Job.tpl index 527005ef21..06f9f30d42 100644 --- a/templates/CRM/Admin/Page/Job.tpl +++ b/templates/CRM/Admin/Page/Job.tpl @@ -71,8 +71,8 @@ {if $action ne 1 and $action ne 2}
-
{ts}Add New Scheduled Job{/ts} -
{ts}View Log (all jobs){/ts} + {crmButton q="action=add&reset=1" id="newJob-bottom" icon="plus-circle"}{ts}Add New Scheduled Job{/ts}{/crmButton} + {crmButton p='civicrm/admin/joblog' q="reset=1" id="jobLog-bottom" icon="list-alt"}{ts}View Log (all jobs){/ts}{/crmButton}
{/if} @@ -82,7 +82,7 @@ {ts}There are no jobs configured.{/ts}
-
{ts}Add New Scheduled Job{/ts} + {ts}Add New Scheduled Job{/ts}
{/if} diff --git a/templates/CRM/Admin/Page/LabelFormats.tpl b/templates/CRM/Admin/Page/LabelFormats.tpl index 7fb31c778e..493e80513e 100644 --- a/templates/CRM/Admin/Page/LabelFormats.tpl +++ b/templates/CRM/Admin/Page/LabelFormats.tpl @@ -64,8 +64,7 @@ {/strip}
-
{ts}Add Label Format{/ts} + {ts}Add Label Format{/ts}
{else} diff --git a/templates/CRM/Admin/Page/Navigation.tpl b/templates/CRM/Admin/Page/Navigation.tpl index 8ecdb2a325..61351c889e 100644 --- a/templates/CRM/Admin/Page/Navigation.tpl +++ b/templates/CRM/Admin/Page/Navigation.tpl @@ -32,7 +32,7 @@
-
{ts}Add Menu Item{/ts}     + {ts}Add Menu Item{/ts}    
diff --git a/templates/CRM/Batch/Form/Search.tpl b/templates/CRM/Batch/Form/Search.tpl index 988f8e3b28..dc1c8cb044 100644 --- a/templates/CRM/Batch/Form/Search.tpl +++ b/templates/CRM/Batch/Form/Search.tpl @@ -38,7 +38,7 @@
-
{ts}New Data Entry Batch{/ts}
+ {ts}New Data Entry Batch{/ts}
diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl index 533d65c769..79022a11b6 100755 --- a/templates/CRM/Campaign/Form/Search/Campaign.tpl +++ b/templates/CRM/Campaign/Form/Search/Campaign.tpl @@ -31,8 +31,7 @@ {ts}None found.{/ts}
-
{ts}Add Campaign{/ts} + {ts}Add Campaign{/ts}
{elseif $buildSelector} @@ -69,8 +68,7 @@
{else}
-
{ts}Add Campaign{/ts} + {ts}Add Campaign{/ts}
{* build search form here *} diff --git a/templates/CRM/Campaign/Page/Petition.tpl b/templates/CRM/Campaign/Page/Petition.tpl index ea374ec0c6..e315c81e11 100644 --- a/templates/CRM/Campaign/Page/Petition.tpl +++ b/templates/CRM/Campaign/Page/Petition.tpl @@ -28,7 +28,7 @@ {if $surveys}
-
{ts}Add Survey{/ts} + {ts}Add Survey{/ts}
{include file="CRM/common/enableDisableApi.tpl"} @@ -71,6 +71,6 @@ {/if}
-
{ts}Add Survey{/ts} + {ts}Add Survey{/ts}
diff --git a/templates/CRM/Campaign/Page/SurveyType.tpl b/templates/CRM/Campaign/Page/SurveyType.tpl index 21046fa378..e230ac0fc1 100644 --- a/templates/CRM/Campaign/Page/SurveyType.tpl +++ b/templates/CRM/Campaign/Page/SurveyType.tpl @@ -4,7 +4,7 @@ {else} {if $rows}
-
{ts 1=$GName}Add %1{/ts} + {ts 1=$GName}Add %1{/ts}
@@ -41,7 +41,7 @@ {/strip}
-
{ts 1=$GName}Add %1{/ts} + {ts 1=$GName}Add %1{/ts}
diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl index a28925c0ad..373ba9c0b6 100644 --- a/templates/CRM/Case/Form/CaseView.tpl +++ b/templates/CRM/Case/Form/CaseView.tpl @@ -43,7 +43,7 @@ {$client.display_name}{if not $smarty.foreach.clients.last},   {/if} {/foreach} - +
@@ -83,13 +83,13 @@ {ts}Subject{/ts}: {$caseDetails.case_subject} - {ts}Type{/ts}: {$caseDetails.case_type}  + {ts}Type{/ts}: {$caseDetails.case_type}  - {ts}Status{/ts}: {$caseDetails.case_status}  + {ts}Status{/ts}: {$caseDetails.case_status}  - {ts}Open Date{/ts}: {$caseDetails.case_start_date|crmDate}  + {ts}Open Date{/ts}: {$caseDetails.case_start_date|crmDate}  {ts}ID{/ts}: {$caseID} @@ -117,11 +117,11 @@

{if $hasAccessToAllCases} - {ts}Print Report{/ts} + {ts}Print Report{/ts} {/if} {if $mergeCases} - {ts}Merge Case{/ts} + {ts}Merge Case{/ts} {$form._qf_CaseView_next_merge_case.html} {$form.merge_case_id.html} @@ -129,7 +129,7 @@ {/if} {if call_user_func(array('CRM_Core_Permission','giveMeAllACLs'))} - {ts}Assign to Another Client{/ts} + {ts}Assign to Another Client{/ts} {/if}

@@ -146,7 +146,7 @@ {if $hasAccessToAllCases}
-
{ts}Add new role{/ts} + {ts}Add new role{/ts}
{$form.role_type.label}
@@ -229,7 +229,7 @@ {if !empty($globalGroupInfo.id)}
-
{ts 1=$globalGroupInfo.title}Add members to %1{/ts} + {ts 1=$globalGroupInfo.title}Add members to %1{/ts}
diff --git a/templates/CRM/Case/Page/DashBoard.tpl b/templates/CRM/Case/Page/DashBoard.tpl index 8fdc1b58a8..058d4e2bfb 100644 --- a/templates/CRM/Case/Page/DashBoard.tpl +++ b/templates/CRM/Case/Page/DashBoard.tpl @@ -34,9 +34,9 @@
{if $newClient and $allowToAddNewCase} -
{ts}Add Case{/ts} + {ts}Add Case{/ts} {/if} -
{ts}Find My Cases{/ts} + {ts}Find My Cases{/ts}
{if $myCases} diff --git a/templates/CRM/Case/Page/Tab.tpl b/templates/CRM/Case/Page/Tab.tpl index 1448cc0a51..c59df37b2f 100644 --- a/templates/CRM/Case/Page/Tab.tpl +++ b/templates/CRM/Case/Page/Tab.tpl @@ -60,7 +60,7 @@ call_user_func(array('CRM_Core_Permission','check'), 'add cases') ) AND $allowToAddNewCase}
-
{ts}Add Case{/ts} + {ts}Add Case{/ts}
{/if} diff --git a/templates/CRM/Contact/Form/Edit/Address.tpl b/templates/CRM/Contact/Form/Edit/Address.tpl index 7bb83b2678..312a4e15fd 100644 --- a/templates/CRM/Contact/Form/Edit/Address.tpl +++ b/templates/CRM/Contact/Form/Edit/Address.tpl @@ -81,7 +81,7 @@ {if $className eq 'CRM_Contact_Form_Contact'} {/if} diff --git a/templates/CRM/Contact/Form/Search/Intro.tpl b/templates/CRM/Contact/Form/Search/Intro.tpl index 77331d1d13..413dea7cc9 100644 --- a/templates/CRM/Contact/Form/Search/Intro.tpl +++ b/templates/CRM/Contact/Form/Search/Intro.tpl @@ -36,7 +36,7 @@ {capture assign=editSmartGroupURL}{crmURL p="civicrm/contact/search/advanced" q="reset=1&force=1&ssID=`$ssID`"}{/capture} {/if}
-
{ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts} + {ts 1=$group.title}Edit Smart Group Search Criteria for %1{/ts} {help id="id-edit-smartGroup"}
{/if} @@ -44,7 +44,7 @@ {if $permissionedForGroup} {capture assign=addMembersURL}{crmURL q="context=amtg&amtgID=`$group.id`&reset=1"}{/capture}
-
{ts 1=$group.title}Add Contacts to %1{/ts} + {ts 1=$group.title}Add Contacts to %1{/ts} {if $ssID}{help id="id-add-to-smartGroup"}{/if}
{/if} diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl index a253b261ff..f30560f870 100644 --- a/templates/CRM/Contact/Page/View/Note.tpl +++ b/templates/CRM/Contact/Page/View/Note.tpl @@ -100,7 +100,7 @@ {if $permission EQ 'edit' AND ($action eq 16)}
-
{ts}Add Note{/ts} + {ts}Add Note{/ts}
{/if} @@ -220,13 +220,13 @@ {if $note.comment_count} - + {else} - + {/if} diff --git a/templates/CRM/Contribute/Form/SoftCredit.tpl b/templates/CRM/Contribute/Form/SoftCredit.tpl index a71f886c2a..07dce25d87 100644 --- a/templates/CRM/Contribute/Form/SoftCredit.tpl +++ b/templates/CRM/Contribute/Form/SoftCredit.tpl @@ -43,7 +43,7 @@ {/section} - {ts}another soft credit{/ts} + {ts}another soft credit{/ts} diff --git a/templates/CRM/Contribute/Page/ContributionPage.tpl b/templates/CRM/Contribute/Page/ContributionPage.tpl index d23aed238b..498beb14a1 100644 --- a/templates/CRM/Contribute/Page/ContributionPage.tpl +++ b/templates/CRM/Contribute/Page/ContributionPage.tpl @@ -32,7 +32,7 @@ {if NOT ($action eq 1 or $action eq 2) } - +
{ts}Add Contribution Page{/ts}		 {ts}Add Contribution Page{/ts} {ts}Manage Personal Campaign Pages{/ts} {help id="id-pcp-intro" file="CRM/PCP/Page/PCP.hlp"}
diff --git a/templates/CRM/Contribute/Page/DashBoard.tpl b/templates/CRM/Contribute/Page/DashBoard.tpl index eb26055931..d5eea1ac38 100644 --- a/templates/CRM/Contribute/Page/DashBoard.tpl +++ b/templates/CRM/Contribute/Page/DashBoard.tpl @@ -71,7 +71,7 @@ {ts}Manage Contribution Pages{/ts} -
{ts}Add Contribution Page{/ts} + {ts}Add Contribution Page{/ts} diff --git a/templates/CRM/Contribute/Page/PaymentInfo.tpl b/templates/CRM/Contribute/Page/PaymentInfo.tpl index f9da9a84f7..b1351997ef 100644 --- a/templates/CRM/Contribute/Page/PaymentInfo.tpl +++ b/templates/CRM/Contribute/Page/PaymentInfo.tpl @@ -64,7 +64,7 @@ CRM.$(function($) { {if $paymentInfo.paid > 0} {$paymentInfo.paid|crmMoney}
- + {ts}view payments{/ts} {/if} @@ -78,6 +78,6 @@ CRM.$(function($) { {elseif $paymentInfo.balance < 0} {assign var=paymentButtonName value='Record Refund'} {/if} - {ts}{$paymentButtonName}{/ts} + {ts}{$paymentButtonName}{/ts} {/if} {/if} diff --git a/templates/CRM/Contribute/Page/Tab.tpl b/templates/CRM/Contribute/Page/Tab.tpl index 0ea39a6add..bc4f4559a6 100644 --- a/templates/CRM/Contribute/Page/Tab.tpl +++ b/templates/CRM/Contribute/Page/Tab.tpl @@ -46,9 +46,9 @@ {if $action eq 16 and $permission EQ 'edit'}
-
{ts}Record Contribution (Check, Cash, EFT ...){/ts} + {ts}Record Contribution (Check, Cash, EFT ...){/ts} {if $newCredit} -
{ts}Submit Credit Card Contribution{/ts} + {ts}Submit Credit Card Contribution{/ts} {/if}

diff --git a/templates/CRM/Custom/Form/CustomData.tpl b/templates/CRM/Custom/Form/CustomData.tpl index 10a1cbc176..197c3f4411 100644 --- a/templates/CRM/Custom/Form/CustomData.tpl +++ b/templates/CRM/Custom/Form/CustomData.tpl @@ -40,7 +40,7 @@ {if $cd_edit.is_multiple and ( ( $cd_edit.max_multiple eq '' ) or ( $cd_edit.max_multiple > 0 and $cd_edit.max_multiple > $cgCount ) ) } @@ -93,7 +93,7 @@ {else} diff --git a/templates/CRM/Dashlet/Page/CaseDashboard.tpl b/templates/CRM/Dashlet/Page/CaseDashboard.tpl index 902a57cb62..deff8bb0c0 100644 --- a/templates/CRM/Dashlet/Page/CaseDashboard.tpl +++ b/templates/CRM/Dashlet/Page/CaseDashboard.tpl @@ -34,7 +34,7 @@ -
{ts}New Case{/ts} + {ts}New Case{/ts} diff --git a/templates/CRM/Event/Page/DashBoard.tpl b/templates/CRM/Event/Page/DashBoard.tpl index 969038b3c6..22061b4627 100644 --- a/templates/CRM/Event/Page/DashBoard.tpl +++ b/templates/CRM/Event/Page/DashBoard.tpl @@ -32,15 +32,15 @@ {capture assign=htmlFeed}{crmURL p='civicrm/event/ical' q="reset=1&list=1&html=1" fe=1 a=1}{/capture} {if $eventSummary.total_events} -
- - - - - -
{ts}Manage Events{/ts}
{ts}New Event{/ts}
-
-

{ts}Event Summary{/ts} {help id="id-event-intro"}      {ts}HTML listing of current and future public events.{/ts}  {ts}Get RSS 2.0 feed for current and future public events.{/ts}  {ts}Download iCalendar file for current and future public events.{/ts}  {ts}Get iCalendar feed for current and future public events.{/ts}

+ {ts}Manage Events{/ts} + {ts}New Event{/ts} +
 
+

{ts}Event Summary{/ts} + {help id="id-event-intro"} + + + +

{include file="CRM/common/jsortable.tpl"} diff --git a/templates/CRM/Event/Page/ManageEvent.tpl b/templates/CRM/Event/Page/ManageEvent.tpl index 1cb8d7f536..88b8462d58 100644 --- a/templates/CRM/Event/Page/ManageEvent.tpl +++ b/templates/CRM/Event/Page/ManageEvent.tpl @@ -29,28 +29,17 @@ {capture assign=rssFeed}{crmURL p='civicrm/event/ical' q="reset=1&list=1&rss=1" fe=1}{/capture} {capture assign=htmlFeed}{crmURL p='civicrm/event/ical' q="reset=1&list=1&html=1" fe=1}{/capture}
- - {ts}HTML listing of current and future public events.{/ts} -    - - {ts}Get RSS 2.0 feed for current and future public events.{/ts} -    - - {ts}Download iCalendar file for current and future public events.{/ts} -    - - {ts}Get iCalendar feed for current and future public events.{/ts} -    {help id='icalendar'} + + + + + {help id='icalendar'}
{include file="CRM/Event/Form/SearchEvent.tpl"}
-
{ts}Add Event{/ts} + {ts}Add Event{/ts}
diff --git a/templates/CRM/Event/Page/Tab.tpl b/templates/CRM/Event/Page/Tab.tpl index 2daedea037..bdabe1add7 100644 --- a/templates/CRM/Event/Page/Tab.tpl +++ b/templates/CRM/Event/Page/Tab.tpl @@ -44,9 +44,9 @@ {if $action eq 16 and $permission EQ 'edit'}
-
{ts}Add Event Registration{/ts} + {ts}Add Event Registration{/ts} {if $accessContribution and $newCredit} -
{ts}Submit Credit Card Event Registration{/ts} + {ts}Submit Credit Card Event Registration{/ts} {/if}

diff --git a/templates/CRM/Financial/Form/Search.tpl b/templates/CRM/Financial/Form/Search.tpl index 0b596e49a5..cd6256b3f4 100644 --- a/templates/CRM/Financial/Form/Search.tpl +++ b/templates/CRM/Financial/Form/Search.tpl @@ -27,7 +27,7 @@ {* Financial search component. *}
-
{ts}New Accounting Batch{/ts} + {ts}New Accounting Batch{/ts}
diff --git a/templates/CRM/Financial/Page/FinancialAccount.tpl b/templates/CRM/Financial/Page/FinancialAccount.tpl index d132bde99b..2a70a7a20f 100644 --- a/templates/CRM/Financial/Page/FinancialAccount.tpl +++ b/templates/CRM/Financial/Page/FinancialAccount.tpl @@ -34,7 +34,7 @@
{if $action ne 1 and $action ne 2}
-
{ts}Add Financial Account{/ts} + {ts}Add Financial Account{/ts}
{/if} @@ -76,7 +76,7 @@ {if $action ne 1 and $action ne 2}
-
{ts}Add Financial Account{/ts} + {ts}Add Financial Account{/ts}
{/if}
diff --git a/templates/CRM/Grant/Page/Tab.tpl b/templates/CRM/Grant/Page/Tab.tpl index 24d2127075..96d21d7c52 100644 --- a/templates/CRM/Grant/Page/Tab.tpl +++ b/templates/CRM/Grant/Page/Tab.tpl @@ -43,7 +43,7 @@ {if $action eq 16 and $permission EQ 'edit'}
-
{ts}Add Grant{/ts}

+ {ts}Add Grant{/ts}

{/if} {if $rows} diff --git a/templates/CRM/Group/Page/Group.tpl b/templates/CRM/Group/Page/Group.tpl index dd685e4c30..5f00674203 100644 --- a/templates/CRM/Group/Page/Group.tpl +++ b/templates/CRM/Group/Page/Group.tpl @@ -26,7 +26,7 @@ {* Actions: 1=add, 2=edit, browse=16, delete=8 *} {if $action ne 1 and $action ne 2 and $action ne 8 and $groupPermission eq 1}
-
{ts}Add Group{/ts}
+ {ts}Add Group{/ts}
{/if} {* action ne add or edit *}
@@ -47,7 +47,7 @@ {if $action ne 1 and $action ne 2 and $action ne 8 and $groupPermission eq 1}
-
{ts}Add Group{/ts}
+ {ts}Add Group{/ts}
{/if} {* action ne add or edit *}
diff --git a/templates/CRM/Member/Page/Tab.tpl b/templates/CRM/Member/Page/Tab.tpl index 07970fa4e3..efeed44866 100644 --- a/templates/CRM/Member/Page/Tab.tpl +++ b/templates/CRM/Member/Page/Tab.tpl @@ -50,9 +50,9 @@
-
{ts}Add Membership{/ts} + {ts}Add Membership{/ts} {if $accessContribution and $newCredit} -
{ts}Submit Credit Card Membership{/ts}

+ {ts}Submit Credit Card Membership{/ts}

{else}

{/if} diff --git a/templates/CRM/Pledge/Page/Tab.tpl b/templates/CRM/Pledge/Page/Tab.tpl index 6a96e8b0a1..07908d6ff7 100644 --- a/templates/CRM/Pledge/Page/Tab.tpl +++ b/templates/CRM/Pledge/Page/Tab.tpl @@ -40,7 +40,7 @@ {if $action eq 16 and $permission EQ 'edit'}
-
{ts}Add Pledge{/ts} + {ts}Add Pledge{/ts}

{/if} diff --git a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl index 5b49cabd71..72bcff5596 100644 --- a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl +++ b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl @@ -76,10 +76,10 @@
{if $pageViewType eq 'customDataView'}
{ts 1=$customGroupTitle}Add %1 Record{/ts} + class="button action-item"> {ts 1=$customGroupTitle}Add %1 Record{/ts} {else}
{ts}Add New Record{/ts} + class="button action-item"> {ts}Add New Record{/ts} {/if}

diff --git a/templates/CRM/Report/Page/InstanceList.tpl b/templates/CRM/Report/Page/InstanceList.tpl index c9dfca3ce9..1913d95201 100644 --- a/templates/CRM/Report/Page/InstanceList.tpl +++ b/templates/CRM/Report/Page/InstanceList.tpl @@ -26,7 +26,7 @@ {strip}
{if $templateUrl} -
{$newButton} + {$newButton} {/if} {if $reportUrl} {ts}View All Reports{/ts} @@ -61,7 +61,7 @@
{if $templateUrl} -
{$newButton} + {$newButton} {/if} {if $reportUrl} {ts}View All Reports{/ts} diff --git a/templates/CRM/Report/Page/Options.tpl b/templates/CRM/Report/Page/Options.tpl index ae403a6edb..a754f729b2 100644 --- a/templates/CRM/Report/Page/Options.tpl +++ b/templates/CRM/Report/Page/Options.tpl @@ -28,7 +28,7 @@
{if $action ne 1 and $action ne 2}
-
{ts 1=$GName}Register New %1{/ts} + {ts 1=$GName}Register New %1{/ts}
{/if} @@ -74,7 +74,7 @@ {if $action ne 1 and $action ne 2}
-
{ts 1=$GName}Register New %1{/ts} + {ts 1=$GName}Register New %1{/ts}
{/if}
diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl index b85e2efa47..8a67399f33 100644 --- a/templates/CRM/UF/Page/Group.tpl +++ b/templates/CRM/UF/Page/Group.tpl @@ -53,7 +53,7 @@ {if NOT ($action eq 1 or $action eq 2)}
-
{ts}Add Profile{/ts} + {ts}Add Profile{/ts}
{/if} {if $rows} @@ -103,7 +103,7 @@ {if NOT ($action eq 1 or $action eq 2)}
-
{ts}Add Profile{/ts} + {ts}Add Profile{/ts}
{/if}
@@ -146,7 +146,7 @@ {if NOT ($action eq 1 or $action eq 2)}
-
{ts}Add Profile{/ts} + {ts}Add Profile{/ts}
{/if} -- 2.25.1