From 65c24cf089e6d6d0cd8444d88922fc80ba551ea7 Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Mon, 21 Sep 2020 11:51:40 +0100
Subject: [PATCH 01/18] Update cardGrey.php

1. Move mod-id to module container to display mod-id whether header/title shown or not
2. Remove h4 from $headerTag
3. Remove h3 from render code
---
 .../html/layouts/chromes/cardGrey.php         | 42 +++++++------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/cardGrey.php b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
index a374b1cbbf66c..d55cf352d5484 100644
--- a/templates/cassiopeia/html/layouts/chromes/cardGrey.php
+++ b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
@@ -21,34 +21,22 @@
 }
 
 $moduleTag              = $params->get('module_tag', 'div');
-$moduleAttribs          = [];
+$modulePos 		= $module->position;
 $moduleAttribs['class'] = $module->position . ' card card-grey ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8');
-$headerTag              = htmlspecialchars($params->get('header_tag', 'h4'), ENT_QUOTES, 'UTF-8');
+$modId                  = 'mod-' . $module->id;
+$headerTag              = htmlspecialchars($params->get('header_tag', ''), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
-$headerAttribs          = [];
-$headerAttribs['class'] = $headerClass;
 
-if ($module->showtitle) :
-	$moduleAttribs['aria-labelledby'] = 'mod-' . $module->id;
-	$headerAttribs['id']             = 'mod-' . $module->id;
-
-	if ($headerClass !== 'card-title') :
-		$headerAttribs['class'] .= 'card-header ' . $headerClass;
-	endif;
-else:
-	$moduleAttribs['aria-label'] = $module->title;
-endif;
-
-$header = '<' . $headerTag . ' ' . ArrayHelper::toString($headerAttribs) . '>' . $module->title . '</' . $headerTag . '>';
-?>
-<<?php echo $moduleTag; ?> <?php echo ArrayHelper::toString($moduleAttribs); ?>>
-	<?php if ($module->showtitle && $headerClass !== 'card-title') : ?>
-		<?php echo $header; ?>
-	<?php endif; ?>
-	<div class="card-body">
-		<?php if ($module->showtitle && $headerClass === 'card-title') : ?>
+$header = '<div class="card-header'. $headerClass .'"><' . $headerTag . '>' . $module->title . '</ . $headerTag .></div>';
+if ($module->content) : ?>
+	<?php if ($module->showtitle) : ?>
+		<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
 			<?php echo $header; ?>
-		<?php endif; ?>
-		<?php echo $module->content; ?>
-	</div>
-</<?php echo $moduleTag; ?>>
+			<div class="card-body"><?php echo $module->content; ?></div>
+		</<?php echo $moduleTag; ?>>
+	<?php else : ?>
+		<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
+			<div class="card-body"><?php echo $module->content; ?></div>
+		</<?php echo $moduleTag; ?>>
+	<?php endif; ?>
+<?php endif; ?>

From a769fd93f7c7d8ffde98c022ef8d55fa3993d860 Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Mon, 21 Sep 2020 11:55:33 +0100
Subject: [PATCH 02/18] Update default.php

1. Move mod-id to module container so that mod-id is shown whether or not header/title is shown
2. Removed 'h4' from $headerTag
---
 .../html/layouts/chromes/default.php          | 42 +++++++------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/default.php b/templates/cassiopeia/html/layouts/chromes/default.php
index f5075160b1a33..0478f044f5ea6 100644
--- a/templates/cassiopeia/html/layouts/chromes/default.php
+++ b/templates/cassiopeia/html/layouts/chromes/default.php
@@ -21,34 +21,22 @@
 }
 
 $moduleTag              = $params->get('module_tag', 'div');
-$moduleAttribs          = [];
+$modulePos              = $module->position;
 $moduleAttribs['class'] = $module->position . ' card ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8');
-$headerTag              = htmlspecialchars($params->get('header_tag', 'h4'), ENT_QUOTES, 'UTF-8');
+$modId 			= 'mod-' . $module->id;
+$headerTag              = htmlspecialchars($params->get('header_tag', ''), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
-$headerAttribs          = [];
-$headerAttribs['class'] = $headerClass;
 
-if ($module->showtitle) :
-	$moduleAttribs['aria-labelledby'] = 'mod-' . $module->id;
-	$headerAttribs['id']             = 'mod-' . $module->id;
-
-	if ($headerClass !== 'card-title') :
-		$headerAttribs['class'] .= 'card-header ' . $headerClass;
-	endif;
-else:
-	$moduleAttribs['aria-label'] = $module->title;
-endif;
-
-$header = '<' . $headerTag . ' ' . ArrayHelper::toString($headerAttribs) . '>' . $module->title . '</' . $headerTag . '>';
-?>
-<<?php echo $moduleTag; ?> <?php echo ArrayHelper::toString($moduleAttribs); ?>>
-	<?php if ($module->showtitle && $headerClass !== 'card-title') : ?>
-		<?php echo $header; ?>
-	<?php endif; ?>
-	<div class="card-body">
-		<?php if ($module->showtitle && $headerClass === 'card-title') : ?>
+$header = '<div class="card-header'. $headerClass .'"><' . $headerTag . '>' . $module->title . '</ . $headerTag .></div>';
+if ($module->content) : ?>
+	<?php if ($module->showtitle) : ?>
+		<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
 			<?php echo $header; ?>
-		<?php endif; ?>
-		<?php echo $module->content; ?>
-	</div>
-</<?php echo $moduleTag; ?>>
+			<div class="card-body"><?php echo $module->content; ?></div>
+		</<?php echo $moduleTag; ?>>
+	<?php else : ?>
+		<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
+			<div class="card-body"><?php echo $module->content; ?></div>
+		</<?php echo $moduleTag; ?>>
+	<?php endif; ?>
+<?php endif; ?>

From d83e0244a9490b84314e8929e418b49ad932be8e Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Mon, 21 Sep 2020 11:59:27 +0100
Subject: [PATCH 03/18] Create noTitle.php

This option can be used instead of "style-none" in the index.php to allow modules that generally do not have their header/title shown, e.g. main menu, search, but will add an id to the module - which can be used as anchors - and also include any module class suffix added to the module's setup advanced tab.
---
 .../html/layouts/chromes/noTitle.php          | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 templates/cassiopeia/html/layouts/chromes/noTitle.php

diff --git a/templates/cassiopeia/html/layouts/chromes/noTitle.php b/templates/cassiopeia/html/layouts/chromes/noTitle.php
new file mode 100644
index 0000000000000..d68f37e5a5979
--- /dev/null
+++ b/templates/cassiopeia/html/layouts/chromes/noTitle.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  Templates.crocosmia
+ *
+ * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+$module  = $displayData['module'];
+$params  = $displayData['params'];
+$attribs = $displayData['attribs'];
+
+$modulePos = $module->position;
+$moduleTag = $params->get('module_tag', 'div');
+$modId     = 'mod-' . $module->id;
+
+if ($module->content) : ?>
+	<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $modulePos; ?> <?php echo htmlspecialchars($params->get('moduleclass_sfx')); ?>"  aria-labelledby="<?php echo $module->title; ?>">
+		<div>
+		<?php echo $module->content; ?>
+		</div>
+	</<?php echo $moduleTag; ?>>
+<?php endif; ?>

From 606ffc053f0ee026480a543ba6163b1d8ed54111 Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Mon, 21 Sep 2020 12:16:42 +0100
Subject: [PATCH 04/18] Update
 templates/cassiopeia/html/layouts/chromes/default.php

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
---
 templates/cassiopeia/html/layouts/chromes/default.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/default.php b/templates/cassiopeia/html/layouts/chromes/default.php
index 0478f044f5ea6..2f546fd6e2370 100644
--- a/templates/cassiopeia/html/layouts/chromes/default.php
+++ b/templates/cassiopeia/html/layouts/chromes/default.php
@@ -23,7 +23,7 @@
 $moduleTag              = $params->get('module_tag', 'div');
 $modulePos              = $module->position;
 $moduleAttribs['class'] = $module->position . ' card ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8');
-$modId 			= 'mod-' . $module->id;
+$modId                  = 'mod-' . $module->id;
 $headerTag              = htmlspecialchars($params->get('header_tag', ''), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 

From a117c2c612930491a4151e59855c5ee32e03953c Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Mon, 21 Sep 2020 12:51:28 +0100
Subject: [PATCH 05/18] Update
 templates/cassiopeia/html/layouts/chromes/cardGrey.php

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
---
 templates/cassiopeia/html/layouts/chromes/cardGrey.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/cardGrey.php b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
index d55cf352d5484..e199f00253aa2 100644
--- a/templates/cassiopeia/html/layouts/chromes/cardGrey.php
+++ b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
@@ -21,7 +21,7 @@
 }
 
 $moduleTag              = $params->get('module_tag', 'div');
-$modulePos 		= $module->position;
+$modulePos              = $module->position;
 $moduleAttribs['class'] = $module->position . ' card card-grey ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8');
 $modId                  = 'mod-' . $module->id;
 $headerTag              = htmlspecialchars($params->get('header_tag', ''), ENT_QUOTES, 'UTF-8');

From 6e099a7d052158f05de5fbda4bb0f389f356319f Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Mon, 21 Sep 2020 17:32:38 +0100
Subject: [PATCH 06/18] Update cardGrey.php

Added correct $headerTag element
---
 templates/cassiopeia/html/layouts/chromes/cardGrey.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/cardGrey.php b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
index e199f00253aa2..69a77c2b63cb1 100644
--- a/templates/cassiopeia/html/layouts/chromes/cardGrey.php
+++ b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
@@ -27,11 +27,10 @@
 $headerTag              = htmlspecialchars($params->get('header_tag', ''), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 
-$header = '<div class="card-header'. $headerClass .'"><' . $headerTag . '>' . $module->title . '</ . $headerTag .></div>';
 if ($module->content) : ?>
 	<?php if ($module->showtitle) : ?>
 		<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
-			<?php echo $header; ?>
+			<<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
 			<div class="card-body"><?php echo $module->content; ?></div>
 		</<?php echo $moduleTag; ?>>
 	<?php else : ?>

From c5a19f04bbcc4475f1189e4dbe087a4bf1d0cfb1 Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Mon, 21 Sep 2020 17:34:15 +0100
Subject: [PATCH 07/18] Update default.php

Added $headerTag
---
 templates/cassiopeia/html/layouts/chromes/default.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/default.php b/templates/cassiopeia/html/layouts/chromes/default.php
index 2f546fd6e2370..0c10ea74162ac 100644
--- a/templates/cassiopeia/html/layouts/chromes/default.php
+++ b/templates/cassiopeia/html/layouts/chromes/default.php
@@ -27,11 +27,10 @@
 $headerTag              = htmlspecialchars($params->get('header_tag', ''), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 
-$header = '<div class="card-header'. $headerClass .'"><' . $headerTag . '>' . $module->title . '</ . $headerTag .></div>';
 if ($module->content) : ?>
 	<?php if ($module->showtitle) : ?>
 		<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
-			<?php echo $header; ?>
+			<<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
 			<div class="card-body"><?php echo $module->content; ?></div>
 		</<?php echo $moduleTag; ?>>
 	<?php else : ?>

From 9bda8334f6cf09ea80effc17a0e06db05f4766ad Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Tue, 22 Sep 2020 10:32:22 +0100
Subject: [PATCH 08/18] Update cardGrey.php

---
 .../html/layouts/chromes/cardGrey.php         | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/cardGrey.php b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
index 69a77c2b63cb1..6b7dbf32de029 100644
--- a/templates/cassiopeia/html/layouts/chromes/cardGrey.php
+++ b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
@@ -27,15 +27,13 @@
 $headerTag              = htmlspecialchars($params->get('header_tag', ''), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 
-if ($module->content) : ?>
-	<?php if ($module->showtitle) : ?>
-		<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
-			<<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
-			<div class="card-body"><?php echo $module->content; ?></div>
-		</<?php echo $moduleTag; ?>>
-	<?php else : ?>
-		<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
-			<div class="card-body"><?php echo $module->content; ?></div>
-		</<?php echo $moduleTag; ?>>
-	<?php endif; ?>
+if ($module->showtitle) : ?>
+    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
+        <<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
+        <div class="card-body"><?php echo $module->content; ?></div>
+    </<?php echo $moduleTag; ?>>
+<?php else : ?>
+    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
+        <div class="card-body"><?php echo $module->content; ?></div>
+    </<?php echo $moduleTag; ?>>
 <?php endif; ?>

From 0d175a594f4dc92aab642c0411f217146098bf6b Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Tue, 22 Sep 2020 10:35:58 +0100
Subject: [PATCH 09/18] Update default.php

Removed second content check
---
 .../html/layouts/chromes/default.php          | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/default.php b/templates/cassiopeia/html/layouts/chromes/default.php
index 0c10ea74162ac..e7532711777bb 100644
--- a/templates/cassiopeia/html/layouts/chromes/default.php
+++ b/templates/cassiopeia/html/layouts/chromes/default.php
@@ -27,15 +27,13 @@
 $headerTag              = htmlspecialchars($params->get('header_tag', ''), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 
-if ($module->content) : ?>
-	<?php if ($module->showtitle) : ?>
-		<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
-			<<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
-			<div class="card-body"><?php echo $module->content; ?></div>
-		</<?php echo $moduleTag; ?>>
-	<?php else : ?>
-		<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
-			<div class="card-body"><?php echo $module->content; ?></div>
-		</<?php echo $moduleTag; ?>>
-	<?php endif; ?>
+if ($module->showtitle) : ?>
+    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
+        <<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
+        <div class="card-body"><?php echo $module->content; ?></div>
+    </<?php echo $moduleTag; ?>>
+<?php else : ?>
+    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
+        <div class="card-body"><?php echo $module->content; ?></div>
+    </<?php echo $moduleTag; ?>>
 <?php endif; ?>

From a329003234ea40a979c40386659ee1da988e6473 Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Tue, 22 Sep 2020 11:07:40 +0100
Subject: [PATCH 10/18] Update cardGrey.php

Added aria-labelledby back in for module with title and corrected and aria-labelledby to aria-label for no-title modules
---
 templates/cassiopeia/html/layouts/chromes/cardGrey.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/cardGrey.php b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
index 6b7dbf32de029..dd02910fde188 100644
--- a/templates/cassiopeia/html/layouts/chromes/cardGrey.php
+++ b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
@@ -28,12 +28,12 @@
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 
 if ($module->showtitle) : ?>
-    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
+    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
         <<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
         <div class="card-body"><?php echo $module->content; ?></div>
     </<?php echo $moduleTag; ?>>
 <?php else : ?>
-    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
+    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-label="<?php echo $module->title; ?>">
         <div class="card-body"><?php echo $module->content; ?></div>
     </<?php echo $moduleTag; ?>>
 <?php endif; ?>

From 40e6022d70bffe3f6ab51dce3a31529b80112f71 Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Tue, 22 Sep 2020 11:22:24 +0100
Subject: [PATCH 11/18] Update default.php

Added aria-labelledby back in for module with title and corrected and aria-labelledby to aria-label for no-title modules
Tabs instead of spaces
---
 .../cassiopeia/html/layouts/chromes/default.php    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/default.php b/templates/cassiopeia/html/layouts/chromes/default.php
index e7532711777bb..d54c1b4ff97bf 100644
--- a/templates/cassiopeia/html/layouts/chromes/default.php
+++ b/templates/cassiopeia/html/layouts/chromes/default.php
@@ -28,12 +28,12 @@
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 
 if ($module->showtitle) : ?>
-    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
-        <<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
-        <div class="card-body"><?php echo $module->content; ?></div>
-    </<?php echo $moduleTag; ?>>
+	<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
+		<<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
+		<div class="card-body"><?php echo $module->content; ?></div>
+	</<?php echo $moduleTag; ?>>
 <?php else : ?>
-    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
-        <div class="card-body"><?php echo $module->content; ?></div>
-    </<?php echo $moduleTag; ?>>
+	<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-label="<?php echo $module->title; ?>">
+		<div class="card-body"><?php echo $module->content; ?></div>
+	</<?php echo $moduleTag; ?>>
 <?php endif; ?>

From ff19173c659d1a95b5c07c4fd5ffaea4c58dc4f8 Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Tue, 22 Sep 2020 11:25:09 +0100
Subject: [PATCH 12/18] Update cardGrey.php

Added aria-labelledby back in for module with title and corrected and aria-labelledby to aria-label for no-title modules
Corrected spaces to tabs
---
 .../cassiopeia/html/layouts/chromes/cardGrey.php   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/cardGrey.php b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
index dd02910fde188..b1c7ec2d0481e 100644
--- a/templates/cassiopeia/html/layouts/chromes/cardGrey.php
+++ b/templates/cassiopeia/html/layouts/chromes/cardGrey.php
@@ -28,12 +28,12 @@
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 
 if ($module->showtitle) : ?>
-    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
-        <<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
-        <div class="card-body"><?php echo $module->content; ?></div>
-    </<?php echo $moduleTag; ?>>
+	<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
+		<<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
+		<div class="card-body"><?php echo $module->content; ?></div>
+	</<?php echo $moduleTag; ?>>
 <?php else : ?>
-    <<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-label="<?php echo $module->title; ?>">
-        <div class="card-body"><?php echo $module->content; ?></div>
-    </<?php echo $moduleTag; ?>>
+	<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-label="<?php echo $module->title; ?>">
+		<div class="card-body"><?php echo $module->content; ?></div>
+	</<?php echo $moduleTag; ?>>
 <?php endif; ?>

From 4f6d35ab6dfc485c5e5791cbc56a1a4d93e63842 Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Tue, 22 Sep 2020 12:09:50 +0100
Subject: [PATCH 13/18] Delete noTitle.php

After consideration and discussion, I agree that this file is not required.
---
 .../html/layouts/chromes/noTitle.php          | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 templates/cassiopeia/html/layouts/chromes/noTitle.php

diff --git a/templates/cassiopeia/html/layouts/chromes/noTitle.php b/templates/cassiopeia/html/layouts/chromes/noTitle.php
deleted file mode 100644
index d68f37e5a5979..0000000000000
--- a/templates/cassiopeia/html/layouts/chromes/noTitle.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  Templates.crocosmia
- *
- * @copyright   Copyright (C) 2005 - 2019 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-$module  = $displayData['module'];
-$params  = $displayData['params'];
-$attribs = $displayData['attribs'];
-
-$modulePos = $module->position;
-$moduleTag = $params->get('module_tag', 'div');
-$modId     = 'mod-' . $module->id;
-
-if ($module->content) : ?>
-	<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $modulePos; ?> <?php echo htmlspecialchars($params->get('moduleclass_sfx')); ?>"  aria-labelledby="<?php echo $module->title; ?>">
-		<div>
-		<?php echo $module->content; ?>
-		</div>
-	</<?php echo $moduleTag; ?>>
-<?php endif; ?>

From b8f8d33e75e52eb4a9ca10d3944ea7ad99b20f0b Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Wed, 23 Sep 2020 07:54:58 +0100
Subject: [PATCH 14/18] Rename default.php to card.php

---
 .../cassiopeia/html/layouts/chromes/{default.php => card.php}     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename templates/cassiopeia/html/layouts/chromes/{default.php => card.php} (100%)

diff --git a/templates/cassiopeia/html/layouts/chromes/default.php b/templates/cassiopeia/html/layouts/chromes/card.php
similarity index 100%
rename from templates/cassiopeia/html/layouts/chromes/default.php
rename to templates/cassiopeia/html/layouts/chromes/card.php

From 2bb9e0c8892f3498f105b3077cde62ca2efa8bcb Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Fri, 25 Sep 2020 15:32:42 +0100
Subject: [PATCH 15/18] Update card.php

Added h3 back into line 27
---
 templates/cassiopeia/html/layouts/chromes/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/card.php b/templates/cassiopeia/html/layouts/chromes/card.php
index d54c1b4ff97bf..fea52b13bec68 100644
--- a/templates/cassiopeia/html/layouts/chromes/card.php
+++ b/templates/cassiopeia/html/layouts/chromes/card.php
@@ -24,7 +24,7 @@
 $modulePos              = $module->position;
 $moduleAttribs['class'] = $module->position . ' card ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8');
 $modId                  = 'mod-' . $module->id;
-$headerTag              = htmlspecialchars($params->get('header_tag', ''), ENT_QUOTES, 'UTF-8');
+$headerTag              = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 
 if ($module->showtitle) : ?>

From 6bdab92f6b88aa5bb972aa2f3fa015b5bcf034d8 Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Fri, 25 Sep 2020 18:28:50 +0100
Subject: [PATCH 16/18] Update
 templates/cassiopeia/html/layouts/chromes/card.php

Co-authored-by: SharkyKZ <sharkykz@gmail.com>
---
 templates/cassiopeia/html/layouts/chromes/card.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/card.php b/templates/cassiopeia/html/layouts/chromes/card.php
index fea52b13bec68..d12f92f87efe5 100644
--- a/templates/cassiopeia/html/layouts/chromes/card.php
+++ b/templates/cassiopeia/html/layouts/chromes/card.php
@@ -21,7 +21,6 @@
 }
 
 $moduleTag              = $params->get('module_tag', 'div');
-$modulePos              = $module->position;
 $moduleAttribs['class'] = $module->position . ' card ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8');
 $modId                  = 'mod-' . $module->id;
 $headerTag              = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');

From 5ace12946c44222017e0603bd9223338ff41bfae Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Sun, 27 Sep 2020 17:32:54 +0100
Subject: [PATCH 17/18] Update
 templates/cassiopeia/html/layouts/chromes/card.php

Co-authored-by: Quy <quy@fluxbb.org>
---
 templates/cassiopeia/html/layouts/chromes/card.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/card.php b/templates/cassiopeia/html/layouts/chromes/card.php
index d12f92f87efe5..5e3ddffb214d9 100644
--- a/templates/cassiopeia/html/layouts/chromes/card.php
+++ b/templates/cassiopeia/html/layouts/chromes/card.php
@@ -27,7 +27,7 @@
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 
 if ($module->showtitle) : ?>
-	<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $module->title; ?>">
+	<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
 		<<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
 		<div class="card-body"><?php echo $module->content; ?></div>
 	</<?php echo $moduleTag; ?>>

From 64bde148295e1140e65f371a9881768cc105ae6d Mon Sep 17 00:00:00 2001
From: Scrabble96 <github@businesspluspoint.co.uk>
Date: Mon, 28 Sep 2020 06:03:32 +0100
Subject: [PATCH 18/18] Update card.php

Revised mod chrome with title showing to have id assigned to header tag (as original card.php rendering) and outer container to be aria-labelledby mod id
---
 templates/cassiopeia/html/layouts/chromes/card.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/cassiopeia/html/layouts/chromes/card.php b/templates/cassiopeia/html/layouts/chromes/card.php
index 5e3ddffb214d9..bec5053ac24de 100644
--- a/templates/cassiopeia/html/layouts/chromes/card.php
+++ b/templates/cassiopeia/html/layouts/chromes/card.php
@@ -27,8 +27,8 @@
 $headerClass            = htmlspecialchars($params->get('header_class', ''), ENT_QUOTES, 'UTF-8');
 
 if ($module->showtitle) : ?>
-	<<?php echo $moduleTag; ?> id="<?php echo $modId; ?>" class="<?php echo $moduleAttribs['class'] ?>">
-		<<?php echo $headerTag; ?> class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
+	<<?php echo $moduleTag; ?> class="<?php echo $moduleAttribs['class'] ?>" aria-labelledby="<?php echo $modId; ?>">
+		<<?php echo $headerTag; ?> id="<?php echo $modId; ?>" class="card-header <?php echo $headerClass; ?>"><?php echo $module->title; ?></<?php echo $headerTag; ?>>
 		<div class="card-body"><?php echo $module->content; ?></div>
 	</<?php echo $moduleTag; ?>>
 <?php else : ?>