From 9f0a095405397ef4a257764ae7ae95882e8ea215 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 28 Dec 2022 12:23:09 +0000
Subject: [PATCH] DEV: Add extra whitespace to tidy up prettified templates

---
 .../admin/addon/components/webhook-events.hbs | 30 +++++++-------
 .../admin-report-trust-level-counts.hbs       | 40 ++++++++++++-------
 .../components/email-styles-editor.hbs        | 16 ++++++--
 .../templates/components/embeddable-host.hbs  | 32 +++++++++------
 .../admin/addon/templates/email-received.hbs  |  8 ++--
 .../app/templates/components/d-button.hbs     |  9 +++--
 .../app/templates/components/tag-list.hbs     | 11 ++++-
 .../components/composer-presence-display.hbs  |  7 ++--
 .../components/topic-presence-display.hbs     | 18 ++++-----
 9 files changed, 104 insertions(+), 67 deletions(-)

diff --git a/app/assets/javascripts/admin/addon/components/webhook-events.hbs b/app/assets/javascripts/admin/addon/components/webhook-events.hbs
index d204659e2cf..c163126cd8a 100644
--- a/app/assets/javascripts/admin/addon/components/webhook-events.hbs
+++ b/app/assets/javascripts/admin/addon/components/webhook-events.hbs
@@ -15,21 +15,21 @@
     <LoadMore @selector=".web-hook-events li" @action={{this.loadMore}}>
       <div class="web-hook-events content-list">
         <div class="heading-container">
-          <div class="col heading first status">{{i18n
-              "admin.web_hooks.events.status"
-            }}</div>
-          <div class="col heading event-id">{{i18n
-              "admin.web_hooks.events.event_id"
-            }}</div>
-          <div class="col heading timestamp">{{i18n
-              "admin.web_hooks.events.timestamp"
-            }}</div>
-          <div class="col heading completion">{{i18n
-              "admin.web_hooks.events.completion"
-            }}</div>
-          <div class="col heading actions">{{i18n
-              "admin.web_hooks.events.actions"
-            }}</div>
+          <div class="col heading first status">
+            {{i18n "admin.web_hooks.events.status"}}
+          </div>
+          <div class="col heading event-id">
+            {{i18n "admin.web_hooks.events.event_id"}}
+          </div>
+          <div class="col heading timestamp">
+            {{i18n "admin.web_hooks.events.timestamp"}}
+          </div>
+          <div class="col heading completion">
+            {{i18n "admin.web_hooks.events.completion"}}
+          </div>
+          <div class="col heading actions">
+            {{i18n "admin.web_hooks.events.actions"}}
+          </div>
         </div>
 
         {{#if this.hasIncoming}}
diff --git a/app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs b/app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs
index 2089a61287b..81fce07818f 100644
--- a/app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/admin-report-trust-level-counts.hbs
@@ -1,16 +1,26 @@
 <td class="title">{{this.report.title}}</td>
-<td class="value"><LinkTo @route="adminUsersList.show" @model="newuser">{{number
-      (value-at-tl this.report.data level="0")
-    }}</LinkTo></td>
-<td class="value"><LinkTo @route="adminUsersList.show" @model="basic">{{number
-      (value-at-tl this.report.data level="1")
-    }}</LinkTo></td>
-<td class="value"><LinkTo @route="adminUsersList.show" @model="member">{{number
-      (value-at-tl this.report.data level="2")
-    }}</LinkTo></td>
-<td class="value"><LinkTo @route="adminUsersList.show" @model="regular">{{number
-      (value-at-tl this.report.data level="3")
-    }}</LinkTo></td>
-<td class="value"><LinkTo @route="adminUsersList.show" @model="leader">{{number
-      (value-at-tl this.report.data level="4")
-    }}</LinkTo></td>
\ No newline at end of file
+<td class="value">
+  <LinkTo @route="adminUsersList.show" @model="newuser">
+    {{number (value-at-tl this.report.data level="0")}}
+  </LinkTo>
+</td>
+<td class="value">
+  <LinkTo @route="adminUsersList.show" @model="basic">
+    {{number (value-at-tl this.report.data level="1")}}
+  </LinkTo>
+</td>
+<td class="value">
+  <LinkTo @route="adminUsersList.show" @model="member">
+    {{number (value-at-tl this.report.data level="2")}}
+  </LinkTo>
+</td>
+<td class="value">
+  <LinkTo @route="adminUsersList.show" @model="regular">
+    {{number (value-at-tl this.report.data level="3")}}
+  </LinkTo>
+</td>
+<td class="value">
+  <LinkTo @route="adminUsersList.show" @model="leader">
+    {{number (value-at-tl this.report.data level="4")}}
+  </LinkTo>
+</td>
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs b/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
index 8052413d0a5..1ca8055f6b5 100644
--- a/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/email-styles-editor.hbs
@@ -2,16 +2,24 @@
   <div class="admin-controls">
     <nav>
       <ul class="nav nav-pills">
-        <li><LinkTo
+        <li>
+          <LinkTo
             @route="adminCustomizeEmailStyle.edit"
             @model="html"
             @replace={{true}}
-          >{{i18n "admin.customize.email_style.html"}}</LinkTo></li>
-        <li><LinkTo
+          >
+            {{i18n "admin.customize.email_style.html"}}
+          </LinkTo>
+        </li>
+        <li>
+          <LinkTo
             @route="adminCustomizeEmailStyle.edit"
             @model="css"
             @replace={{true}}
-          >{{i18n "admin.customize.email_style.css"}}</LinkTo></li>
+          >
+            {{i18n "admin.customize.email_style.css"}}
+          </LinkTo>
+        </li>
       </ul>
     </nav>
   </div>
diff --git a/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs b/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs
index be84918cdab..f37f242ba09 100644
--- a/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs
+++ b/app/assets/javascripts/admin/addon/templates/components/embeddable-host.hbs
@@ -50,18 +50,26 @@
     />
   </td>
 {{else}}
-  <td><div class="label">{{i18n
-        "admin.embedding.host"
-      }}</div>{{this.host.host}}</td>
-  <td><div class="label">{{i18n
-        "admin.embedding.class_name"
-      }}</div>{{this.host.class_name}}</td>
-  <td><div class="label">{{i18n
-        "admin.embedding.allowed_paths"
-      }}</div>{{this.host.allowed_paths}}</td>
-  <td><div class="label">{{i18n
-        "admin.embedding.category"
-      }}</div>{{category-badge this.host.category allowUncategorized=true}}</td>
+  <td>
+    <div class="label">{{i18n "admin.embedding.host"}}</div>
+    {{this.host.host}}
+  </td>
+  <td>
+    <div class="label">
+      {{i18n "admin.embedding.class_name"}}
+    </div>
+    {{this.host.class_name}}
+  </td>
+  <td>
+    <div class="label">
+      {{i18n "admin.embedding.allowed_paths"}}
+    </div>
+    {{this.host.allowed_paths}}
+  </td>
+  <td>
+    <div class="label">{{i18n "admin.embedding.category"}}</div>
+    {{category-badge this.host.category allowUncategorized=true}}
+  </td>
   <td class="controls">
     <DButton @icon="pencil-alt" @action={{action "edit"}} />
     <DButton
diff --git a/app/assets/javascripts/admin/addon/templates/email-received.hbs b/app/assets/javascripts/admin/addon/templates/email-received.hbs
index f96ab09ed90..a1802e672e9 100644
--- a/app/assets/javascripts/admin/addon/templates/email-received.hbs
+++ b/app/assets/javascripts/admin/addon/templates/email-received.hbs
@@ -58,9 +58,11 @@
           </td>
         </tr>
       {{else}}
-        <tr><td colspan="4">{{i18n
-              "admin.email.incoming_emails.none"
-            }}</td></tr>
+        <tr>
+          <td colspan="4">
+            {{i18n "admin.email.incoming_emails.none"}}
+          </td>
+        </tr>
       {{/each}}
     </tbody>
   </table>
diff --git a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
index 6b2268e4cf1..62d4ff398e8 100644
--- a/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/d-button.hbs
@@ -30,9 +30,12 @@
   {{/if}}
 
   {{~#if this.computedLabel~}}
-    <span class="d-button-label">{{html-safe this.computedLabel}}{{#if
-        this.ellipsis
-      }}&hellip;{{/if}}</span>
+    <span class="d-button-label">
+      {{~html-safe this.computedLabel~}}
+      {{~#if this.ellipsis~}}
+        &hellip;
+      {{~/if~}}
+    </span>
   {{~else if (not (has-block))~}}
     &#8203;
     {{! Zero-width space character, so icon-only button height = regular button height }}
diff --git a/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs b/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
index 17e9536d790..19668461028 100644
--- a/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
+++ b/app/assets/javascripts/discourse/app/templates/components/tag-list.hbs
@@ -16,8 +16,15 @@
       pmOnly=tag.pmOnly
       tagsForUser=this.tagsForUser
     }}
-    {{#if tag.pmOnly}}{{d-icon "envelope"}}{{/if}}{{#if tag.totalCount}}
-      <span class="tag-count">x {{tag.totalCount}}</span>{{/if}}
+    {{#if tag.pmOnly}}
+      {{d-icon "envelope"}}
+    {{/if}}
+    {{#if tag.totalCount}}
+      <span class="tag-count">
+        x
+        {{tag.totalCount}}
+      </span>
+    {{/if}}
   </div>
 {{/each}}
 <div class="clearfix"></div>
\ No newline at end of file
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.hbs
index 43b0abe8762..05493ad3379 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/composer-presence-display.hbs
@@ -17,10 +17,9 @@
       {{~""~}}
       <span class="wave">
         {{~""~}}
-        <span class="dot">.</span><span class="dot">.</span><span
-          class="dot"
-        >.</span>
-        {{~""~}}
+        <span class="dot">.</span>{{~""~}}
+        <span class="dot">.</span>{{~""~}}
+        <span class="dot">.</span>{{~""~}}
       </span>
     </span>
   </div>
diff --git a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.hbs b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.hbs
index 9b951e0b4fd..cd4384eec8f 100644
--- a/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.hbs
+++ b/plugins/discourse-presence/assets/javascripts/discourse/components/topic-presence-display.hbs
@@ -8,15 +8,15 @@
       {{/each}}
     </div>
     <span class="presence-text">
-      <span class="description">{{i18n
-          "presence.replying_to_topic"
-          count=this.users.length
-        }}</span>{{! (using comment to stop whitespace)
-  }}<span
-        class="wave"
-      ><span class="dot">.</span><span class="dot">.</span><span
-          class="dot"
-        >.</span></span>
+      <span class="description">
+        {{i18n "presence.replying_to_topic" count=this.users.length}}
+      </span>
+      <span class="wave">
+        {{~""~}}
+        <span class="dot">.</span>{{~""~}}
+        <span class="dot">.</span>{{~""~}}
+        <span class="dot">.</span>{{~""~}}
+      </span>
     </span>
   </div>
 {{/if}}
\ No newline at end of file