From 2c3c9a711bc80d1af475ad2a2311a1364f7df6de Mon Sep 17 00:00:00 2001 From: Mukesh Ram Date: Mon, 5 Mar 2018 16:58:47 +0530 Subject: [PATCH] Fixed template strucutre issues --- templates/CRM/Admin/Form/Setting/Component.tpl | 2 +- templates/CRM/Admin/Form/Setting/Debugging.tpl | 2 +- templates/CRM/Admin/Form/Setting/Mapping.tpl | 2 +- templates/CRM/Admin/Form/Setting/Path.tpl | 7 +++---- templates/CRM/Admin/Form/Setting/UF.tpl | 2 +- templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl | 2 +- templates/CRM/Admin/Form/Setting/Url.tpl | 3 +-- templates/CRM/Badge/Form/Layout.tpl | 2 +- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/templates/CRM/Admin/Form/Setting/Component.tpl b/templates/CRM/Admin/Form/Setting/Component.tpl index e1df586428..53854c913c 100644 --- a/templates/CRM/Admin/Form/Setting/Component.tpl +++ b/templates/CRM/Admin/Form/Setting/Component.tpl @@ -23,10 +23,10 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -
{ts}CiviCRM includes several optional components which give you more tools to connect with and engage your constituents.{/ts}{help id="components"}
+
{include file="CRM/common/formButtons.tpl" location="top"}
{$form.enableComponents.html}

diff --git a/templates/CRM/Admin/Form/Setting/Debugging.tpl b/templates/CRM/Admin/Form/Setting/Debugging.tpl index fb524d8679..721d7ef13e 100644 --- a/templates/CRM/Admin/Form/Setting/Debugging.tpl +++ b/templates/CRM/Admin/Form/Setting/Debugging.tpl @@ -23,10 +23,10 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -

{ts}In addition to the settings on this screen, there are a number of settings you can add to your sites's settings file (civicrm.settings.php) to provide additional debugging information.{/ts} {docURL page="Debugging for developers" resource="wiki"}
+
{include file="CRM/common/formButtons.tpl" location="top"}
{if $form.userFrameworkLogging} diff --git a/templates/CRM/Admin/Form/Setting/Mapping.tpl b/templates/CRM/Admin/Form/Setting/Mapping.tpl index 9cdd4644b7..8088ed1d0c 100644 --- a/templates/CRM/Admin/Form/Setting/Mapping.tpl +++ b/templates/CRM/Admin/Form/Setting/Mapping.tpl @@ -23,10 +23,10 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -
{ts}CiviCRM includes plugins for several mapping and geocoding web services. When your users save a contact or event location address, a geocoding service will convert the address into geographical coordinates, which are required for mapping. Yahoo’s geocoder will also automatically populate the postal code field. Mapping services allow your users to display addresses on a map.{/ts} {help id='map-intro-id'}
+
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Admin/Form/Setting/Path.tpl b/templates/CRM/Admin/Form/Setting/Path.tpl index 85b2852c77..463b758c29 100644 --- a/templates/CRM/Admin/Form/Setting/Path.tpl +++ b/templates/CRM/Admin/Form/Setting/Path.tpl @@ -23,8 +23,7 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -
-
+

{ts}You may configure these upload directories using absolute paths or path variables.{/ts} {help id='id-path_vars'} @@ -32,8 +31,8 @@

{ts}If you modify the defaults, make sure that your web server has write access to the directories.{/ts}

- -
+
+
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Admin/Form/Setting/UF.tpl b/templates/CRM/Admin/Form/Setting/UF.tpl index 35e548a99f..68439d61a2 100644 --- a/templates/CRM/Admin/Form/Setting/UF.tpl +++ b/templates/CRM/Admin/Form/Setting/UF.tpl @@ -23,10 +23,10 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -
{ts}These settings define the CMS variables that are used with CiviCRM.{/ts}
+
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl b/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl index 953a26a37e..59dfaf64d9 100644 --- a/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl +++ b/templates/CRM/Admin/Form/Setting/UpdateConfigBackend.tpl @@ -23,7 +23,6 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -

{ts}When migrating a site to a new server, the paths and URLs of your CiviCRM installation may change. {/ts} @@ -34,6 +33,7 @@ {ts 1=$pathsURL 2=$urlsURL}The old paths and URLs may be retained in some database records. Use this form to clear caches or to reset paths to their defaults. If you need further customizations, then update the Directories and Resource URLs.{/ts}

+
diff --git a/templates/CRM/Admin/Form/Setting/Url.tpl b/templates/CRM/Admin/Form/Setting/Url.tpl index 0c5dc19066..d10cac3cab 100644 --- a/templates/CRM/Admin/Form/Setting/Url.tpl +++ b/templates/CRM/Admin/Form/Setting/Url.tpl @@ -23,7 +23,6 @@ | see the CiviCRM license FAQ at http://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -

{ts}These settings define the URLs used to access CiviCRM resources (CSS files, Javascript files, images, etc.).{/ts} @@ -32,8 +31,8 @@ {ts}You may configure these settings using absolute URLs or URL variables.{/ts} {help id='id-url_vars'}

-
+
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Badge/Form/Layout.tpl b/templates/CRM/Badge/Form/Layout.tpl index 58fd94549f..788a05800f 100644 --- a/templates/CRM/Badge/Form/Layout.tpl +++ b/templates/CRM/Badge/Form/Layout.tpl @@ -109,7 +109,7 @@ - +
{ts}Elements{/ts} -- 2.25.1