From a51751098ac7c3483e8438c9563c98cbe6307f9d Mon Sep 17 00:00:00 2001
From: Mukesh Ram <mukesh@compucorp.co.uk>
Date: Tue, 5 Dec 2017 12:02:50 +0530
Subject: [PATCH 1/3] NDI-30: Added missing containers to template

---
 templates/CRM/Admin/Page/ContactType.tpl      | 5 ++++-
 templates/CRM/Admin/Page/RelationshipType.tpl | 3 +++
 templates/CRM/UF/Page/Group.tpl               | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/templates/CRM/Admin/Page/ContactType.tpl b/templates/CRM/Admin/Page/ContactType.tpl
index 742487e3cf3e..3643bc847d21 100644
--- a/templates/CRM/Admin/Page/ContactType.tpl
+++ b/templates/CRM/Admin/Page/ContactType.tpl
@@ -30,8 +30,10 @@
   <div class="help">
     {ts}CiviCRM comes with 3 basic (built-in) contact types: Individual, Household, and Organization. You can create additional contact types based on these types to further differentiate contacts (for example you might create Student, Parent, Staff, and /or Volunteer types from the basic Individual type...).{/ts} {help id="id-contactSubtype-intro"}
   </div>
+
+<div class="crm-content-block crm-block">
 {if $rows}
-<div>
+  <div>
     {strip}
     {* handle enable/disable actions*}
     {include file="CRM/common/enableDisableApi.tpl"}
@@ -66,4 +68,5 @@
     {crmButton q="action=add&reset=1" icon="plus-circle"}{ts}Add Contact Type{/ts}{/crmButton}
     {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
   </div>
+</div>
 {/if}
diff --git a/templates/CRM/Admin/Page/RelationshipType.tpl b/templates/CRM/Admin/Page/RelationshipType.tpl
index 584aa48add31..af3c2f86f7b7 100644
--- a/templates/CRM/Admin/Page/RelationshipType.tpl
+++ b/templates/CRM/Admin/Page/RelationshipType.tpl
@@ -33,6 +33,8 @@
     <p>{ts}Relationship types describe relationships between people, households and organizations. Relationship types labels describe the relationship from the perspective of each of the two entities (e.g. Parent &gt;-&lt; Child, Employer &gt;-&lt; Employee). For some types of relationships, the labels may be the same in both directions (e.g. Spouse &gt;-&lt; Spouse).{/ts} {$docLink}</p>
     <p>{ts 1=$customURL}You can define as many additional relationships types as needed to cover the types of relationships you want to track. Once a relationship type is created, you may also define custom fields to extend relationship information for that type from <a href='%1'>Administer CiviCRM &raquo; Custom Data</a>.{/ts}{help id='id-relationship-types'} </p>
   </div>
+
+<div class="crm-content-block crm-block">
 {if $rows}
 {if !($action eq 1 and $action eq 2)}
     <div class="action-link">
@@ -86,3 +88,4 @@
     {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
   </div>
 {/if}
+</div>
diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl
index cffe8bf1acbf..c219dc8e1c47 100644
--- a/templates/CRM/UF/Page/Group.tpl
+++ b/templates/CRM/UF/Page/Group.tpl
@@ -51,6 +51,7 @@
         {ts}CiviCRM Profile(s) allow you to aggregate groups of fields and include them in your site as input forms, contact display pages, and search and listings features. They provide a powerful set of tools for you to collect information from constituents and selectively share contact information.{/ts} {help id='profile_overview'}
     </div>
 
+<div class="crm-content-block crm-block">
     {if NOT ($action eq 1 or $action eq 2)}
     <div class="crm-submit-buttons">
         <a href="{crmURL p='civicrm/admin/uf/group/add' q="action=add&reset=1"}" id="newCiviCRMProfile-top" class="button"><span><i class="crm-i fa-plus-circle"></i> {ts}Add Profile{/ts}</span></a>
@@ -173,3 +174,4 @@
     {/if}
     {/if}
 {/if}
+</div>

From e52d8c1946be04a5bfcf350b79df6fef492029f8 Mon Sep 17 00:00:00 2001
From: Mukesh Ram <mukesh@compucorp.co.uk>
Date: Tue, 5 Dec 2017 18:50:01 +0530
Subject: [PATCH 2/3] NDI-30: Added more templates to repair structure

---
 templates/CRM/Admin/Page/LabelFormats.tpl      | 3 ++-
 templates/CRM/Admin/Page/MessageTemplates.tpl  | 4 ++--
 templates/CRM/Admin/Page/PdfFormats.tpl        | 2 ++
 templates/CRM/Admin/Page/ScheduleReminders.tpl | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/templates/CRM/Admin/Page/LabelFormats.tpl b/templates/CRM/Admin/Page/LabelFormats.tpl
index f9b22c3cc4b2..3b92bd4b7825 100644
--- a/templates/CRM/Admin/Page/LabelFormats.tpl
+++ b/templates/CRM/Admin/Page/LabelFormats.tpl
@@ -31,7 +31,7 @@
 {if $action eq 1 or $action eq 2 or $action eq 8 or $action eq 16384}
   {include file="CRM/Admin/Form/LabelFormats.tpl"}
 {else}
-
+<div class="crm-content-block crm-block">
   {if $rows}
     <div id="ltype">
       {strip}
@@ -74,4 +74,5 @@
       {ts 1=$crmURL}There are no Label Formats configured. You can<a href='%1'>add one</a>.{/ts}
     </div>
   {/if}
+</div>
 {/if}
diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl
index 09465b330a8c..a2795be12ed7 100644
--- a/templates/CRM/Admin/Page/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Page/MessageTemplates.tpl
@@ -86,7 +86,7 @@
 {/if}
 
 {if $rows and $action ne 2 and $action ne 4}
-
+<div class="crm-content-block crm-block">
   <div id='mainTabContainer'>
     <ul>
       <li id='tab_user'>    <a href='#user'     title='{ts}User-driven Messages{/ts}'>    {ts}User-driven Messages{/ts}    </a></li>
@@ -162,7 +162,7 @@
       </div>
     {/foreach}
   </div>
-
+</div>
   <script type='text/javascript'>
     var selectedTab = 'user';
     {if $selectedChild}selectedTab = '{$selectedChild}';{/if}
diff --git a/templates/CRM/Admin/Page/PdfFormats.tpl b/templates/CRM/Admin/Page/PdfFormats.tpl
index c7853be3f2ba..246abb19d82e 100644
--- a/templates/CRM/Admin/Page/PdfFormats.tpl
+++ b/templates/CRM/Admin/Page/PdfFormats.tpl
@@ -32,6 +32,7 @@
     {capture assign="messageTemplatesURL"}{crmURL p="civicrm/admin/messageTemplates" q="reset=1"}{/capture}
     {ts 1=$messageTemplatesURL}You can configure one or more PDF Page Formats for your CiviCRM installation. PDF Page Formats may be assigned to <strong><a href="%1">Message Templates</a></strong> to use when creating PDF letters.{/ts}
   </div>
+<div class="crm-content-block crm-block">
 {if $rows}
     <div id="ltype">
         {strip}
@@ -69,3 +70,4 @@
       {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
     </div>
 {/if}
+</div>
\ No newline at end of file
diff --git a/templates/CRM/Admin/Page/ScheduleReminders.tpl b/templates/CRM/Admin/Page/ScheduleReminders.tpl
index 7f1d4b415a64..7690c7085051 100644
--- a/templates/CRM/Admin/Page/ScheduleReminders.tpl
+++ b/templates/CRM/Admin/Page/ScheduleReminders.tpl
@@ -38,6 +38,7 @@
       {ts}Scheduled reminders allow you to automatically send messages to contacts regarding their memberships, participation in events, or other activities.{/ts} {$schedRemindersDocLink}
     </div>
   {/if}
+  <div class="crm-content-block crm-block">
   {if $rows}
     <div id="reminder">
       {include file="CRM/Admin/Page/Reminders.tpl"}
@@ -57,5 +58,6 @@
     {/if}
     {crmButton p=$link q=$urlParams id="newScheduleReminder"  icon="plus-circle"}{ts}Add Reminder{/ts}{/crmButton}
   </div>
+  </div>
 {/if}
 {/if}

From 71d7100c5c9cd3cf165a1bf692579989c04ea8bb Mon Sep 17 00:00:00 2001
From: Mukesh Ram <mukesh@compucorp.co.uk>
Date: Wed, 6 Dec 2017 10:09:19 +0530
Subject: [PATCH 3/3] CRM-21518: Fixed spacing

---
 templates/CRM/Admin/Page/ContactType.tpl | 2 +-
 templates/CRM/Admin/Page/PdfFormats.tpl  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/CRM/Admin/Page/ContactType.tpl b/templates/CRM/Admin/Page/ContactType.tpl
index 3643bc847d21..155a79deb3b8 100644
--- a/templates/CRM/Admin/Page/ContactType.tpl
+++ b/templates/CRM/Admin/Page/ContactType.tpl
@@ -32,7 +32,7 @@
   </div>
 
 <div class="crm-content-block crm-block">
-{if $rows}
+  {if $rows}
   <div>
     {strip}
     {* handle enable/disable actions*}
diff --git a/templates/CRM/Admin/Page/PdfFormats.tpl b/templates/CRM/Admin/Page/PdfFormats.tpl
index 246abb19d82e..a58d634864ad 100644
--- a/templates/CRM/Admin/Page/PdfFormats.tpl
+++ b/templates/CRM/Admin/Page/PdfFormats.tpl
@@ -70,4 +70,4 @@
       {crmButton p="civicrm/admin" q="reset=1" class="cancel" icon="times"}{ts}Done{/ts}{/crmButton}
     </div>
 {/if}
-</div>
\ No newline at end of file
+</div>