From a22f6d00c7b6fe48b4b5c2c9d82b5ed86e34c495 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sun, 16 May 2021 21:54:55 -0400
Subject: [PATCH] Extension page markup tweaks

---
 css/admin.css                                  | 11 +++++++----
 templates/CRM/Admin/Page/Extensions/AddNew.tpl |  2 +-
 templates/CRM/Admin/Page/Extensions/Main.tpl   | 10 +++++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/css/admin.css b/css/admin.css
index e6964e7c13..f32f51f710 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -44,15 +44,18 @@
   text-align: center;
 }
 
-#crm-container .crm-extensions-stage {
-  float: right;
+.crm-container .crm-extensions-version {
+  white-space: nowrap;
+}
+.crm-container .crm-extensions-stage {
+  margin-left: 5px;
 }
 
-#crm-container .crm-extensions-stage > .fa-flask {
+.crm-container .crm-extensions-stage.fa-flask {
   color: #eba12d;
 }
 
-#crm-container .crm-extensions-stage > .fa-check-circle {
+.crm-container .crm-extensions-stage.fa-check-circle {
   color: #00994D;
 }
 
diff --git a/templates/CRM/Admin/Page/Extensions/AddNew.tpl b/templates/CRM/Admin/Page/Extensions/AddNew.tpl
index 029e564e8d..570e3eafc1 100644
--- a/templates/CRM/Admin/Page/Extensions/AddNew.tpl
+++ b/templates/CRM/Admin/Page/Extensions/AddNew.tpl
@@ -24,7 +24,7 @@ Depends: CRM/common/enableDisableApi.tpl and CRM/common/jsortable.tpl
           <td class="crm-extensions-label">
               <a class="collapsed" href="#"></a>&nbsp;<strong>{$row.label}</strong><br/>({$row.key})
           </td>
-          <td class="crm-extensions-label">{$row.version}</td>
+          <td class="crm-extensions-version">{$row.version|escape}</td>
           <td class="crm-extensions-description">{$row.type|capitalize}</td>
           <td>{$row.action|replace:'xx':$row.id}</td>
         </tr>
diff --git a/templates/CRM/Admin/Page/Extensions/Main.tpl b/templates/CRM/Admin/Page/Extensions/Main.tpl
index 70bd3d6440..3afbdb1d72 100644
--- a/templates/CRM/Admin/Page/Extensions/Main.tpl
+++ b/templates/CRM/Admin/Page/Extensions/Main.tpl
@@ -26,12 +26,12 @@ Depends: CRM/common/enableDisableApi.tpl and CRM/common/jsortable.tpl
                 <div class="crm-extensions-upgrade">{$remoteExtensionRows[$extKey].upgradelink}</div>
               {/if}
           </td>
-          <td class="crm-extensions-label">{$row.statusLabel} {if $row.upgradable}<br/>({ts}Outdated{/ts}){/if}</td>
-          <td class="crm-extensions-label">{$row.version|escape}
+          <td class="crm-extensions-status">{$row.statusLabel} {if $row.upgradable}<br/>({ts}Outdated{/ts}){/if}</td>
+          <td class="crm-extensions-version">{$row.version|escape}
             {if ($row.develStage and $row.develStage != 'stable') or preg_match(";(alpha|beta|dev);", $row.version)}
-              <span class="crm-extensions-stage">{icon icon="fa-flask"}{ts}This is a pre-release version. For more details, see the expanded description.{/ts}{/icon}</span>
-              {else}
-              <span class="crm-extensions-stage">{icon icon="fa-check-circle"}{/icon}</span>
+              {icon icon="fa-flask crm-extensions-stage"}{ts}This is a pre-release version. For more details, see the expanded description.{/ts}{/icon}
+            {else}
+              {icon icon="fa-check-circle crm-extensions-stage"}{ts}This is a stable release version.{/ts}{/icon}
             {/if}
           </td>
           <td class="crm-extensions-description">{$row.type|escape|capitalize}</td>
-- 
2.25.1