From: eileen Date: Mon, 13 May 2013 02:25:45 +0000 (+1200) Subject: CRM-12595 fix formatting in templates files (A) X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=edc51caa629e7446abba72ccb6dab25589849fef;p=civicrm-core.git CRM-12595 fix formatting in templates files (A) --- diff --git a/templates/CRM/ACL/Form/ACL.tpl b/templates/CRM/ACL/Form/ACL.tpl index 521f58af94..2cdd7a352b 100644 --- a/templates/CRM/ACL/Form/ACL.tpl +++ b/templates/CRM/ACL/Form/ACL.tpl @@ -104,7 +104,7 @@ -
{ts}NOTE: For Event ACLs, the 'View' operation allows access to the event information screen. "Edit" allows users to register for the event if online registration is enabled.{/ts}
+
{ts}NOTE: For Event ACLs, the 'View' operation allows access to the event information screen. "Edit" allows users to register for the event if online registration is enabled.{/ts}
{if $config->userSystem->is_drupal EQ '1'} {ts}Please remember that Drupal's "register for events" permission overrides CiviCRM's control over event information access.{/ts} {/if} diff --git a/templates/CRM/ACL/Form/ACLBasic.tpl b/templates/CRM/ACL/Form/ACLBasic.tpl index 36e5e472af..16837a8aab 100644 --- a/templates/CRM/ACL/Form/ACLBasic.tpl +++ b/templates/CRM/ACL/Form/ACLBasic.tpl @@ -31,7 +31,7 @@
-
+
{ts}WARNING: Delete will remove this permission from the specified ACL Role.{/ts} {ts}Do you want to continue?{/ts}
@@ -52,9 +52,9 @@ {/if} -
+
{$form.buttons.html}
-
+
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl index 3264fcdfda..2b62c4b131 100644 --- a/templates/CRM/Activity/Form/Activity.tpl +++ b/templates/CRM/Activity/Form/Activity.tpl @@ -102,7 +102,7 @@

{$activityTypeName}

{if $activityTypeDescription }
{$activityTypeDescription}
- {/if} + {/if} {else} {if $context eq 'standalone' or $context eq 'search' or $context eq 'smog'} diff --git a/templates/CRM/Activity/Form/Task.tpl b/templates/CRM/Activity/Form/Task.tpl index 9825f71cf5..7f533522c1 100755 --- a/templates/CRM/Activity/Form/Task.tpl +++ b/templates/CRM/Activity/Form/Task.tpl @@ -25,7 +25,7 @@ *} {ts 1=$totalSelectedActivities}Number of selected Activities: %1{/ts} -{if $rows } +{if $rows }
diff --git a/templates/CRM/Activity/Form/Task/FileOnCase.tpl b/templates/CRM/Activity/Form/Task/FileOnCase.tpl index 572c8a93c4..a4e91fccc7 100644 --- a/templates/CRM/Activity/Form/Task/FileOnCase.tpl +++ b/templates/CRM/Activity/Form/Task/FileOnCase.tpl @@ -47,9 +47,9 @@ var unclosedCaseUrl = {/literal}"{crmURL p='civicrm/case/ajax/unclosed' h=0}"{literal}; cj( "#unclosed_cases" ).autocomplete( unclosedCaseUrl, { width : 250, selectFirst : false, matchContains:true - }).result( function(event, data, formatted) { + }).result( function(event, data, formatted) { cj( "#unclosed_case_id" ).val( data[1] ); - }).bind( 'click', function( ) { + }).bind( 'click', function( ) { cj( "#unclosed_case_id" ).val(''); }); {/literal} diff --git a/templates/CRM/Activity/Form/Task/Print.tpl b/templates/CRM/Activity/Form/Task/Print.tpl index 26666f97f2..3b60f225eb 100644 --- a/templates/CRM/Activity/Form/Task/Print.tpl +++ b/templates/CRM/Activity/Form/Task/Print.tpl @@ -25,7 +25,7 @@ *}

-{if $rows } +{if $rows }

{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Activity/Import/Form/MapField.tpl b/templates/CRM/Activity/Import/Form/MapField.tpl index 9e6a56d766..9c6adad7c7 100644 --- a/templates/CRM/Activity/Import/Form/MapField.tpl +++ b/templates/CRM/Activity/Import/Form/MapField.tpl @@ -32,7 +32,7 @@

{ts}Review the values shown below from the first 2 rows of your import file and select the matching CiviCRM database fields from the drop-down lists in the right-hand column. Select '- do not import -' for any columns in the import file that you want ignored.{/ts}

- {if $savedMapping} + {if $savedMapping}

{ts}Click 'Load Saved Field Mapping' if data has been previously imported from the same source. You can then select the saved import mapping setup and load it automatically.{/ts}

{/if}

{ts}If you think you may be importing additional data from the same data source, check 'Save this field mapping' at the bottom of the page before continuing. The saved mapping can then be easily reused the next time data is imported.{/ts}

@@ -49,7 +49,7 @@ if ( document.getElementsByName("saveMapping")[0].checked ) { document.getElementsByName("updateMapping")[0].checked = true; document.getElementsByName("saveMapping")[0].checked = false; -} +} {/literal}
\ No newline at end of file diff --git a/templates/CRM/Activity/Import/Form/Preview.tpl b/templates/CRM/Activity/Import/Form/Preview.tpl index b73f3dfa44..de13cf8b4e 100644 --- a/templates/CRM/Activity/Import/Form/Preview.tpl +++ b/templates/CRM/Activity/Import/Form/Preview.tpl @@ -29,47 +29,47 @@ {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *} {include file="CRM/common/WizardHeader.tpl"} - +

- {ts}The information below previews the results of importing your data in CiviCRM. Review the totals to ensure that they represent your expected results.{/ts} + {ts}The information below previews the results of importing your data in CiviCRM. Review the totals to ensure that they represent your expected results.{/ts}

- - {if $invalidRowCount} + + {if $invalidRowCount}

{ts 1=$invalidRowCount 2=$downloadErrorRecordsUrl}CiviCRM has detected invalid data or formatting errors in %1 records. If you continue, these records will be skipped. OR, you can download a file with just these problem records - Download Errors. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts}

{/if} - {if $conflictRowCount} + {if $conflictRowCount}

{ts 1=$conflictRowCount 2=$downloadConflictRecordsUrl}CiviCRM has detected %1 records with conflicting transaction ids within this data file. If you continue, these records will be skipped. OR, you can download a file with just these problem records - Download Conflicts. Then correct them in the original import file, cancel this import and begin again at step 1.{/ts}

{/if} - +

{ts}Click 'Import Now' if you are ready to proceed.{/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
+
{include file="CRM/common/formButtons.tpl" location="top"}
{* Summary Preview (record counts) *}
- - {if $invalidRowCount} + + {if $invalidRowCount} {/if} - - {if $conflictRowCount} + + {if $conflictRowCount}
{ts}Total Rows{/ts} {$totalRowCount} {ts}Total rows (activity records) in uploaded file.{/ts}
{ts}Rows with Errors{/ts} {$invalidRowCount} {ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts} - {if $invalidRowCount} + {if $invalidRowCount}
» {ts}Download Errors{/ts}
{/if}
{ts}Conflicting Rows{/ts} {$conflictRowCount} {ts}Rows with conflicting transaction ids within this file. These rows will be skipped (not imported).{/ts} @@ -85,11 +85,11 @@ {ts}Total rows to be imported.{/ts}
-
+
{* Table for mapping preview *} {include file="CRM/Activity/Import/Form/MapTable.tpl}
- +
{include file="CRM/common/formButtons.tpl" location="bottom"}
\ No newline at end of file diff --git a/templates/CRM/Activity/Import/Form/Summary.tpl b/templates/CRM/Activity/Import/Form/Summary.tpl index 5b85dd1d8d..aa0e19976d 100644 --- a/templates/CRM/Activity/Import/Form/Summary.tpl +++ b/templates/CRM/Activity/Import/Form/Summary.tpl @@ -29,12 +29,12 @@ {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *} {include file="CRM/common/WizardHeader.tpl"} - +

{ts}Import has completed successfully. The information below summarizes the results.{/ts}

- + {if $unMatchCount }

{ts count=$unMatchCount plural='CiviCRM has detected mismatched activity IDs. These records have not been Updated.'}CiviCRM has detected mismatched activity ID. This record have not been updated.{/ts} @@ -42,8 +42,8 @@

{ts 1=$downloadMismatchRecordsUrl}You can Download Mismatched Activity records. You may then correct them, and import the new file with the corrected data.{/ts}

- {/if} - + {/if} + {if $invalidRowCount }

{ts count=$invalidRowCount plural='CiviCRM has detected invalid data and/or formatting errors in %count records. These records have not been imported.'}CiviCRM has detected invalid data and/or formatting errors in one record. This record have not been imported.{/ts} @@ -71,7 +71,7 @@

{/if}
-
{include file="CRM/common/formButtons.tpl" location="top"}
+
{include file="CRM/common/formButtons.tpl" location="top"}
{* Summary of Import Results (record counts) *} @@ -89,7 +89,7 @@ {/if} - + {if $unMatchCount } @@ -100,7 +100,7 @@ {/if} - + {if $conflictRowCount} @@ -122,13 +122,13 @@ {/if} - +
{ts}Total Rows{/ts}
{ts}Mismatched Rows (skipped){/ts} {$unMatchCount}
{ts}Conflicting Rows (skipped){/ts} {$conflictRowCount}
{ts}Records Imported{/ts} {$validRowCount} {ts}Rows imported successfully.{/ts}
- +
{include file="CRM/common/formButtons.tpl" location="bottom"}
\ No newline at end of file diff --git a/templates/CRM/Activity/Import/Form/UploadFile.tpl b/templates/CRM/Activity/Import/Form/UploadFile.tpl index f9ca68a121..f5762f4366 100644 --- a/templates/CRM/Activity/Import/Form/UploadFile.tpl +++ b/templates/CRM/Activity/Import/Form/UploadFile.tpl @@ -29,13 +29,13 @@ {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *} {include file="CRM/common/WizardHeader.tpl"} - +

{ts}The Activity Import Wizard allows you to easily upload activity from other applications into CiviCRM. Contacts must already exist in your CiviCRM database prior to importing activity.{/ts} {help id="id-upload"}

-
+
{include file="CRM/common/formButtons.tpl" location="top"}

{ts}Upload Data File{/ts}

@@ -46,7 +46,7 @@ {ts}File format must be comma-separated-values (CSV).{/ts}
{ts 1=$uploadSize}Maximum Upload File Size: %1 MB{/ts} - + {$form.skipColumnHeader.html}{$form.skipColumnHeader.label}
{ts}Check this box if the first row of your file consists of field names (Example: 'Contact ID', 'Activity Type', 'Activity Date').{/ts} diff --git a/templates/CRM/Admin/Form/CMSUser.tpl b/templates/CRM/Admin/Form/CMSUser.tpl index a7b5211838..eb252e6fe6 100644 --- a/templates/CRM/Admin/Form/CMSUser.tpl +++ b/templates/CRM/Admin/Form/CMSUser.tpl @@ -28,11 +28,11 @@

{ts 1=$config->userFramework}Synchronize %1 Users{/ts}

-
{include file="CRM/common/formButtons.tpl" location="top"}
+
{include file="CRM/common/formButtons.tpl" location="top"}
{ts}status{/ts} {ts}Synchronize Users to Contacts:{/ts} {ts}CiviCRM will check each user record for a contact record. A new contact record will be created for each user where one does not already exist.{/ts} {ts}Do you want to continue?{/ts}
{include file="CRM/common/formButtons.tpl" location="bottom"}
- + diff --git a/templates/CRM/Admin/Form/ContactType.tpl b/templates/CRM/Admin/Form/ContactType.tpl index 935c840724..ffe0ff1591 100644 --- a/templates/CRM/Admin/Form/ContactType.tpl +++ b/templates/CRM/Admin/Form/ContactType.tpl @@ -41,7 +41,7 @@ {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='label' id= $cid } {/if} - + {$form.label.html} @@ -55,14 +55,14 @@ {$form.image_URL.label} {$form.image_URL.html|crmAddClass:'huge40'}{help id="id-image_URL"} - + {$form.description.label} {if $action eq 2} {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='description' id= $cid} {/if} - + {$form.description.html} diff --git a/templates/CRM/Admin/Form/DomainDump.tpl b/templates/CRM/Admin/Form/DomainDump.tpl index 7c53dee081..a9323501c6 100644 --- a/templates/CRM/Admin/Form/DomainDump.tpl +++ b/templates/CRM/Admin/Form/DomainDump.tpl @@ -28,18 +28,18 @@

{ts}Backup Database{/ts}

- +
{ts}status{/ts}
-
+
{ts}Backup Your Data:{/ts} {ts}CiviCRM will create an SQL dump file with all of your existing data, and allow you to download it to your local computer. This process may take a long time and generate a very large file if you have a large number of records.{/ts} {ts}Do you want to continue?{/ts}
-
+
{$form.buttons.html}
- + diff --git a/templates/CRM/Admin/Form/Extensions.tpl b/templates/CRM/Admin/Form/Extensions.tpl index cf4909a5fa..9febbe0f63 100644 --- a/templates/CRM/Admin/Form/Extensions.tpl +++ b/templates/CRM/Admin/Form/Extensions.tpl @@ -47,5 +47,5 @@ {if $action eq 8 or $action eq 1 or $action eq 2} {include file="CRM/Admin/Page/ExtensionDetails.tpl"} {/if} -
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Admin/Form/Mapping.tpl b/templates/CRM/Admin/Form/Mapping.tpl index b86300f5dc..cbaea39a08 100644 --- a/templates/CRM/Admin/Form/Mapping.tpl +++ b/templates/CRM/Admin/Form/Mapping.tpl @@ -27,7 +27,7 @@

{if $action eq 1}{ts}New Tag{/ts}{elseif $action eq 2}{ts}Edit Mapping{/ts}{else}{ts}Delete Mapping{/ts}{/if}

{if $action eq 1 or $action eq 2 } -
{include file="CRM/common/formButtons.tpl" location="top"}
+
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Admin/Form/Navigation.hlp b/templates/CRM/Admin/Form/Navigation.hlp index 7409b20f59..3433b3e48b 100644 --- a/templates/CRM/Admin/Form/Navigation.hlp +++ b/templates/CRM/Admin/Form/Navigation.hlp @@ -27,7 +27,7 @@ {ts}Destination{/ts} {/htxt} {htxt id="id-menu_url"} -{ts}Enter the destination URL. Generally you should use relative URLs for CiviCRM pages (e.g. links to profiles). Use complete URLs for external pages. Leave this field empty if you are creating a menu section that does not have a clickable destination.{/ts} +{ts}Enter the destination URL. Generally you should use relative URLs for CiviCRM pages (e.g. links to profiles). Use complete URLs for external pages. Leave this field empty if you are creating a menu section that does not have a clickable destination.{/ts} {/htxt} {htxt id="id-parent-title"} diff --git a/templates/CRM/Admin/Form/Navigation.tpl b/templates/CRM/Admin/Form/Navigation.tpl index 509a1a0d01..801400c4df 100644 --- a/templates/CRM/Admin/Form/Navigation.tpl +++ b/templates/CRM/Admin/Form/Navigation.tpl @@ -51,7 +51,7 @@ -
{$form.name.label}
{$form.is_active.label}{$form.is_active.html}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
\ No newline at end of file diff --git a/templates/CRM/Admin/Form/OptionValue.tpl b/templates/CRM/Admin/Form/OptionValue.tpl index e128088dfa..1140fbfec6 100644 --- a/templates/CRM/Admin/Form/OptionValue.tpl +++ b/templates/CRM/Admin/Form/OptionValue.tpl @@ -32,13 +32,13 @@ {ts}WARNING: Deleting this option value will result in the loss of all records which use the option value.{/ts} {ts}This may mean the loss of a substantial amount of data, and the action cannot be undone.{/ts} {ts}Do you want to continue?{/ts} {else} -
{include file="CRM/common/formButtons.tpl" location="top"}
+
{include file="CRM/common/formButtons.tpl" location="top"}
- - + - - + + @@ -58,12 +58,12 @@ - {if $form.financial_account_id} + {if $form.financial_account_id} - {/if} + {/if} @@ -91,8 +91,8 @@ - {/if} -
{$form.label.label} + {$form.label.label} {if $action == 2}{include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_option_value' field='label' id=$id}{/if} {$form.label.html}
{$form.value.label} {$form.value.html}
@@ -49,8 +49,8 @@ {ts}The same option value is stored for all languages. Changing this value will change it for all languages.{/ts} {/if}
{$form.name.label} {$form.name.html}
{$form.grouping.label} {$form.grouping.html}
{$form.financial_account_id.label} {$form.financial_account_id.html}
{$form.description.label} {$form.description.html}{$form.contactOptions.label} {$form.contactOptions.html}
+ {/if} + {/if} -
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Admin/Form/Options.tpl b/templates/CRM/Admin/Form/Options.tpl index 1b60123b61..51205a306c 100644 --- a/templates/CRM/Admin/Form/Options.tpl +++ b/templates/CRM/Admin/Form/Options.tpl @@ -62,12 +62,12 @@ {ts}The option label is displayed to users.{/ts} - {if $form.financial_account_id.html} + {if $form.financial_account_id.html} {$form.financial_account_id.label} {$form.financial_account_id.html} - {/if} + {/if} {/if} {if $gName eq 'case_status'} diff --git a/templates/CRM/Admin/Form/PaymentProcessor.tpl b/templates/CRM/Admin/Form/PaymentProcessor.tpl index 1fe5fcacb9..ea682dfac8 100644 --- a/templates/CRM/Admin/Form/PaymentProcessor.tpl +++ b/templates/CRM/Admin/Form/PaymentProcessor.tpl @@ -29,8 +29,8 @@
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8} -
-
+
+
{ts}WARNING: Deleting this Payment Processor may result in some transaction pages being rendered inactive.{/ts} {ts}Do you want to continue?{/ts}
{else} @@ -44,15 +44,15 @@ {$form.description.label}{$form.description.html} - + {$form.financial_account_id.label} - {if $financialAccount} - {$form.financial_account_id.html} - {else} - {capture assign=ftUrl}{crmURL p='civicrm/admin/financial/financialAccount' q="reset=1"}{/capture} - {ts 1=$ftUrl}There are no financial accounts configured with Financial Account Type 'Asset' Type. Click here if you want to configure financial accounts for your site.{/ts} + {if $financialAccount} + {$form.financial_account_id.html} + {else} + {capture assign=ftUrl}{crmURL p='civicrm/admin/financial/financialAccount' q="reset=1"}{/capture} + {ts 1=$ftUrl}There are no financial accounts configured with Financial Account Type 'Asset' Type. Click here if you want to configure financial accounts for your site.{/ts} {/if} @@ -102,12 +102,12 @@ {$form.url_button.label}{$form.url_button.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-live-url-button' title=$form.url_button.label} {/if} - +
{ts}Processor Details for Test Payments{/ts} - +
{if $form.test_password} @@ -142,8 +142,8 @@ -{/if} -{/if} +{/if} +{/if}
{$form.test_user_name.label}{$form.test_user_name.html} {help id=$ppTypeName|cat:'-test-user-name' title=$form.test_user_name.label}
{$form.test_url_button.label}{$form.test_url_button.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-test-url-button' title=$form.test_url_button.label}
{include file="CRM/common/formButtons.tpl" location="bottom"}
@@ -157,7 +157,7 @@ var url = {/literal}"{$refreshURL}"{literal} var post = url + "&pp=" + paymentProcessorType.value; if( refresh ) { - window.location= post; + window.location= post; } } {/literal} diff --git a/templates/CRM/Admin/Form/PaymentProcessorType.tpl b/templates/CRM/Admin/Form/PaymentProcessorType.tpl index ce171f2b74..f5ce1c897f 100644 --- a/templates/CRM/Admin/Form/PaymentProcessorType.tpl +++ b/templates/CRM/Admin/Form/PaymentProcessorType.tpl @@ -33,7 +33,7 @@ {ts}Do you want to continue?{/ts}
{else} - + @@ -115,5 +115,5 @@
{$form.title.label}
{/if} -
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Admin/Form/PdfFormats.tpl b/templates/CRM/Admin/Form/PdfFormats.tpl index e5d30160b5..4eadfa2f94 100644 --- a/templates/CRM/Admin/Form/PdfFormats.tpl +++ b/templates/CRM/Admin/Form/PdfFormats.tpl @@ -29,8 +29,8 @@
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8} -
-
+
+
{ts 1=$formatName}WARNING: You are about to delete the PDF Page Format titled %1.{/ts}

{ts}This will remove the format from all Message Templates that use it. Do you want to continue?{/ts}

{else} @@ -60,13 +60,13 @@ {$form.margin_left.label}{$form.margin_left.html} {$form.margin_right.label}{$form.margin_right.html} - + {$form.weight.label}{$form.weight.html}
{ts}Weight controls the order in which PDF Page Formats are displayed
in selection lists. Enter a positive or negative integer. Lower numbers
are displayed ahead of higher numbers.{/ts} -{/if} +{/if}
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Admin/Form/Persistent.tpl b/templates/CRM/Admin/Form/Persistent.tpl index e61ccd9b3b..90b6200192 100644 --- a/templates/CRM/Admin/Form/Persistent.tpl +++ b/templates/CRM/Admin/Form/Persistent.tpl @@ -1,20 +1,20 @@ -
-DB Template Strings Information -
-
{include file="CRM/common/formButtons.tpl" location="top"}
- - - - - - - - - - -
{$form.context.label}{$form.context.html|crmAddClass:huge} -
{$form.name.label}{$form.name.html|crmAddClass:huge} -
{$form.data.label}{$form.data.html} -
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
-
+
+DB Template Strings Information +
+
{include file="CRM/common/formButtons.tpl" location="top"}
+ + + + + + + + + + +
{$form.context.label}{$form.context.html|crmAddClass:huge} +
{$form.name.label}{$form.name.html|crmAddClass:huge} +
{$form.data.label}{$form.data.html} +
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
diff --git a/templates/CRM/Admin/Form/PreferencesDate.tpl b/templates/CRM/Admin/Form/PreferencesDate.tpl index b87488ad8c..a5f618484c 100644 --- a/templates/CRM/Admin/Form/PreferencesDate.tpl +++ b/templates/CRM/Admin/Form/PreferencesDate.tpl @@ -34,18 +34,18 @@ {$form.description.label}{$form.description.html} - + {$form.date_format.label}{$form.date_format.html} {if $form.time_format.label} - + {$form.time_format.label}{$form.time_format.html} {/if} - + {$form.start.label}{$form.start.html} - + {$form.end.label}{$form.end.html} diff --git a/templates/CRM/Admin/Form/ScheduleReminders.tpl b/templates/CRM/Admin/Form/ScheduleReminders.tpl index 349af4a1ac..98afa75de9 100644 --- a/templates/CRM/Admin/Form/ScheduleReminders.tpl +++ b/templates/CRM/Admin/Form/ScheduleReminders.tpl @@ -98,11 +98,11 @@ - + +
{$form.repetition_frequency_interval.label}   {$form.repetition_frequency_interval.html}{$form.repetition_frequency_unit.html}{$form.repetition_frequency_unit.html}
{$form.end_frequency_interval.label}   {$form.end_frequency_interval.html} - {$form.end_frequency_unit.html}   {$form.end_action.html}   {$form.end_date.html}{$form.end_frequency_unit.html}   {$form.end_action.html}   {$form.end_date.html}
diff --git a/templates/CRM/Admin/Form/Setting/Debugging.hlp b/templates/CRM/Admin/Form/Setting/Debugging.hlp index ab016000e9..08f9d008d5 100644 --- a/templates/CRM/Admin/Form/Setting/Debugging.hlp +++ b/templates/CRM/Admin/Form/Setting/Debugging.hlp @@ -32,7 +32,7 @@
  • {ts}Smarty Debug Window{/ts} - {ts}Loads all variables available to the current page template into a pop-up window. To trigger, add &smartyDebug=1 to any CiviCRM URL query string. Make sure you have pop-up blocking disabled in your browser for the CiviCRM site URL.{/ts}
  • {ts}Session Reset{/ts} - {ts 1='&sessionReset=2'}Resets all values in your client session. To trigger, add %1{/ts}
    • -
  • {ts}Directory Cleanup{/ts} -{ts}Empties template cache and/or temporary upload file folders.{/ts} +
  • {ts}Directory Cleanup{/ts} -{ts}Empties template cache and/or temporary upload file folders.{/ts}
    • {ts 1='&directoryCleanup=1'}To empty template cache (civicrm/templates_c folder), add %1{/ts}
    • {ts 1='&directoryCleanup=2'}To remove temporary upload files (civicrm/upload folder), add %1{/ts}
      • diff --git a/templates/CRM/Admin/Form/Setting/Event.tpl b/templates/CRM/Admin/Form/Setting/Event.tpl index 25b4d174fd..1f2705b12a 100644 --- a/templates/CRM/Admin/Form/Setting/Event.tpl +++ b/templates/CRM/Admin/Form/Setting/Event.tpl @@ -29,13 +29,13 @@ {ts 1=$docLink}These settings are used to configure properties for the CiviEvent component. Please read the %1 documentation, and make sure you understand it before modifying default values.{/ts}
{include file="CRM/common/formButtons.tpl" location="top"}
+
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.enable_cart.label}{$form.enable_cart.html}
{ts}Check to enable the Event Cart checkout workflow.{/ts}
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Admin/Form/Setting/Localization.tpl b/templates/CRM/Admin/Form/Setting/Localization.tpl index 5d19b3fb78..99c204760f 100644 --- a/templates/CRM/Admin/Form/Setting/Localization.tpl +++ b/templates/CRM/Admin/Form/Setting/Localization.tpl @@ -25,7 +25,7 @@ *}
{include file="CRM/common/formButtons.tpl" location="top"}
-

{ts}Language and Currency{/ts}

+

{ts}Language and Currency{/ts}

@@ -33,7 +33,7 @@ {ts}Default language used for this installation.{/ts} {if $form.languageLimit} - + @@ -99,7 +99,7 @@ - + @@ -115,7 +115,7 @@ {ts}State/province listings are populated dynamically based on the selected Country for all standard contact address editing forms, as well as for Profile forms which include both a Country and a State/Province field. This setting controls which countries' states and/or provinces are available in the State / Province selection field for Custom Fields or for Profile forms which do NOT include a Country field.{/ts}
{$form.lcMessages.label}
{$form.languageLimit.label} {$form.languageLimit.html}
{ts}Languages available to users of this installation.{/ts}		{$form.defaultContactCountry.html}
{ts}This value is selected by default when adding a new contact address.{/ts}
{$form.defaultContactStateProvince.label} {$form.defaultContactStateProvince.html}
{ts}This value is selected by default when adding a new contact address.{/ts}
-

{ts}Multiple Languages Support{/ts}

+

{ts}Multiple Languages Support{/ts}

{if $form.languageLimit} @@ -124,7 +124,7 @@ - @@ -138,7 +138,7 @@ + {$warning} {/if}
{$form.makeSinglelingual.label}{$form.makeSinglelingual.html}
+ 		{$form.makeSinglelingual.html}
{ts}Check this box and click 'Save' to switch this installation from multi- to single-language.{/ts}

{$warning}
{ts}In order to use this functionality, the installation's database user must have privileges to create triggers (in MySQL 5.0 – and in MySQL 5.1 if binary logging is enabled – this means the SUPER privilege). This install either does not seem to have the required privilege enabled.{/ts} {ts}(Multilingual support currenly cannot be enabled on installations with enabled logging.){/ts}

- {$warning}
diff --git a/templates/CRM/Admin/Form/Setting/Path.tpl b/templates/CRM/Admin/Form/Setting/Path.tpl index b1a1250600..c1541ce8ad 100644 --- a/templates/CRM/Admin/Form/Setting/Path.tpl +++ b/templates/CRM/Admin/Form/Setting/Path.tpl @@ -39,32 +39,32 @@ {$form.imageUploadDir.label} {$form.imageUploadDir.html|crmAddClass:'huge40'}
{ts}File system path where image files are uploaded. Currently, this path is used for images associated with premiums (CiviContribute thank-you gifts).{/ts} - + - + {$form.customFileUploadDir.label} {$form.customFileUploadDir.html|crmAddClass:'huge40'}
{ts}Path where documents and images which are attachments to contact records are stored (e.g. contact photos, resumes, contracts, etc.). These attachments are defined using 'file' type custom fields.{/ts} - + {$form.customTemplateDir.label} {$form.customTemplateDir.html|crmAddClass:'huge40'}
{ts}Path where site specific templates are stored if any. This directory is searched first if set. Custom JavaScript code can be added to templates by creating files named templateFile.extra.tpl.{/ts} {docURL page="developer/techniques/templates"}
{ts}CiviCase configuration files can also be stored in this custom path.{/ts} {docURL page="user/case-management/setup"} - + {$form.customPHPPathDir.label} {$form.customPHPPathDir.html|crmAddClass:'huge40'}
{ts}Path where site specific PHP code files are stored if any. This directory is searched first if set.{/ts} - + - + {$form.extensionsDir.label} {$form.extensionsDir.html|crmAddClass:'huge40'}
{ts}Path where CiviCRM extensions are stored.{/ts} - +
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Admin/Form/Setting/Smtp.tpl b/templates/CRM/Admin/Form/Setting/Smtp.tpl index 4edb6d7374..20c4d56842 100644 --- a/templates/CRM/Admin/Form/Setting/Smtp.tpl +++ b/templates/CRM/Admin/Form/Setting/Smtp.tpl @@ -25,7 +25,7 @@ *}
- {ts}

CiviCRM offers several options to send emails. The default option should work fine on linux systems. If you are using windows, you probably need to enter settings for your SMTP/Sendmail server. You can send a test email to check your settings by clicking "Save and Send Test Email". If you're unsure of the correct values, check with your system administrator, ISP or hosting provider.

+ {ts}

CiviCRM offers several options to send emails. The default option should work fine on linux systems. If you are using windows, you probably need to enter settings for your SMTP/Sendmail server. You can send a test email to check your settings by clicking "Save and Send Test Email". If you're unsure of the correct values, check with your system administrator, ISP or hosting provider.

If you do not want users to send outbound mail from CiviCRM, select "Disable Outbound Email". NOTE: If you disable outbound email, and you are using Online Contribution pages or online Event Registration - you will need to disable automated receipts and registration confirmations.

@@ -59,13 +59,13 @@ {ts}Does your SMTP server require authentication (user name + password)?{/ts} - + {$form.smtpUsername.label} {$form.smtpUsername.html} - + {$form.smtpPassword.label} - {$form.smtpPassword.html}
+ {$form.smtpPassword.html}
{ts}If your SMTP server requires authentication, enter your Username and Password here.{/ts} @@ -76,13 +76,13 @@
{ts}Sendmail Configuration{/ts} - + - + @@ -95,13 +95,13 @@  {$form._qf_Smtp_refresh_test.html} - + {literal} {/literal} diff --git a/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl b/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl index f99a32928c..d775299fdf 100644 --- a/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl +++ b/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl @@ -29,8 +29,8 @@ {ts}Use this form if you need to reset the Base Directory Path and Base URL settings for your CiviCRM installation. These settings are stored in the database, and generally need adjusting after moving a CiviCRM installation to another location in the file system and/or to another URL.{/ts}

{ts}CiviCRM will attempt to detect the new values that should be used. These are provided below as the default values for the New Base Directory and New Base URL fields.{/ts}

- -
{$form._qf_UpdateConfigBackend_next_cleanup.html}
+ +
{$form._qf_UpdateConfigBackend_next_cleanup.html}
{$form.sendmail_path.label} {$form.sendmail_path.html}
{ts}Enter the Sendmail Path. EXAMPLE: /usr/sbin/sendmail{/ts}
{$form.sendmail_args.label} {$form.sendmail_args.html}
@@ -60,7 +60,7 @@ -{/if} +{/if}
{ts}Old Base Directory{/ts}{$form.newSiteName.html|crmAddClass:'huge'}
{ts}This is the your site name for a multisite install.{/ts}
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/Admin/Form/Setting/Url.hlp b/templates/CRM/Admin/Form/Setting/Url.hlp index 63305c48fa..e0891a486f 100644 --- a/templates/CRM/Admin/Form/Setting/Url.hlp +++ b/templates/CRM/Admin/Form/Setting/Url.hlp @@ -49,7 +49,7 @@ - + {if $config->userSystem->is_drupal EQ '1'} {if $config->userFramework EQ 'Drupal'} @@ -121,7 +121,7 @@
{capture assign=docLink}{docURL page="user/organising-your-data/overview" text="Organizing Your Data"}{/capture} {ts 1=$adminMenu 2=$docLink}The next set of tasks involve planning and have multiple steps. You may want to check out the %2 section in the User and Administrator Guide before you begin. You will not be returned to this page after completing these tasks, but you can always get back here from the Administer CiviCRM menu.{/ts} -
+
{ts}Example{/ts}
- {ts 1=http://www.example.com/}If your site's home url is %1 ... then your CiviCRM Resource URL would be:{/ts} + {ts 1=http://www.example.com/}If your site's home url is %1 ... then your CiviCRM Resource URL would be:{/ts}
{if $config->userSystem->is_drupal EQ '1'}    http://www.example.com/sites/all/modules/civicrm/ diff --git a/templates/CRM/Admin/Page/ConfigTaskList.tpl b/templates/CRM/Admin/Page/ConfigTaskList.tpl index 8985cfd2a6..bc0e8bf7ea 100644 --- a/templates/CRM/Admin/Page/ConfigTaskList.tpl +++ b/templates/CRM/Admin/Page/ConfigTaskList.tpl @@ -26,12 +26,12 @@ {capture assign="linkTitle"}{ts}Edit settings{/ts}{/capture} {capture assign="adminMenu"}{crmURL p="civicrm/admin" q="reset=1"}{/capture} {if $fromEmailId} - {assign var='fromAction' value="&action=update&id=`$fromEmailId`"} + {assign var='fromAction' value="&action=update&id=`$fromEmailId`"} {else} {assign var='fromAction' value="&action=add"} {/if} {if $payPalProId} - {assign var='defaultPPUrl' value="action=add&pp=`$payPalProId`&reset=1"} + {assign var='defaultPPUrl' value="action=add&pp=`$payPalProId`&reset=1"} {else} {assign var='defaultPPUrl' value="reset=1"} {/if} @@ -100,7 +100,7 @@
{ts}Payment Processors{/ts} {ts}Select and configure one or more payment processing services for online contributions, events and / or membership fees.{/ts}
@@ -159,11 +159,11 @@ - + - + diff --git a/templates/CRM/Admin/Page/Extensions.tpl b/templates/CRM/Admin/Page/Extensions.tpl index 6c40c454b4..1e6e38ad21 100644 --- a/templates/CRM/Admin/Page/Extensions.tpl +++ b/templates/CRM/Admin/Page/Extensions.tpl @@ -107,7 +107,7 @@ {if $selectedChild}selectedTab = "{$selectedChild}";{/if} {literal} - + //explicitly stop spinner function stopSpinner( ) { cj('li.crm-tab-button').each(function(){ cj(this).find('span').text(' ');}) @@ -128,14 +128,14 @@ cj('.crm-extensions-refresh').click(function(event){ event.stopPropagation(); CRM.alert('', '{/literal}{ts escape="js"}Refreshing...{/ts}{literal}', 'crm-msg-loading', {expires: 0}); - CRM.api('Extension', 'refresh', {}, { + CRM.api('Extension', 'refresh', {}, { 'callBack' : function(result){ if (result.is_error) { CRM.alert(result.error_message, '{/literal}{ts escape="js"}Refresh Error{/ts}{literal}', 'error'); } else { window.location.reload(); } - } + } }); return false; }); // .click diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl index d1db68227d..9b5101763e 100644 --- a/templates/CRM/Admin/Page/MessageTemplates.tpl +++ b/templates/CRM/Admin/Page/MessageTemplates.tpl @@ -26,7 +26,7 @@ {capture assign=crmURL}{crmURL p='civicrm/admin/messageTemplates/add' q="action=add&reset=1"}{/capture} {if $action eq 1 or $action eq 2 or $action eq 8} {include file="CRM/Admin/Form/MessageTemplates.tpl"} - + {elseif $action eq 4} {* View a system default workflow template *} @@ -49,7 +49,7 @@ - +

{$form.msg_text.label}

@@ -80,7 +80,7 @@ {$form.pdf_format_id.html}
- +
{$form.buttons.html}
{/if} @@ -92,7 +92,7 @@
  • {ts}User-driven Messages{/ts}
  • {ts}System Workflow Messages{/ts}
    • - + {* create two selector tabs, first being the ‘user’ one, the second being the ‘workflow’ one *} {include file="CRM/common/enableDisable.tpl"} {include file="CRM/common/jsortable.tpl"} @@ -141,7 +141,7 @@
    {/if} - + {if empty( $template_row) }
      diff --git a/templates/CRM/Admin/Page/PaymentProcessor.hlp b/templates/CRM/Admin/Page/PaymentProcessor.hlp index 22630d951e..db9d3f0189 100644 --- a/templates/CRM/Admin/Page/PaymentProcessor.hlp +++ b/templates/CRM/Admin/Page/PaymentProcessor.hlp @@ -357,16 +357,16 @@
    {ts 1='https://www.eway.com.au/gateway_cvn/xmlpayment.asp'}Use %1 unless otherwise advised by eWAY.{/ts} {/htxt} -{htxt id='Payment_Express-test-user-name'} {ts}Payment Express UserID (Development account):{/ts} +{htxt id='Payment_Express-test-user-name'} {ts}Payment Express UserID (Development account):{/ts} {ts}This is the development user name provided to you by DPS/Payment Express.{/ts} {ts 1='4111111111111111' 2='76'}The test Credit Card number is %1 - this is the only credit card number that will work on the test gateway. The test Total Amount can be any amount except one that ends in a value of .%2 (e.g. $10.%2) - all amounts ending in .%2 will return a failed response.{/ts} {/htxt} {htxt id='Payment_Express-test-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site. If you have been given a MAC key please fill in the Mac Key field, and use https://sec.paymentexpress.com/pxpay/pxpay.aspx for the Site URL. -Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt} +Otherwise use https://sec.paymentexpress.com/pxpay/pxaccess.aspx for the Site URL.{/ts} {/htxt} -{htxt id='Payment_Express-live-user-name'} {ts}Payment Express UserID (LIVE account):{/ts} +{htxt id='Payment_Express-live-user-name'} {ts}Payment Express UserID (LIVE account):{/ts} {ts}This is the live user name provided to you by DPS/Payment Express.{/ts}{/htxt} {htxt id='Payment_Express-live-url-site'} {ts}This is the URL for accessing the DPS/Payment Express payment site. diff --git a/templates/CRM/Admin/Page/Persistent.tpl b/templates/CRM/Admin/Page/Persistent.tpl index 9dc60ec6dc..2418a0fca8 100644 --- a/templates/CRM/Admin/Page/Persistent.tpl +++ b/templates/CRM/Admin/Page/Persistent.tpl @@ -1,69 +1,69 @@ -{foreach from=$rows item=template_row key=type} -{if $type eq 'configTemplates'} -
    {docURL page="user/contributions/what-is-civicontribute" text="CiviContribute"}{ts}Online fundraising and donor management, as well as offline contribution processing and tracking.{/ts}{ts}Online fundraising and donor management, as well as offline contribution processing and tracking.{/ts}
    {docURL page="user/pledges/what-is-civipledge" text="CiviPledge"}{ts}Accept and track pledges (for recurring gifts).{/ts}{ts}Accept and track pledges (for recurring gifts).{/ts}
    {docURL page="user/events/what-is-civievent" text="CiviEvent"}
    -
    - - -
    {ts}Add New String{/ts} -     -     -
    - {if !empty( $template_row) } - - - - - {if $editClass} - - {/if} - - {foreach from=$template_row item=values} - - - - - {if $editClass} - - {/if} - - {/foreach} - {/if} -
    ContextNameData
    {$values.context}{$values.name}{$values.data}{$values.action}
    -{/if} -{if $type eq 'customizeTemplates'} - - -

    Config String

    - -
    -
    - - -
    {ts}Add New Config{/ts} -     -     -
    -
    - {if !empty( $template_row) } - - - - - {if $editClass} - - {/if} - - {foreach from=$template_row item=values} - - - - - {if $editClass} - - {/if} - - {/foreach} - {/if} -
    ContextNameData
    {$values.context}{$values.name}{$values.data}{$values.action}
    -{/if} -{/foreach} +{foreach from=$rows item=template_row key=type} +{if $type eq 'configTemplates'} + +
    + + +
    {ts}Add New String{/ts} +     +     +
    + {if !empty( $template_row) } + + + + + {if $editClass} + + {/if} + + {foreach from=$template_row item=values} + + + + + {if $editClass} + + {/if} + + {/foreach} + {/if} +
    ContextNameData
    {$values.context}{$values.name}{$values.data}{$values.action}
    +{/if} +{if $type eq 'customizeTemplates'} + + +

    Config String

    + +
    +
    + + +
    {ts}Add New Config{/ts} +     +     +
    +
    + {if !empty( $template_row) } + + + + + {if $editClass} + + {/if} + + {foreach from=$template_row item=values} + + + + + {if $editClass} + + {/if} + + {/foreach} + {/if} +
    ContextNameData
    {$values.context}{$values.name}{$values.data}{$values.action}
    +{/if} +{/foreach} diff --git a/templates/CRM/Admin/Page/Setting.tpl b/templates/CRM/Admin/Page/Setting.tpl index 1e8d4948d1..b14dce89f4 100644 --- a/templates/CRM/Admin/Page/Setting.tpl +++ b/templates/CRM/Admin/Page/Setting.tpl @@ -27,7 +27,7 @@
    {ts 1=$docLink}Use the links below to configure or modify the global settings for CiviCRM for this site. Refer to the %1 for details on settings and options.{/ts}
    - +
    » {ts}Enable Components{/ts} {ts}Enable CiviContribute, CiviPledge, CiviEvent, CiviMember, CiviMail, CiviCase, CiviReport and/or CiviGrant components.{/ts}