From f24b34e1b49c4e10dd9c52f5015fd0b1c0ea0c06 Mon Sep 17 00:00:00 2001
From: "Troy T. Hall" <programming@hallhome.us>
Date: Tue, 25 Aug 2020 20:29:52 -0500
Subject: [PATCH 1/5] convert if (icon) to switch (icon)

---
 libraries/src/HTML/Helpers/JGrid.php | 132 +++++++++++++--------------
 1 file changed, 63 insertions(+), 69 deletions(-)

diff --git a/libraries/src/HTML/Helpers/JGrid.php b/libraries/src/HTML/Helpers/JGrid.php
index a68a32a41fb56..8e0f7d5c67614 100644
--- a/libraries/src/HTML/Helpers/JGrid.php
+++ b/libraries/src/HTML/Helpers/JGrid.php
@@ -90,41 +90,41 @@ public static function action($i, $task, $prefix = '', $active_title = '', $inac
 			$html[] = $tip ? ' aria-labelledby="' . $ariaid . '"' : '';
 			$html[] = '>';
 
-			if (strpos($active_class, 'fa-') !== false)
+			switch ($active_class)
 			{
-				$active_class = 'fas ' . $active_class;
-			}
-			elseif (strpos($active_class, 'icon-') !== false)
-			{
-				$active_class = $active_class;
-			}
-			elseif ($active_class === 'publish')
-			{
-				$active_class = 'fas fa-check';
-			}
-			elseif ($active_class === 'unpublish')
-			{
-				$active_class = 'fas fa-times';
-			}
-			elseif ($active_class === 'archive')
-			{
-				$active_class = 'fas fa-folder';
-			}
-			elseif ($active_class === 'checkedout')
-			{
-				$active_class = 'fas fa-lock';
-			}
-			elseif ($active_class === 'unfeatured')
-			{
-				$active_class = 'fas fa-star';
-			}
-			elseif ($active_class === 'featured')
-			{
-				$active_class = 'fas fa-star featured';
-			}
-			else
-			{
-				$active_class = 'icon-' . $active_class;
+				case (strpos($active_class, 'fa-') !== false):
+					$active_class = 'fas ' . $active_class;
+					break;
+
+				case  (strpos($active_class, 'icon-') !== false):
+					break;
+
+				case 'publish':
+					$active_class = 'fas fa-check';
+					break;
+
+				case 'unpublish':
+					$active_class = 'fas fa-times';
+					break;
+
+				case 'archive':
+					$active_class = 'fas fa-folder';
+					break;
+
+				case 'checkedout':
+					$active_class = 'fas fa-lock';
+					break;
+
+				case 'unfeatured':
+					$active_class = 'fas fa-star';
+					break;
+
+				case 'featured':
+					$active_class = 'fas fa-star featured';
+					break;
+
+				default:
+					$active_class = 'icon-' . $active_class;
 			}
 
 			$html[] = '<span class="' . $active_class . '" aria-hidden="true"></span>';
@@ -137,52 +137,46 @@ public static function action($i, $task, $prefix = '', $active_title = '', $inac
 			$html[] = $tip ? ' aria-labelledby="' . $ariaid . '"' : '';
 			$html[] = '>';
 
-			if ($active_class === 'protected')
-			{
-				$html[] = '<span class="fas fa-lock" aria-hidden="true"></span>';
-			}
-			else
+			switch ($inactive_class)
 			{
-				if (strpos($inactive_class, 'fa-') !== false)
-				{
+				case (strpos($inactive_class, 'fa-') !== false):
 					$inactive_class = 'fas ' . $inactive_class;
-				}
-				elseif (strpos($inactive_class, 'icon-') !== false)
-				{
-					$inactive_class = $inactive_class;
-				}
-				elseif ($inactive_class === 'publish')
-				{
+					break;
+
+				case  (strpos($inactive_class, 'icon-') !== false):
+					break;
+
+				case 'publish':
 					$inactive_class = 'fas fa-check';
-				}
-				elseif ($inactive_class === 'unpublish')
-				{
+					break;
+
+				case 'unpublish':
 					$inactive_class = 'fas fa-times';
-				}
-				elseif ($inactive_class === 'archive')
-				{
+					break;
+
+				case 'archive':
 					$inactive_class = 'fas fa-folder';
-				}
-				elseif ($inactive_class === 'checkedout')
-				{
+					break;
+
+				case 'checkedout':
+				case 'protected':
 					$inactive_class = 'fas fa-lock';
-				}
-				elseif ($inactive_class === 'unfeatured')
-				{
+					break;
+
+				case 'unfeatured':
 					$inactive_class = 'fas fa-star';
-				}
-				elseif ($inactive_class === 'featured')
-				{
+					break;
+
+				case 'featured':
 					$inactive_class = 'fas fa-star featured';
-				}
-				else
-				{
-					$inactive_class = 'icon-' . $inactive_class;
-				}
+					break;
 
-				$html[] = '<span class="' . $inactive_class . '" aria-hidden="true"></span>';
+				default:
+					$inactive_class = 'icon-' . $inactive_class;
 			}
 
+			$html[] = '<span class="' . $inactive_class . '" aria-hidden="true"></span>';
+
 			$html[] = '</span>';
 			$html[] = $tip ? '<div role="tooltip" id="' . $ariaid . '">' . $title . '</div>' : '';
 		}

From afa1b0ed93f4ae5cf8d560e73a70119759341573 Mon Sep 17 00:00:00 2001
From: "Troy T. Hall" <programming@hallhome.us>
Date: Mon, 31 Aug 2020 07:34:44 -0500
Subject: [PATCH 2/5] revert to using mapped fix.

---
 libraries/src/HTML/Helpers/JGrid.php | 132 ++++++++++++++-------------
 1 file changed, 69 insertions(+), 63 deletions(-)

diff --git a/libraries/src/HTML/Helpers/JGrid.php b/libraries/src/HTML/Helpers/JGrid.php
index 8e0f7d5c67614..a68a32a41fb56 100644
--- a/libraries/src/HTML/Helpers/JGrid.php
+++ b/libraries/src/HTML/Helpers/JGrid.php
@@ -90,41 +90,41 @@ public static function action($i, $task, $prefix = '', $active_title = '', $inac
 			$html[] = $tip ? ' aria-labelledby="' . $ariaid . '"' : '';
 			$html[] = '>';
 
-			switch ($active_class)
+			if (strpos($active_class, 'fa-') !== false)
 			{
-				case (strpos($active_class, 'fa-') !== false):
-					$active_class = 'fas ' . $active_class;
-					break;
-
-				case  (strpos($active_class, 'icon-') !== false):
-					break;
-
-				case 'publish':
-					$active_class = 'fas fa-check';
-					break;
-
-				case 'unpublish':
-					$active_class = 'fas fa-times';
-					break;
-
-				case 'archive':
-					$active_class = 'fas fa-folder';
-					break;
-
-				case 'checkedout':
-					$active_class = 'fas fa-lock';
-					break;
-
-				case 'unfeatured':
-					$active_class = 'fas fa-star';
-					break;
-
-				case 'featured':
-					$active_class = 'fas fa-star featured';
-					break;
-
-				default:
-					$active_class = 'icon-' . $active_class;
+				$active_class = 'fas ' . $active_class;
+			}
+			elseif (strpos($active_class, 'icon-') !== false)
+			{
+				$active_class = $active_class;
+			}
+			elseif ($active_class === 'publish')
+			{
+				$active_class = 'fas fa-check';
+			}
+			elseif ($active_class === 'unpublish')
+			{
+				$active_class = 'fas fa-times';
+			}
+			elseif ($active_class === 'archive')
+			{
+				$active_class = 'fas fa-folder';
+			}
+			elseif ($active_class === 'checkedout')
+			{
+				$active_class = 'fas fa-lock';
+			}
+			elseif ($active_class === 'unfeatured')
+			{
+				$active_class = 'fas fa-star';
+			}
+			elseif ($active_class === 'featured')
+			{
+				$active_class = 'fas fa-star featured';
+			}
+			else
+			{
+				$active_class = 'icon-' . $active_class;
 			}
 
 			$html[] = '<span class="' . $active_class . '" aria-hidden="true"></span>';
@@ -137,45 +137,51 @@ public static function action($i, $task, $prefix = '', $active_title = '', $inac
 			$html[] = $tip ? ' aria-labelledby="' . $ariaid . '"' : '';
 			$html[] = '>';
 
-			switch ($inactive_class)
+			if ($active_class === 'protected')
+			{
+				$html[] = '<span class="fas fa-lock" aria-hidden="true"></span>';
+			}
+			else
 			{
-				case (strpos($inactive_class, 'fa-') !== false):
+				if (strpos($inactive_class, 'fa-') !== false)
+				{
 					$inactive_class = 'fas ' . $inactive_class;
-					break;
-
-				case  (strpos($inactive_class, 'icon-') !== false):
-					break;
-
-				case 'publish':
+				}
+				elseif (strpos($inactive_class, 'icon-') !== false)
+				{
+					$inactive_class = $inactive_class;
+				}
+				elseif ($inactive_class === 'publish')
+				{
 					$inactive_class = 'fas fa-check';
-					break;
-
-				case 'unpublish':
+				}
+				elseif ($inactive_class === 'unpublish')
+				{
 					$inactive_class = 'fas fa-times';
-					break;
-
-				case 'archive':
+				}
+				elseif ($inactive_class === 'archive')
+				{
 					$inactive_class = 'fas fa-folder';
-					break;
-
-				case 'checkedout':
-				case 'protected':
+				}
+				elseif ($inactive_class === 'checkedout')
+				{
 					$inactive_class = 'fas fa-lock';
-					break;
-
-				case 'unfeatured':
+				}
+				elseif ($inactive_class === 'unfeatured')
+				{
 					$inactive_class = 'fas fa-star';
-					break;
-
-				case 'featured':
+				}
+				elseif ($inactive_class === 'featured')
+				{
 					$inactive_class = 'fas fa-star featured';
-					break;
-
-				default:
+				}
+				else
+				{
 					$inactive_class = 'icon-' . $inactive_class;
-			}
+				}
 
-			$html[] = '<span class="' . $inactive_class . '" aria-hidden="true"></span>';
+				$html[] = '<span class="' . $inactive_class . '" aria-hidden="true"></span>';
+			}
 
 			$html[] = '</span>';
 			$html[] = $tip ? '<div role="tooltip" id="' . $ariaid . '">' . $title . '</div>' : '';

From 3244c82855fa2b1828baecc73fa680a5dfe2c56c Mon Sep 17 00:00:00 2001
From: "Troy T. Hall" <programming@hallhome.us>
Date: Mon, 31 Aug 2020 07:35:36 -0500
Subject: [PATCH 3/5] multi-reverts

---
 libraries/src/Toolbar/CoreButtonsTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/src/Toolbar/CoreButtonsTrait.php b/libraries/src/Toolbar/CoreButtonsTrait.php
index 65425972aeb6c..622ef4d45b223 100644
--- a/libraries/src/Toolbar/CoreButtonsTrait.php
+++ b/libraries/src/Toolbar/CoreButtonsTrait.php
@@ -332,7 +332,7 @@ public function delete(string $task, string $text = 'JTOOLBAR_DELETE'): ConfirmB
 	 */
 	public function trash(string $task, string $text = 'JTOOLBAR_TRASH'): StandardButton
 	{
-		return $this->standardButton('trash', $text)
+		return $this->standardButton('fa-trash', $text)
 			->task($task);
 	}
 

From dda661117c406d44c58a256b8cb0c1d49110d007 Mon Sep 17 00:00:00 2001
From: "Troy T. Hall" <programming@hallhome.us>
Date: Wed, 2 Sep 2020 00:14:11 -0500
Subject: [PATCH 4/5] make icons even width

---
 layouts/joomla/content/icons.php                   | 2 +-
 layouts/joomla/content/icons/create.php            | 2 +-
 layouts/joomla/content/icons/edit.php              | 2 +-
 layouts/joomla/content/icons/edit_lock.php         | 2 +-
 layouts/joomla/content/info_block/associations.php | 2 +-
 layouts/joomla/content/info_block/author.php       | 2 +-
 layouts/joomla/content/info_block/category.php     | 2 +-
 layouts/joomla/content/info_block/create_date.php  | 2 +-
 layouts/joomla/content/info_block/hits.php         | 2 +-
 layouts/joomla/content/info_block/modify_date.php  | 2 +-
 layouts/joomla/content/info_block/publish_date.php | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/layouts/joomla/content/icons.php b/layouts/joomla/content/icons.php
index fdb73056c00f5..ec5e088568ed0 100644
--- a/layouts/joomla/content/icons.php
+++ b/layouts/joomla/content/icons.php
@@ -23,7 +23,7 @@
 		<div class="btn-group float-right">
 			<button class="btn btn-secondary dropdown-toggle" type="button" id="dropdownMenuButton-<?php echo $articleId; ?>" aria-label="<?php echo Text::_('JUSER_TOOLS'); ?>"
 				data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-				<span class="fas fa-cog" aria-hidden="true"></span>
+				<span class="fas fa-cog fa-fw" aria-hidden="true"></span>
 			</button>
 			<div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuButton-<?php echo $articleId; ?>">
 				<?php echo HTMLHelper::_('icon.edit', $displayData['item'], $displayData['params']); ?>
diff --git a/layouts/joomla/content/icons/create.php b/layouts/joomla/content/icons/create.php
index 281c589f0fa5f..a26fd9241f97f 100644
--- a/layouts/joomla/content/icons/create.php
+++ b/layouts/joomla/content/icons/create.php
@@ -15,7 +15,7 @@
 
 ?>
 <?php if ($params->get('show_icons')) : ?>
-	<span class="fas fa-plus" aria-hidden="true"></span>
+	<span class="fas fa-plus fa-fw" aria-hidden="true"></span>
 	<?php echo Text::_('JNEW'); ?>
 <?php else : ?>
 	<?php echo Text::_('JNEW') . '&#160;'; ?>
diff --git a/layouts/joomla/content/icons/edit.php b/layouts/joomla/content/icons/edit.php
index 16a8a0e0c273f..db7a237746869 100644
--- a/layouts/joomla/content/icons/edit.php
+++ b/layouts/joomla/content/icons/edit.php
@@ -27,5 +27,5 @@
 }
 
 ?>
-<span class="hasTooltip fas fa-<?php echo $icon; ?>" title="<?php echo HTMLHelper::tooltipText(Text::_('COM_CONTENT_EDIT_ITEM'), $overlib, 0, 0); ?>"></span>
+<span class="hasTooltip fas fa-<?php echo $icon; ?> fa-fw" title="<?php echo HTMLHelper::tooltipText(Text::_('COM_CONTENT_EDIT_ITEM'), $overlib, 0, 0); ?>"></span>
 <?php echo Text::_('JGLOBAL_EDIT'); ?>
diff --git a/layouts/joomla/content/icons/edit_lock.php b/layouts/joomla/content/icons/edit_lock.php
index 60a3efe6a3e8b..b502356bda9be 100644
--- a/layouts/joomla/content/icons/edit_lock.php
+++ b/layouts/joomla/content/icons/edit_lock.php
@@ -15,5 +15,5 @@
 $tooltip = $displayData['tooltip'];
 
 ?>
-<span class="hasTooltip fas fa-lock" title="<?php echo HTMLHelper::tooltipText($tooltip . '', 0); ?>"></span>
+<span class="hasTooltip fas fa-lock fa-fw" title="<?php echo HTMLHelper::tooltipText($tooltip . '', 0); ?>"></span>
 <?php echo Text::_('JLIB_HTML_CHECKED_OUT'); ?>
diff --git a/layouts/joomla/content/info_block/associations.php b/layouts/joomla/content/info_block/associations.php
index a3e395afcdbb0..3c4bebb97ebf3 100644
--- a/layouts/joomla/content/info_block/associations.php
+++ b/layouts/joomla/content/info_block/associations.php
@@ -19,7 +19,7 @@
 <?php $associations = $displayData['item']->associations; ?>
 
 <dd class="association">
-	<span class="fas fa-globe" aria-hidden="true"></span>
+	<span class="fas fa-globe fa-fw" aria-hidden="true"></span>
 	<?php echo Text::_('JASSOCIATIONS'); ?>
 	<?php foreach ($associations as $association) : ?>
 		<?php if ($displayData['item']->params->get('flags', 1) && $association['language']->image) : ?>
diff --git a/layouts/joomla/content/info_block/author.php b/layouts/joomla/content/info_block/author.php
index 804ed3d7ff182..a4abdd63787d3 100644
--- a/layouts/joomla/content/info_block/author.php
+++ b/layouts/joomla/content/info_block/author.php
@@ -14,7 +14,7 @@
 
 ?>
 <dd class="createdby" itemprop="author" itemscope itemtype="https://schema.org/Person">
-	<span class="fas fa-user" aria-hidden="true"></span>
+	<span class="fas fa-user fa-fw" aria-hidden="true"></span>
 	<?php $author = ($displayData['item']->created_by_alias ?: $displayData['item']->author); ?>
 	<?php $author = '<span itemprop="name">' . $author . '</span>'; ?>
 	<?php if (!empty($displayData['item']->contact_link ) && $displayData['params']->get('link_author') == true) : ?>
diff --git a/layouts/joomla/content/info_block/category.php b/layouts/joomla/content/info_block/category.php
index fa1e66649c9cc..0c3035f3b4ee8 100644
--- a/layouts/joomla/content/info_block/category.php
+++ b/layouts/joomla/content/info_block/category.php
@@ -15,7 +15,7 @@
 
 ?>
 <dd class="category-name">
-	<span class="fas fa-folder-open" aria-hidden="true"></span>
+	<span class="fas fa-folder-open fa-fw" aria-hidden="true"></span>
 	<?php $title = $this->escape($displayData['item']->category_title); ?>
 	<?php if ($displayData['params']->get('link_category') && !empty($displayData['item']->catid)) : ?>
 		<?php $url = '<a href="' . Route::_(
diff --git a/layouts/joomla/content/info_block/create_date.php b/layouts/joomla/content/info_block/create_date.php
index 13cbd3f8e2cbe..073eb6ea910c5 100644
--- a/layouts/joomla/content/info_block/create_date.php
+++ b/layouts/joomla/content/info_block/create_date.php
@@ -14,7 +14,7 @@
 
 ?>
 <dd class="create">
-	<span class="fas fa-calendar" aria-hidden="true"></span>
+	<span class="fas fa-calendar fa-fw" aria-hidden="true"></span>
 	<time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->created, 'c'); ?>" itemprop="dateCreated">
 		<?php echo Text::sprintf('COM_CONTENT_CREATED_DATE_ON', HTMLHelper::_('date', $displayData['item']->created, Text::_('DATE_FORMAT_LC3'))); ?>
 	</time>
diff --git a/layouts/joomla/content/info_block/hits.php b/layouts/joomla/content/info_block/hits.php
index 2c0f324255b3b..6bb354529b5be 100644
--- a/layouts/joomla/content/info_block/hits.php
+++ b/layouts/joomla/content/info_block/hits.php
@@ -13,7 +13,7 @@
 
 ?>
 <dd class="hits">
-	<span class="fas fa-eye" aria-hidden="true"></span>
+	<span class="fas fa-eye fa-fw" aria-hidden="true"></span>
 	<meta itemprop="interactionCount" content="UserPageVisits:<?php echo $displayData['item']->hits; ?>">
 	<?php echo Text::sprintf('COM_CONTENT_ARTICLE_HITS', $displayData['item']->hits); ?>
 </dd>
diff --git a/layouts/joomla/content/info_block/modify_date.php b/layouts/joomla/content/info_block/modify_date.php
index 48ec4b59c5cbe..830e595e8d903 100644
--- a/layouts/joomla/content/info_block/modify_date.php
+++ b/layouts/joomla/content/info_block/modify_date.php
@@ -14,7 +14,7 @@
 
 ?>
 <dd class="modified">
-	<span class="fas fa-calendar" aria-hidden="true"></span>
+	<span class="fas fa-calendar fa-fw" aria-hidden="true"></span>
 	<time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->modified, 'c'); ?>" itemprop="dateModified">
 		<?php echo Text::sprintf('COM_CONTENT_LAST_UPDATED', HTMLHelper::_('date', $displayData['item']->modified, Text::_('DATE_FORMAT_LC3'))); ?>
 	</time>
diff --git a/layouts/joomla/content/info_block/publish_date.php b/layouts/joomla/content/info_block/publish_date.php
index 7c3797102d514..a13123048cf53 100644
--- a/layouts/joomla/content/info_block/publish_date.php
+++ b/layouts/joomla/content/info_block/publish_date.php
@@ -14,7 +14,7 @@
 
 ?>
 <dd class="published">
-	<span class="fas fa-calendar" aria-hidden="true"></span>
+	<span class="fas fa-calendar fa-fw" aria-hidden="true"></span>
 	<time datetime="<?php echo HTMLHelper::_('date', $displayData['item']->publish_up, 'c'); ?>" itemprop="datePublished">
 		<?php echo Text::sprintf('COM_CONTENT_PUBLISHED_DATE_ON', HTMLHelper::_('date', $displayData['item']->publish_up, Text::_('DATE_FORMAT_LC3'))); ?>
 	</time>

From 8decde9d188334ee112e42a8de9f0abfa9e2dc5e Mon Sep 17 00:00:00 2001
From: "Troy T. Hall" <programming@hallhome.us>
Date: Wed, 2 Sep 2020 00:42:48 -0500
Subject: [PATCH 5/5] reverted improper change.

---
 libraries/src/Toolbar/CoreButtonsTrait.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/src/Toolbar/CoreButtonsTrait.php b/libraries/src/Toolbar/CoreButtonsTrait.php
index 622ef4d45b223..65425972aeb6c 100644
--- a/libraries/src/Toolbar/CoreButtonsTrait.php
+++ b/libraries/src/Toolbar/CoreButtonsTrait.php
@@ -332,7 +332,7 @@ public function delete(string $task, string $text = 'JTOOLBAR_DELETE'): ConfirmB
 	 */
 	public function trash(string $task, string $text = 'JTOOLBAR_TRASH'): StandardButton
 	{
-		return $this->standardButton('fa-trash', $text)
+		return $this->standardButton('trash', $text)
 			->task($task);
 	}