From 52604b19d0b09abce5e921df234ae615aaf9d8d3 Mon Sep 17 00:00:00 2001 From: Coleman Watts Date: Tue, 6 Jan 2015 14:37:22 -0500 Subject: [PATCH] CRM-15789 - Remove civicrm.css styles redundant with jQuery UI --- CRM/Activity/Page/AJAX.php | 6 +- CRM/Core/Form/Renderer.php | 2 +- CRM/Report/Form/Contact/LoggingSummary.php | 2 +- CRM/Report/Form/Contribute/LoggingSummary.php | 2 +- css/civicrm.css | 98 +++---------------- js/view/crm.profile-selector.js | 2 + partials/crmAttachment/attachments.html | 2 +- partials/crmCaseType/list.html | 2 +- partials/crmMailingAB/list.html | 2 +- templates/CRM/ACL/Page/ACL.tpl | 2 +- templates/CRM/ACL/Page/ACLBasic.tpl | 2 +- templates/CRM/ACL/Page/EntityRole.tpl | 2 +- templates/CRM/Activity/Form/Activity.tpl | 4 +- templates/CRM/Admin/Form/WordReplacements.tpl | 2 +- templates/CRM/Admin/Page/ContactType.tpl | 2 +- templates/CRM/Admin/Page/EventTemplate.tpl | 2 +- .../CRM/Admin/Page/Extensions/Refresh.tpl | 2 +- templates/CRM/Admin/Page/Job.tpl | 10 +- templates/CRM/Admin/Page/JobLog.tpl | 4 +- templates/CRM/Admin/Page/LabelFormats.tpl | 2 +- templates/CRM/Admin/Page/LocationType.tpl | 2 +- templates/CRM/Admin/Page/MailSettings.tpl | 2 +- templates/CRM/Admin/Page/MessageTemplates.tpl | 2 +- templates/CRM/Admin/Page/Navigation.tpl | 2 +- templates/CRM/Admin/Page/OptionGroup.tpl | 4 +- templates/CRM/Admin/Page/Options.tpl | 4 +- .../CRM/Admin/Page/ParticipantStatusType.tpl | 2 +- templates/CRM/Admin/Page/PaymentProcessor.tpl | 4 +- templates/CRM/Admin/Page/PdfFormats.tpl | 2 +- templates/CRM/Admin/Page/Persistent.tpl | 4 +- templates/CRM/Admin/Page/RelationshipType.tpl | 4 +- .../CRM/Admin/Page/ScheduleReminders.tpl | 2 +- templates/CRM/Admin/Page/Tag.tpl | 8 +- templates/CRM/Badge/Form/Layout.tpl | 4 +- templates/CRM/Badge/Page/Layout.tpl | 2 +- templates/CRM/Batch/Form/Entry.tpl | 2 +- templates/CRM/Batch/Form/Search.tpl | 2 +- templates/CRM/Block/CreateNew.tpl | 2 +- .../CRM/Campaign/Form/Search/Campaign.tpl | 4 +- .../CRM/Campaign/Form/Search/Petition.tpl | 4 +- templates/CRM/Campaign/Form/Search/Survey.tpl | 4 +- .../CRM/Campaign/Form/Task/Interview.tpl | 2 +- templates/CRM/Campaign/Page/SurveyType.tpl | 4 +- templates/CRM/Case/Form/Activity.tpl | 2 +- templates/CRM/Case/Form/CaseView.tpl | 16 +-- templates/CRM/Case/Page/CustomDataView.tpl | 2 +- templates/CRM/Case/Page/DashBoard.tpl | 2 +- templates/CRM/Case/Page/DashboardSelector.tpl | 4 +- templates/CRM/Case/Page/Tab.tpl | 2 +- templates/CRM/Contact/Form/Contact.tpl | 2 +- templates/CRM/Contact/Form/Edit/Address.tpl | 2 +- .../Contact/Form/Search/AdvancedCriteria.tpl | 2 +- templates/CRM/Contact/Form/Search/Intro.tpl | 4 +- templates/CRM/Contact/Form/Search/table.tpl | 2 +- templates/CRM/Contact/Form/Selector.tpl | 2 +- templates/CRM/Contact/Form/Task/Email.tpl | 4 +- .../CRM/Contact/Page/DashBoardDashlet.tpl | 18 ++-- templates/CRM/Contact/Page/DedupeRules.tpl | 2 +- templates/CRM/Contact/Page/Inline/Actions.tpl | 12 +-- templates/CRM/Contact/Page/View/Note.tpl | 2 +- .../CRM/Contact/Page/View/Relationship.tpl | 2 +- templates/CRM/Contact/Page/View/Summary.tpl | 6 +- .../Contribute/Form/ContributionPage/Tab.tpl | 2 +- .../CRM/Contribute/Form/ContributionView.tpl | 4 +- templates/CRM/Contribute/Form/SoftCredit.tpl | 2 +- .../CRM/Contribute/Page/ContributionPage.tpl | 2 +- .../CRM/Contribute/Page/ContributionType.tpl | 2 +- templates/CRM/Contribute/Page/DashBoard.tpl | 2 +- .../CRM/Contribute/Page/ManagePremiums.tpl | 2 +- templates/CRM/Contribute/Page/PaymentInfo.tpl | 2 +- templates/CRM/Contribute/Page/Tab.tpl | 4 +- templates/CRM/Custom/Form/Field.tpl | 2 +- templates/CRM/Custom/Page/CustomDataView.tpl | 2 +- templates/CRM/Custom/Page/Field.tpl | 2 +- templates/CRM/Custom/Page/Group.tpl | 2 +- templates/CRM/Custom/Page/Option.tpl | 2 +- templates/CRM/Event/Form/EventFees.tpl | 2 +- .../Form/ManageEvent/ConfirmRepeatMode.tpl | 2 +- templates/CRM/Event/Form/ManageEvent/Tab.tpl | 4 +- templates/CRM/Event/Form/Participant.tpl | 2 +- templates/CRM/Event/Form/ParticipantView.tpl | 8 +- templates/CRM/Event/Page/DashBoard.tpl | 2 +- templates/CRM/Event/Page/EventInfo.tpl | 4 +- templates/CRM/Event/Page/ManageEvent.tpl | 2 +- templates/CRM/Event/Page/Tab.tpl | 4 +- templates/CRM/Financial/Form/Search.tpl | 2 +- .../CRM/Financial/Page/FinancialAccount.tpl | 4 +- .../CRM/Financial/Page/FinancialType.tpl | 2 +- .../Financial/Page/FinancialTypeAccount.tpl | 8 +- templates/CRM/Form/attachment.tpl | 4 +- templates/CRM/Form/body.tpl | 2 +- templates/CRM/Grant/Form/GrantView.tpl | 4 +- templates/CRM/Grant/Page/Tab.tpl | 2 +- templates/CRM/Group/Page/Group.tpl | 4 +- templates/CRM/Logging/ReportDetail.tpl | 2 +- templates/CRM/Mailing/Page/Browse.tpl | 4 +- templates/CRM/Mailing/Page/Component.tpl | 2 +- templates/CRM/Member/Form/MembershipView.tpl | 4 +- .../CRM/Member/Page/MembershipStatus.tpl | 2 +- templates/CRM/Member/Page/MembershipType.tpl | 2 +- templates/CRM/Member/Page/Tab.tpl | 4 +- templates/CRM/PCP/Page/PCPInfo.tpl | 2 +- templates/CRM/Pledge/Page/Tab.tpl | 2 +- templates/CRM/Price/Page/Field.tpl | 10 +- templates/CRM/Price/Page/Option.tpl | 2 +- templates/CRM/Price/Page/Set.tpl | 2 +- .../Page/MultipleRecordFieldsListing.tpl | 4 +- templates/CRM/Report/Page/InstanceList.tpl | 4 +- templates/CRM/SMS/Page/Provider.tpl | 2 +- templates/CRM/UF/Page/Field.tpl | 6 +- templates/CRM/UF/Page/Group.tpl | 6 +- templates/CRM/UF/Page/ProfileTemplates.tpl | 4 +- templates/CRM/common/fatal.tpl | 2 +- templates/CRM/common/jcalendar.tpl | 2 +- 114 files changed, 203 insertions(+), 271 deletions(-) diff --git a/CRM/Activity/Page/AJAX.php b/CRM/Activity/Page/AJAX.php index f563c51b8d..853d7880d7 100644 --- a/CRM/Activity/Page/AJAX.php +++ b/CRM/Activity/Page/AJAX.php @@ -275,7 +275,7 @@ class CRM_Activity_Page_AJAX { } // email column links/icon if ($row['email']) { - $row['email'] = ''; + $row['email'] = ''; } // edit links $row['actions'] = ''; @@ -286,7 +286,7 @@ class CRM_Activity_Page_AJAX { case 'caseRel': $row['actions'] = '' . - '' . + '' . '' . '' . '' . @@ -296,7 +296,7 @@ class CRM_Activity_Page_AJAX { case 'caseRoles': $row['actions'] = '' . - '' . + '' . ''; break; } diff --git a/CRM/Core/Form/Renderer.php b/CRM/Core/Form/Renderer.php index 97107e32b2..953678f32d 100644 --- a/CRM/Core/Form/Renderer.php +++ b/CRM/Core/Form/Renderer.php @@ -324,6 +324,6 @@ class CRM_Core_Form_Renderer extends HTML_QuickForm_Renderer_ArraySmarty { // Initially hide if not needed // Note: visibility:hidden prevents layout jumping around unlike display:none $display = $field->getValue() !== NULL ? '' : ' style="visibility:hidden;"'; - $el['html'] .= ' '; + $el['html'] .= ' '; } } diff --git a/CRM/Report/Form/Contact/LoggingSummary.php b/CRM/Report/Form/Contact/LoggingSummary.php index 415471ae78..de6d783442 100644 --- a/CRM/Report/Form/Contact/LoggingSummary.php +++ b/CRM/Report/Form/Contact/LoggingSummary.php @@ -215,7 +215,7 @@ class CRM_Report_Form_Contact_LoggingSummary extends CRM_Logging_ReportSummary { $url1 = CRM_Report_Utils_Report::getNextUrl('logging/contact/detail', "{$q}&snippet=4§ion=2&layout=overlay", FALSE, TRUE); $url2 = CRM_Report_Utils_Report::getNextUrl('logging/contact/detail', "{$q}§ion=2", FALSE, TRUE); - $row['log_civicrm_entity_log_action'] = "
 " . ts('Update') . ''; + $row['log_civicrm_entity_log_action'] = "
 " . ts('Update') . ''; } $key = $date . '_' . diff --git a/CRM/Report/Form/Contribute/LoggingSummary.php b/CRM/Report/Form/Contribute/LoggingSummary.php index 8d0ee8ea35..33a121c4e9 100644 --- a/CRM/Report/Form/Contribute/LoggingSummary.php +++ b/CRM/Report/Form/Contribute/LoggingSummary.php @@ -208,7 +208,7 @@ class CRM_Report_Form_Contribute_LoggingSummary extends CRM_Logging_ReportSummar $url = CRM_Report_Utils_Report::getNextUrl('logging/contribute/detail', $q, FALSE, TRUE); $row['log_civicrm_contribution_log_action_link'] = $url; $row['log_civicrm_contribution_log_action_hover'] = ts('View details for this update'); - $row['log_civicrm_contribution_log_action'] = '
' . ts('Update'); + $row['log_civicrm_contribution_log_action'] = '
' . ts('Update'); } unset($row['log_civicrm_contribute_log_user_id']); diff --git a/css/civicrm.css b/css/civicrm.css index e07ffa0c27..340ffc20ab 100644 --- a/css/civicrm.css +++ b/css/civicrm.css @@ -237,15 +237,15 @@ input.crm-form-entityref { background: rgba(255,255,255,0.8); } -.crm-container .replace-plain .icon.edit-icon { +.crm-container .replace-plain .icon.ui-icon-pencil { position: absolute; top: .5em; right: .5em; } -.crm-container .replace-plain a:active .icon.edit-icon, -.crm-container .replace-plain:focus .icon.edit-icon, -.crm-container .replace-plain:hover .icon.edit-icon { +.crm-container .replace-plain a:active .icon.ui-icon-pencil, +.crm-container .replace-plain:focus .icon.ui-icon-pencil, +.crm-container .replace-plain:hover .icon.ui-icon-pencil { background-image: url("../i/icons/jquery-ui-2786C2.png"); } @@ -2628,27 +2628,9 @@ div.grippie { .crm-container .dark-icon { background-image: url("../packages/jquery/jquery-ui/images/ui-icons_222222_256x240.png") } -.crm-container .edit-icon { - background-position: -64px -112px; -} -.crm-container .previous-icon { - background-position: -80px -160px; -} -.crm-container .next-icon { - background-position: -64px -160px; -} -.crm-container .add-icon { - background-position: 0 -192px; -} -.crm-container .back-icon { - background-position: 0 -64px; -} .crm-container .delete-icon { background-position: -176px -96px; } -.crm-container .details-icon { - background-position: -128px -112px; -} .crm-container .red-icon, .crm-container a:hover .icon.delete-icon, .crm-container span:hover .icon.delete-icon { @@ -2663,73 +2645,11 @@ div.grippie { background-image: url("../i/icons/jquery-ui-91CE00.png"); } -.crm-container .vcard-icon { - background-position: -32px -80px; -} - -.crm-container .print-icon { - background-position: -160px -96px; -} - -.crm-container .dashboard-icon { - background-position: -192px -128px; -} - -.crm-container .Individual-profile-icon, -.crm-container .user-record-icon { - background-position: -144px -96px; -} -.crm-container .Household-profile-icon { - background-position: 0 -112px; -} -.crm-container .Organization-profile-icon { - background-position: -112px -112px; -} .crm-container .inform-icon { background-position: -16px -144px; margin-right: 5px; } -.crm-container .dropdown-icon { - background-position: -48px -32px; - float: right; -} - -.crm-container .tip-icon { - background-position: -128px -128px; -} - -.crm-container .alert-icon { - background-position: 0 -144px; -} -.crm-container .check-icon { - background-position: -64px -144px; -} -.crm-container .refresh-icon { - background-position: -64px -80px; -} -.crm-container .settings-icon { - background-position: -176px -112px; -} -.crm-container .search-icon { - background-position: -160px -112px; -} -.crm-container .email-icon { - background-position: -80px -96px; -} -.crm-container .preview-icon { - background-position: -224px -128px; -} -.crm-container .play-icon { - background-position: 0 -160px; -} -.crm-container .close-icon { - background-position: -80px -128px; -} -.crm-container .swap-icon { - background-position: -80px -80px; -} - #crm-container .geotag { padding: 2px 0 2px 20px !important; background: url('../i/geotag_16.png') left center no-repeat; @@ -3737,6 +3657,16 @@ div.m ul#civicrm-menu, .select2-drop .crm-entityref-filters select.active { border: 1px solid #808080; } +/* Icons used by entityRef create buttons */ +.crm-container .Individual-profile-icon { + background-position: -144px -96px; +} +.crm-container .Household-profile-icon { + background-position: 0 -112px; +} +.crm-container .Organization-profile-icon { + background-position: -112px -112px; +} /* Style autocomplete results */ .crm-container .select2-results { font-size: 12px; diff --git a/js/view/crm.profile-selector.js b/js/view/crm.profile-selector.js index 54b1de5fe2..0c1877fee3 100644 --- a/js/view/crm.profile-selector.js +++ b/js/view/crm.profile-selector.js @@ -94,9 +94,11 @@ var $pane = this.$('.crm-profile-selector-preview-pane'); if ($preview.hasClass('crm-profile-selector-preview-show')) { $preview.removeClass('crm-profile-selector-preview-show'); + $preview.find('.icon').removeClass('ui-icon-zoomin').addClass('ui-icon-zoomout'); $pane.show(); } else { $preview.addClass('crm-profile-selector-preview-show'); + $preview.find('.icon').removeClass('ui-icon-zoomout').addClass('ui-icon-zoomin'); $pane.hide(); } }, diff --git a/partials/crmAttachment/attachments.html b/partials/crmAttachment/attachments.html index 1a80f9495c..53c8239752 100644 --- a/partials/crmAttachment/attachments.html +++ b/partials/crmAttachment/attachments.html @@ -24,7 +24,7 @@ - + diff --git a/partials/crmCaseType/list.html b/partials/crmCaseType/list.html index 1f3bf76a7c..b5bd475d4d 100644 --- a/partials/crmCaseType/list.html +++ b/partials/crmCaseType/list.html @@ -69,5 +69,5 @@ Required vars: caseTypes
-
New Case Type +
New Case Type
\ No newline at end of file diff --git a/partials/crmMailingAB/list.html b/partials/crmMailingAB/list.html index 67b987257c..06c3a8afa1 100644 --- a/partials/crmMailingAB/list.html +++ b/partials/crmMailingAB/list.html @@ -35,5 +35,5 @@ Required vars: mailingABList

-
{{ts('New A/B Test')}} +
{{ts('New A/B Test')}}
diff --git a/templates/CRM/ACL/Page/ACL.tpl b/templates/CRM/ACL/Page/ACL.tpl index 9f8b650a31..79ac8e8863 100644 --- 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}
-
{ts}Add ACL{/ts} +
{ts}Add ACL{/ts}
{/if} diff --git a/templates/CRM/ACL/Page/ACLBasic.tpl b/templates/CRM/ACL/Page/ACLBasic.tpl index 5c2582675c..72b6bd90ba 100644 --- a/templates/CRM/ACL/Page/ACLBasic.tpl +++ b/templates/CRM/ACL/Page/ACLBasic.tpl @@ -63,7 +63,7 @@ {if $action ne 1 and $action ne 2}
-
{ts}Add ACL{/ts} +
{ts}Add ACL{/ts}
{/if} diff --git a/templates/CRM/ACL/Page/EntityRole.tpl b/templates/CRM/ACL/Page/EntityRole.tpl index 6da1b22ee9..b9f777dcc0 100644 --- 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}
-
{ts}Add Role Assignment{/ts} +
{ts}Add Role Assignment{/ts}
{/if} diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl index 922954c6ac..a48bb89f27 100644 --- a/templates/CRM/Activity/Form/Activity.tpl +++ b/templates/CRM/Activity/Form/Activity.tpl @@ -104,7 +104,7 @@ {/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} @@ -317,7 +317,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')} diff --git a/templates/CRM/Admin/Form/WordReplacements.tpl b/templates/CRM/Admin/Form/WordReplacements.tpl index 162e5b94bf..f2604ff977 100644 --- a/templates/CRM/Admin/Form/WordReplacements.tpl +++ b/templates/CRM/Admin/Form/WordReplacements.tpl @@ -65,7 +65,7 @@ -
{ts}Add row{/ts}{include file="CRM/common/formButtons.tpl"}
+
{ts}Add row{/ts}{include file="CRM/common/formButtons.tpl"}
{/if} diff --git a/templates/CRM/Admin/Page/ContactType.tpl b/templates/CRM/Admin/Page/ContactType.tpl index 8ee95e215e..3f58132220 100644 --- a/templates/CRM/Admin/Page/ContactType.tpl +++ b/templates/CRM/Admin/Page/ContactType.tpl @@ -63,7 +63,7 @@ {/if}
-
{ts}Add Contact Type{/ts} +
{ts}Add Contact Type{/ts}
{ts}Done{/ts}
{/if} diff --git a/templates/CRM/Admin/Page/EventTemplate.tpl b/templates/CRM/Admin/Page/EventTemplate.tpl index 3fc98818e2..3d768947bc 100644 --- a/templates/CRM/Admin/Page/EventTemplate.tpl +++ b/templates/CRM/Admin/Page/EventTemplate.tpl @@ -31,7 +31,7 @@ {if $action ne 1 and $action ne 2}
-
{ts}Add Event Template{/ts} +
{ts}Add Event Template{/ts}
{/if} diff --git a/templates/CRM/Admin/Page/Extensions/Refresh.tpl b/templates/CRM/Admin/Page/Extensions/Refresh.tpl index 2e97d47205..3b31575e3b 100644 --- a/templates/CRM/Admin/Page/Extensions/Refresh.tpl +++ b/templates/CRM/Admin/Page/Extensions/Refresh.tpl @@ -1,3 +1,3 @@
-
{ts}Refresh{/ts} +
{ts}Refresh{/ts}
\ No newline at end of file diff --git a/templates/CRM/Admin/Page/Job.tpl b/templates/CRM/Admin/Page/Job.tpl index 2cdad726b3..35fe4c35ac 100644 --- 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}
-
{ts}Add New Scheduled Job{/ts} -
{ts}View Log (all jobs){/ts} +
{ts}Add New Scheduled Job{/ts} +
{ts}View Log (all jobs){/ts}
{/if} @@ -71,8 +71,8 @@ {if $action ne 1 and $action ne 2}
-
{ts}Add New Scheduled Job{/ts} -
{ts}View Log (all jobs){/ts} +
{ts}Add New Scheduled Job{/ts} +
{ts}View Log (all jobs){/ts}
{/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/JobLog.tpl b/templates/CRM/Admin/Page/JobLog.tpl index 76cdd9f3a0..846c38713a 100644 --- a/templates/CRM/Admin/Page/JobLog.tpl +++ b/templates/CRM/Admin/Page/JobLog.tpl @@ -32,7 +32,7 @@ {/if}
-
{ts}Back to Scheduled Jobs Listing{/ts} +
{ts}Back to Scheduled Jobs Listing{/ts}
{if $rows} @@ -73,5 +73,5 @@ {/if}
-
{ts}Back to Scheduled Jobs Listing{/ts} +
{ts}Back to Scheduled Jobs Listing{/ts}
diff --git a/templates/CRM/Admin/Page/LabelFormats.tpl b/templates/CRM/Admin/Page/LabelFormats.tpl index 9e1aa43192..18ad40df04 100644 --- a/templates/CRM/Admin/Page/LabelFormats.tpl +++ b/templates/CRM/Admin/Page/LabelFormats.tpl @@ -65,7 +65,7 @@
{ts}Add Label Format{/ts} + class="icon ui-icon-circle-plus">
{ts}Add Label Format{/ts} {else} diff --git a/templates/CRM/Admin/Page/LocationType.tpl b/templates/CRM/Admin/Page/LocationType.tpl index 311fb54039..9e2751c58b 100644 --- a/templates/CRM/Admin/Page/LocationType.tpl +++ b/templates/CRM/Admin/Page/LocationType.tpl @@ -69,7 +69,7 @@ {/if}
-
{ts}Add Option{/ts} +
{ts}Add Option{/ts}
{ts}Done{/ts}
{/if} diff --git a/templates/CRM/Admin/Page/MailSettings.tpl b/templates/CRM/Admin/Page/MailSettings.tpl index 4dca2eeeb3..12e17cf253 100644 --- a/templates/CRM/Admin/Page/MailSettings.tpl +++ b/templates/CRM/Admin/Page/MailSettings.tpl @@ -75,7 +75,7 @@ {/if}
-
{ts}Add Mail Account{/ts} +
{ts}Add Mail Account{/ts}
{ts}Done{/ts}
{/if} diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl index 1f3032518a..83f40a3d51 100644 --- 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'}
-
{ts}Add Message Template{/ts} +
{ts}Add Message Template{/ts}
{/if} diff --git a/templates/CRM/Admin/Page/Navigation.tpl b/templates/CRM/Admin/Page/Navigation.tpl index 8158d4b08e..6a1d0076fd 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}    
-
{ts}Add Payment Processor{/ts} +
{ts}Add Payment Processor{/ts}
{/if} {/if} diff --git a/templates/CRM/Admin/Page/PdfFormats.tpl b/templates/CRM/Admin/Page/PdfFormats.tpl index 79277cb7a9..5269d73c20 100644 --- a/templates/CRM/Admin/Page/PdfFormats.tpl +++ b/templates/CRM/Admin/Page/PdfFormats.tpl @@ -65,7 +65,7 @@ {/if}
-
{ts}Add PDF Page Format{/ts} +
{ts}Add PDF Page Format{/ts}
{ts}Done{/ts}
{/if} diff --git a/templates/CRM/Admin/Page/Persistent.tpl b/templates/CRM/Admin/Page/Persistent.tpl index 2418a0fca8..85e70d2b2a 100644 --- a/templates/CRM/Admin/Page/Persistent.tpl +++ b/templates/CRM/Admin/Page/Persistent.tpl @@ -4,7 +4,7 @@
-
{ts}Add New String{/ts} +
{ts}Add New String{/ts}
@@ -39,7 +39,7 @@
-
{ts}Add New Config{/ts} +
{ts}Add New Config{/ts}
diff --git a/templates/CRM/Admin/Page/RelationshipType.tpl b/templates/CRM/Admin/Page/RelationshipType.tpl index c7134402bd..58652ada11 100644 --- 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)}
-
{ts}Add Relationship Type{/ts} +
{ts}Add Relationship Type{/ts}
{/if} @@ -82,7 +82,7 @@
{/if}
-
{ts}Add Relationship Type{/ts} +
{ts}Add Relationship Type{/ts}
{ts}Done{/ts}
{/if} diff --git a/templates/CRM/Admin/Page/ScheduleReminders.tpl b/templates/CRM/Admin/Page/ScheduleReminders.tpl index 2e31973936..c6b5b7aa12 100644 --- 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} -
{ts}Add Reminder{/ts} +
{ts}Add Reminder{/ts} {/if} {/if} diff --git a/templates/CRM/Admin/Page/Tag.tpl b/templates/CRM/Admin/Page/Tag.tpl index ebc155aca2..909bba7460 100644 --- 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)}
-
{ts}Add Tag{/ts} +
{ts}Add Tag{/ts} {if $adminTagSet} -
{ts}Add Tag Set{/ts} +
{ts}Add Tag Set{/ts} {/if}
@@ -81,9 +81,9 @@ {if !($action eq 1 and $action eq 2)}
-
{ts}Add Tag{/ts} +
{ts}Add Tag{/ts} {if $adminTagSet} -
{ts}Add Tag Set{/ts} +
{ts}Add Tag Set{/ts} {/if}
diff --git a/templates/CRM/Badge/Form/Layout.tpl b/templates/CRM/Badge/Form/Layout.tpl index 220888eeab..2d644a33f4 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/Badge/Page/Layout.tpl b/templates/CRM/Badge/Page/Layout.tpl index 7a1592fa91..106af8b94f 100644 --- a/templates/CRM/Badge/Page/Layout.tpl +++ b/templates/CRM/Badge/Page/Layout.tpl @@ -68,7 +68,7 @@ {if $action ne 1 and $action ne 2}
{ts}New Badge Layout{/ts} + class="button">
{ts}New Badge Layout{/ts}
{/if} diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl index 77d7fdf707..2eeb718401 100755 --- a/templates/CRM/Batch/Form/Entry.tpl +++ b/templates/CRM/Batch/Form/Entry.tpl @@ -30,7 +30,7 @@ {if $batchAmountMismatch}
{ts}Total for amounts entered below does not match the expected batch total.{/ts} + class="icon ui-icon-alert">
{ts}Total for amounts entered below does not match the expected batch total.{/ts}
{$form._qf_Entry_upload_force.html} diff --git a/templates/CRM/Batch/Form/Search.tpl b/templates/CRM/Batch/Form/Search.tpl index 9eb0740731..004240178e 100644 --- a/templates/CRM/Batch/Form/Search.tpl +++ b/templates/CRM/Batch/Form/Search.tpl @@ -38,7 +38,7 @@
{$form.image_2.html} - +
{ts}Click above and select a file by double clicking on it.{/ts}
-
{ts}New Data Entry Batch{/ts}
+
{ts}New Data Entry Batch{/ts}
diff --git a/templates/CRM/Block/CreateNew.tpl b/templates/CRM/Block/CreateNew.tpl index 1482e65a39..e61f99eeda 100644 --- a/templates/CRM/Block/CreateNew.tpl +++ b/templates/CRM/Block/CreateNew.tpl @@ -24,7 +24,7 @@ *}
-
{ts}Create New{/ts} +
{ts}Create New{/ts}
    diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl index 7bb20d4e5a..fdda0c564a 100755 --- a/templates/CRM/Campaign/Form/Search/Campaign.tpl +++ b/templates/CRM/Campaign/Form/Search/Campaign.tpl @@ -32,7 +32,7 @@
{ts}Add Campaign{/ts} + class="icon ui-icon-circle-plus">
{ts}Add Campaign{/ts}
{elseif $buildSelector} @@ -70,7 +70,7 @@ {else}
{ts}Add Campaign{/ts} + class="icon ui-icon-circle-plus">
{ts}Add Campaign{/ts}
{* build search form here *} diff --git a/templates/CRM/Campaign/Form/Search/Petition.tpl b/templates/CRM/Campaign/Form/Search/Petition.tpl index 506ee4cec2..0007b361bc 100755 --- a/templates/CRM/Campaign/Form/Search/Petition.tpl +++ b/templates/CRM/Campaign/Form/Search/Petition.tpl @@ -31,7 +31,7 @@
-
{ts}Add Petition{/ts} +
{ts}Add Petition{/ts}
{elseif $buildSelector} @@ -72,7 +72,7 @@ {else}
-
{ts}Add Petition{/ts} +
{ts}Add Petition{/ts}
{* build search form here *} diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl index 776c9bd835..0947af09ad 100755 --- a/templates/CRM/Campaign/Form/Search/Survey.tpl +++ b/templates/CRM/Campaign/Form/Search/Survey.tpl @@ -31,7 +31,7 @@
-
{ts}Add Survey{/ts} +
{ts}Add Survey{/ts}
{elseif $buildSelector} @@ -76,7 +76,7 @@ {else}
-
{ts}Add Survey{/ts} +
{ts}Add Survey{/ts}
{* build search form here *} diff --git a/templates/CRM/Campaign/Form/Task/Interview.tpl b/templates/CRM/Campaign/Form/Task/Interview.tpl index 87a41a5db8..aa36989e82 100644 --- a/templates/CRM/Campaign/Form/Task/Interview.tpl +++ b/templates/CRM/Campaign/Form/Task/Interview.tpl @@ -329,7 +329,7 @@ var surveyActivityIds = {/literal}{$surveyActivityIds}{literal}; if (interview.errors[error]) errorList = errorList + '
  • ' + interview.errors[error] + '
    • '; } if ( errorList ) { - var allErrors = '
    Please correct the following errors in the survey fields below:' + ''; + var allErrors = '
    Please correct the following errors in the survey fields below:' + ''; CRM.$('#responseErrors').show( ).html(allErrors); } } diff --git a/templates/CRM/Campaign/Page/SurveyType.tpl b/templates/CRM/Campaign/Page/SurveyType.tpl index 4ddc6759d7..21046fa378 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/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl index 4b38bf728a..6005641560 100644 --- a/templates/CRM/Case/Form/Activity.tpl +++ b/templates/CRM/Case/Form/Activity.tpl @@ -128,7 +128,7 @@ {$form.assignee_contact_id.html} {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} diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl index 3bc2ca645f..0cd707c289 100644 --- a/templates/CRM/Case/Form/CaseView.tpl +++ b/templates/CRM/Case/Form/CaseView.tpl @@ -44,7 +44,7 @@ {$client.display_name}{if not $smarty.foreach.clients.last},   {/if} {/foreach} - +
    @@ -84,13 +84,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} @@ -118,7 +118,7 @@

    {if $hasAccessToAllCases} - {ts}Print Report{/ts} + {ts}Print Report{/ts} {/if} {if $mergeCases} @@ -147,7 +147,7 @@ {if $hasAccessToAllCases}

    -
    {ts}Add new role{/ts}     +
    {ts}Add new role{/ts}
    {$form.role_type.label}
    @@ -254,7 +254,7 @@ {if $clientRelationships}
    -
    {ts}Add client relationship{/ts}     +
    {ts}Add client relationship{/ts}
    @@ -336,7 +336,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/CustomDataView.tpl b/templates/CRM/Case/Page/CustomDataView.tpl index fb785ce9d0..bc9b41918c 100644 --- a/templates/CRM/Case/Page/CustomDataView.tpl +++ b/templates/CRM/Case/Page/CustomDataView.tpl @@ -70,7 +70,7 @@ {/foreach}
    diff --git a/templates/CRM/Case/Page/DashBoard.tpl b/templates/CRM/Case/Page/DashBoard.tpl index 04bd40889b..6725561304 100644 --- a/templates/CRM/Case/Page/DashBoard.tpl +++ b/templates/CRM/Case/Page/DashBoard.tpl @@ -34,7 +34,7 @@
    {if $newClient and $allowToAddNewCase} -
    {ts}Add Case{/ts}     +
    {ts}Add Case{/ts}     {/if} {ts}Find My Cases{/ts} diff --git a/templates/CRM/Case/Page/DashboardSelector.tpl b/templates/CRM/Case/Page/DashboardSelector.tpl index 177dca0b86..abcb238a12 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/Case/Page/Tab.tpl b/templates/CRM/Case/Page/Tab.tpl index 31765981e8..d3bd158ef1 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/Contact.tpl b/templates/CRM/Contact/Form/Contact.tpl index f22f9b8674..25611f7d45 100644 --- a/templates/CRM/Contact/Form/Contact.tpl +++ b/templates/CRM/Contact/Form/Contact.tpl @@ -32,7 +32,7 @@ {/if}
    {if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') } - + {/if} {ts}Expand all tabs{/ts}
    diff --git a/templates/CRM/Contact/Form/Edit/Address.tpl b/templates/CRM/Contact/Form/Edit/Address.tpl index 9e6bf6e880..703ec839e0 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/AdvancedCriteria.tpl b/templates/CRM/Contact/Form/Search/AdvancedCriteria.tpl index 1ed1d303a4..092d129b0e 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/Intro.tpl b/templates/CRM/Contact/Form/Search/Intro.tpl index 520d05961e..21f25e6525 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/Form/Search/table.tpl b/templates/CRM/Contact/Form/Search/table.tpl index 3b36276879..a1add0fef5 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 df7d0ef37f..8c0b019fbc 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}
    diff --git a/templates/CRM/Contact/Form/Task/Email.tpl b/templates/CRM/Contact/Form/Task/Email.tpl index 39b7bd5787..0f223b0f47 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/DashBoardDashlet.tpl b/templates/CRM/Contact/Page/DashBoardDashlet.tpl index b0c76f3ccc..e4f4f170da 100644 --- a/templates/CRM/Contact/Page/DashBoardDashlet.tpl +++ b/templates/CRM/Contact/Page/DashBoardDashlet.tpl @@ -33,26 +33,26 @@ {if ! $ownerOrgOK}
    -
    {ts}Go{/ts}     +
    {ts}Go{/ts}
    {ts}Please enter your organization's name and primary address.{/ts}
    -

     {ts}Organization Name{/ts}

    +

     {ts}Organization Name{/ts}

    {/if} {if ! $fromEmailOK}
    -
    {ts}Go{/ts}     +
    {ts}Go{/ts}
    {ts}Please enter a default FROM Email Address (for system-generated emails).{/ts}
    -

     {ts}From Email Address{/ts}

    +

     {ts}From Email Address{/ts}

    {/if} {if ! $defaultMailboxOK}
    -
    {ts}Go{/ts}     +
    {ts}Go{/ts}
    {ts}Please configure a default mailbox for CiviMail.{/ts} ({ts}learn more{/ts})
    -

     {ts}Default CiviMail Mailbox{/ts}

    +

     {ts}Default CiviMail Mailbox{/ts}

    {/if} @@ -60,15 +60,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/DedupeRules.tpl b/templates/CRM/Contact/Page/DedupeRules.tpl index 79f8d84839..0217632c61 100644 --- a/templates/CRM/Contact/Page/DedupeRules.tpl +++ b/templates/CRM/Contact/Page/DedupeRules.tpl @@ -61,7 +61,7 @@ {/strip}
    -
    {ts 1=$contactType}Add Rule for %1s{/ts}     +
    {ts 1=$contactType}Add Rule for %1s{/ts}
    {/foreach} diff --git a/templates/CRM/Contact/Page/Inline/Actions.tpl b/templates/CRM/Contact/Page/Inline/Actions.tpl index a61e191636..7376c0bc70 100644 --- a/templates/CRM/Contact/Page/Inline/Actions.tpl +++ b/templates/CRM/Contact/Page/Inline/Actions.tpl @@ -26,7 +26,7 @@ {* this template is used for the dropdown menu of the "Actions" button on contacts. *}
    -
    {ts}Actions{/ts}     +
    {ts}Actions{/ts}
    @@ -37,31 +37,31 @@
    • -
      {ts}Print Summary{/ts}       +
      {ts}Print Summary{/ts}
    • -
      {ts}vCard{/ts}       +
      {ts}vCard{/ts}
      • {if !empty($dashboardURL)}
    • -
      {ts}Contact Dashboard{/ts}       +
      {ts}Contact Dashboard{/ts}
      • {/if} {if !empty($userRecordUrl)}
    • -
      {ts}User Record{/ts}       +
      {ts}User Record{/ts}
      • {/if} {if !empty($userAddUrl)}
    • -
      {ts}Create User Record{/ts}       +
      {ts}Create User Record{/ts}
      • {/if} diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl index 21183e2a6d..19151a7fdf 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} diff --git a/templates/CRM/Contact/Page/View/Relationship.tpl b/templates/CRM/Contact/Page/View/Relationship.tpl index c8b1996550..cba2e0d2dd 100644 --- a/templates/CRM/Contact/Page/View/Relationship.tpl +++ b/templates/CRM/Contact/Page/View/Relationship.tpl @@ -33,7 +33,7 @@ {if $permission EQ 'edit'}
      {ts}Add Relationship{/ts}       + class="button">
      {ts}Add Relationship{/ts}
      {/if} diff --git a/templates/CRM/Contact/Page/View/Summary.tpl b/templates/CRM/Contact/Page/View/Summary.tpl index bda3370449..b729281d2f 100644 --- a/templates/CRM/Contact/Page/View/Summary.tpl +++ b/templates/CRM/Contact/Page/View/Summary.tpl @@ -59,7 +59,7 @@
    • {assign var='editParams' value=$urlParams|cat:"&action=update&cid=$contactId"} -
      {ts}Edit{/ts}       +
      {ts}Edit{/ts}
      • {/if} @@ -101,7 +101,7 @@ {assign var='viewParams' value=$urlParams|cat:"&cid=$nextContactID"}
    • -
      {ts}Next{/ts}       +
      {ts}Next{/ts}
      • {/if} @@ -109,7 +109,7 @@ {assign var='viewParams' value=$urlParams|cat:"&cid=$prevContactID"}
    • -
      {ts}Previous{/ts}       +
      {ts}Previous{/ts}
      • {/if} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl b/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl index fdc9971599..f0a872c3d0 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/Tab.tpl @@ -28,7 +28,7 @@
    {$form.cc_id.label} {$form.cc_id.html} - +
    {$form.bcc_id.label} {$form.bcc_id.html} - +
    - {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 acb160672c..fbfc323baf 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/ContributionType.tpl b/templates/CRM/Contribute/Page/ContributionType.tpl index 4e1aa0b9fa..f5002ae7b4 100644 --- a/templates/CRM/Contribute/Page/ContributionType.tpl +++ b/templates/CRM/Contribute/Page/ContributionType.tpl @@ -71,7 +71,7 @@ {/if} {if $action ne 1 and $action ne 2}
    -
    {ts}Add Financial Type{/ts}     +
    {ts}Add Financial Type{/ts}
    {ts}Done{/ts}
    {/if} diff --git a/templates/CRM/Contribute/Page/DashBoard.tpl b/templates/CRM/Contribute/Page/DashBoard.tpl index 7b1f21b29e..9df72949da 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/ManagePremiums.tpl b/templates/CRM/Contribute/Page/ManagePremiums.tpl index 1cd96434ea..433717b2f6 100644 --- 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}
    -
    {ts}Add Premium{/ts}     +
    {ts}Add Premium{/ts}
    {/if}
    diff --git a/templates/CRM/Contribute/Page/PaymentInfo.tpl b/templates/CRM/Contribute/Page/PaymentInfo.tpl index 2334cfff54..4de0054220 100644 --- a/templates/CRM/Contribute/Page/PaymentInfo.tpl +++ b/templates/CRM/Contribute/Page/PaymentInfo.tpl @@ -75,6 +75,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 1a98bad6d1..c006ec0cfb 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/Field.tpl b/templates/CRM/Custom/Form/Field.tpl index 333b255dce..aabcdcdd31 100644 --- a/templates/CRM/Custom/Form/Field.tpl +++ b/templates/CRM/Custom/Form/Field.tpl @@ -181,7 +181,7 @@ function custom_option_html_type( ) { {$form.group_id.html}   {ts}Advanced Filter{/ts} {capture assign=searchPreferences}{crmURL p="civicrm/admin/setting/search" q="reset=1"}{/capture} -
    {ts 1=$searchPreferences}If you are planning on using this field in front-end profile, event registration or contribution forms, you should 'Limit List to Group' or configure an 'Advanced Filter' (so that you do not unintentionally expose your entire set of contacts). Users must have either 'access contact reference fields' OR 'access CiviCRM' permission in order to use contact reference autocomplete fields. You can assign 'access contact reference fields' to the anonymous role if you want un-authenticated visitors to use this field. Use Search Preferences - Contact Reference Options to control the fields included in the search results.{/ts} +
    {ts 1=$searchPreferences}If you are planning on using this field in front-end profile, event registration or contribution forms, you should 'Limit List to Group' or configure an 'Advanced Filter' (so that you do not unintentionally expose your entire set of contacts). Users must have either 'access contact reference fields' OR 'access CiviCRM' permission in order to use contact reference autocomplete fields. You can assign 'access contact reference fields' to the anonymous role if you want un-authenticated visitors to use this field. Use Search Preferences - Contact Reference Options to control the fields included in the search results.{/ts} diff --git a/templates/CRM/Custom/Page/CustomDataView.tpl b/templates/CRM/Custom/Page/CustomDataView.tpl index d118962866..68eb1df237 100644 --- a/templates/CRM/Custom/Page/CustomDataView.tpl +++ b/templates/CRM/Custom/Page/CustomDataView.tpl @@ -37,7 +37,7 @@
    {ts 1=$cd_edit.title}Edit %1{/ts}

    + class="icon ui-icon-pencil">
    {ts 1=$cd_edit.title}Edit %1{/ts}

    {/if} diff --git a/templates/CRM/Custom/Page/Field.tpl b/templates/CRM/Custom/Page/Field.tpl index eb11ac23b5..c19f3cb072 100644 --- a/templates/CRM/Custom/Page/Field.tpl +++ b/templates/CRM/Custom/Page/Field.tpl @@ -77,7 +77,7 @@ {/if} {/if}
    -
    {ts}Add Custom Field{/ts}     +
    {ts}Add Custom Field{/ts}
    {ts}Done{/ts}
    {/if} diff --git a/templates/CRM/Custom/Page/Group.tpl b/templates/CRM/Custom/Page/Group.tpl index db9d7fd604..856fce896e 100644 --- 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) }
    -
    {ts}Add Set of Custom Fields{/ts}     +
    {ts}Add Set of Custom Fields{/ts}
    {/if} diff --git a/templates/CRM/Custom/Page/Option.tpl b/templates/CRM/Custom/Page/Option.tpl index 787a7f3755..301c38d537 100644 --- a/templates/CRM/Custom/Page/Option.tpl +++ b/templates/CRM/Custom/Page/Option.tpl @@ -62,7 +62,7 @@ {/strip}
    -
    {ts}Add Option{/ts}     +
    {ts}Add Option{/ts}
    {ts}Done{/ts}
    diff --git a/templates/CRM/Event/Form/EventFees.tpl b/templates/CRM/Event/Form/EventFees.tpl index 84323969a0..4a40a9fea6 100644 --- a/templates/CRM/Event/Form/EventFees.tpl +++ b/templates/CRM/Event/Form/EventFees.tpl @@ -41,7 +41,7 @@ -
    {ts}Change Selections{/ts}     +
    {ts}Change Selections{/ts}     {else} diff --git a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl index 68a4a40213..3d7a6b40e6 100644 --- a/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl +++ b/templates/CRM/Event/Form/ManageEvent/ConfirmRepeatMode.tpl @@ -46,7 +46,7 @@
    {ts}Change applies to all the entities in the series.{/ts}
    -
    Changes to date or time will NOT be applied to other entities in the series.
    +
    Changes to date or time will NOT be applied to other entities in the series.
    {if $hasParent || $isRepeatingEntity} {literal} diff --git a/templates/CRM/Event/Form/ManageEvent/Tab.tpl b/templates/CRM/Event/Form/ManageEvent/Tab.tpl index 55a7accce7..59420430ff 100644 --- a/templates/CRM/Event/Form/ManageEvent/Tab.tpl +++ b/templates/CRM/Event/Form/ManageEvent/Tab.tpl @@ -28,7 +28,7 @@
    -
    {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/PCP/Page/PCPInfo.tpl b/templates/CRM/PCP/Page/PCPInfo.tpl index 63dc1b7a0d..a5dd9e34e1 100644 --- a/templates/CRM/PCP/Page/PCPInfo.tpl +++ b/templates/CRM/PCP/Page/PCPInfo.tpl @@ -47,7 +47,7 @@ {/foreach} -
    +
    {ts}Tip{/ts} - {ts}You must be logged in to your account to access the editing options above. (If you visit this page without logging in, you will be viewing the page in "live" mode - as your visitors and friends see it.){/ts}
    {/if} diff --git a/templates/CRM/Pledge/Page/Tab.tpl b/templates/CRM/Pledge/Page/Tab.tpl index 65159f8fb8..52a43548af 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/Price/Page/Field.tpl b/templates/CRM/Price/Page/Field.tpl index 11a97de176..caea3f9060 100644 --- a/templates/CRM/Price/Page/Field.tpl +++ b/templates/CRM/Price/Page/Field.tpl @@ -45,9 +45,9 @@ {if $action NEQ 8 and $priceField}
    {if !$isReserved} -
    {ts}Add Price Field{/ts}     +
    {ts}Add Price Field{/ts}     {/if} -
    {ts}Preview (all fields){/ts}     +
    {ts}Preview (all fields){/ts}
    {strip} @@ -96,9 +96,9 @@
    {if !$isReserved} -
    {ts}Add Price Field{/ts}     +
    {ts}Add Price Field{/ts}     {/if} -
    {ts}Preview (all fields){/ts}     +
    {ts}Preview (all fields){/ts}
    {else} @@ -108,7 +108,7 @@ {ts}None found.{/ts}
    -
    {ts}Add Price Field{/ts}     +
    {ts}Add Price Field{/ts}
    {/if} {/if} diff --git a/templates/CRM/Price/Page/Option.tpl b/templates/CRM/Price/Page/Option.tpl index 465caa2835..1f4c8273eb 100644 --- a/templates/CRM/Price/Page/Option.tpl +++ b/templates/CRM/Price/Page/Option.tpl @@ -99,7 +99,7 @@ {/if} {if $addMoreFields && !$isReserved}
    -
    {ts 1=$fieldTitle}New Option for '%1'{/ts}     +
    {ts 1=$fieldTitle}New Option for '%1'{/ts}
    {ts}Done{/ts}
    {/if} diff --git a/templates/CRM/Price/Page/Set.tpl b/templates/CRM/Price/Page/Set.tpl index d6539b3130..550b1e25e2 100644 --- 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) }
    -
    {ts}Add Set of Price Fields{/ts}     +
    {ts}Add Set of Price Fields{/ts}
    {/if} diff --git a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl index a9ca4c6b92..72aaa9e1b2 100644 --- a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl +++ b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl @@ -79,10 +79,10 @@ {if !$reachedMax} {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} {/if} {/if} diff --git a/templates/CRM/Report/Page/InstanceList.tpl b/templates/CRM/Report/Page/InstanceList.tpl index ee72094721..3730c31b54 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/SMS/Page/Provider.tpl b/templates/CRM/SMS/Page/Provider.tpl index 84bcc587b6..fffb2c2598 100644 --- a/templates/CRM/SMS/Page/Provider.tpl +++ b/templates/CRM/SMS/Page/Provider.tpl @@ -68,6 +68,6 @@ {/if}
    -
    {ts}Add SMS Provider{/ts}     +
    {ts}Add SMS Provider{/ts}
    {/if} diff --git a/templates/CRM/UF/Page/Field.tpl b/templates/CRM/UF/Page/Field.tpl index 6bdddfde92..85876281fc 100644 --- a/templates/CRM/UF/Page/Field.tpl +++ b/templates/CRM/UF/Page/Field.tpl @@ -37,7 +37,7 @@
    {if not ($action eq 2 or $action eq 1)}
    -
    {ts}Add Field{/ts}    {if !$isGroupReserved}
    {ts}Edit Settings{/ts}    {/if}
    {ts}Preview (all fields){/ts}    {if !$skipCreate }
    {ts}Use (create mode){/ts}    {/if} +
    {ts}Add Field{/ts}    {if !$isGroupReserved}
    {ts}Edit Settings{/ts}    {/if}
    {ts}Preview (all fields){/ts}    {if !$skipCreate }
    {ts}Use (create mode){/ts}    {/if}
    {/if} @@ -79,7 +79,7 @@ {/strip} {if not ($action eq 2 or $action eq 1)}
    -
    {ts}Add Field{/ts}    {if !$isGroupReserved}
    {ts}Edit Settings{/ts}    {/if}
    {ts}Preview (all fields){/ts}    {if !$skipCreate }
    {ts}Use (create mode){/ts}    {/if} +
    {ts}Add Field{/ts}    {if !$isGroupReserved}
    {ts}Edit Settings{/ts}    {/if}
    {ts}Preview (all fields){/ts}    {if !$skipCreate }
    {ts}Use (create mode){/ts}    {/if}
    {/if} @@ -93,7 +93,7 @@ {ts}None found.{/ts}
    -
    {ts}Add Field{/ts}     +
    {ts}Add Field{/ts}
    {/if} {/if} diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl index f1b79d1541..dc35c0a609 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}
    diff --git a/templates/CRM/UF/Page/ProfileTemplates.tpl b/templates/CRM/UF/Page/ProfileTemplates.tpl index d08eceb83a..f762e82dff 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} @@ -114,7 +114,7 @@