DEV: Format mustache templates (#473)

Correct indentation, whitespace, and double-quotes.
discourse · Apr 19, 2021 · 907be5b · 907be5b
1 parent efae3fa
commit 907be5b
Show file tree

Hide file tree

Showing 22 changed files with 131 additions and 82 deletions.
diff --git a/spec/lib/onebox/engine/github_folder_onebox_spec.rb b/spec/lib/onebox/engine/github_folder_onebox_spec.rb
@@ -15,7 +15,7 @@
 
     describe "#to_html" do
       it "includes link to folder with truncated display path" do
-        expect(html).to include("<a href='https://github.com/discourse/discourse/tree/master/spec/fixtures' target=\"_blank\" rel=\"noopener\">master/spec/fixtures</a>")
+        expect(html).to include("<a href=\"https://github.com/discourse/discourse/tree/master/spec/fixtures\" target=\"_blank\" rel=\"noopener\">master/spec/fixtures</a>")
       end
 
       it "includes repository name" do
@@ -38,7 +38,7 @@
     end
 
     it "extracts subtitles when linking to docs" do
-      expect(@onebox.to_html).to include("<a href='https://github.com/discourse/discourse#setting-up-discourse' target=\"_blank\" rel=\"noopener\">discourse/discourse - Setting up Discourse</a>")
+      expect(@onebox.to_html).to include("<a href=\"https://github.com/discourse/discourse#setting-up-discourse\" target=\"_blank\" rel=\"noopener\">discourse/discourse - Setting up Discourse</a>")
     end
   end
 

diff --git a/templates/_layout.mustache b/templates/_layout.mustache
@@ -3,19 +3,23 @@
     {{#favicon}}
       <img src="{{favicon}}" class="site-icon"/>
     {{/favicon}}
+
     {{#article_published_time}}
-      <a href="{{link}}" target='_blank' rel='noopener' title="{{article_published_time_title}}">{{domain}} &ndash; {{article_published_time}}</a>
+      <a href="{{link}}" target="_blank" rel="noopener" title="{{article_published_time_title}}">{{domain}} &ndash; {{article_published_time}}</a>
     {{/article_published_time}}
     {{^article_published_time}}
-      <a href="{{link}}" target='_blank' rel='noopener'>{{domain}}</a>
+      <a href="{{link}}" target="_blank" rel="noopener">{{domain}}</a>
     {{/article_published_time}}
   </header>
+
   <article class="onebox-body">
     {{{view}}}
   </article>
+
   <div class="onebox-metadata">
     {{#metadata_1_label}}<span style="float: left;">{{metadata_1_label}}: {{metadata_1_value}}</span>{{/metadata_1_label}}
     {{#metadata_2_label}}<span style="float: right;">{{metadata_2_label}}: {{metadata_2_value}}</span>{{/metadata_2_label}}
   </div>
+
   <div style="clear: both"></div>
 </aside>
diff --git a/templates/allowlistedgeneric.mustache b/templates/allowlistedgeneric.mustache
@@ -1,6 +1,6 @@
 {{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
 
-<h3><a href='{{link}}' target="_blank" rel="noopener">{{title}}</a></h3>
+<h3><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h3>
 
 {{#description}}
 <p>{{description}}</p>

diff --git a/templates/amazon.mustache b/templates/amazon.mustache
@@ -1,8 +1,11 @@
-{{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
+{{#image}}<img src="{{image}}" class="thumbnail">{{/image}}
+
+<h3><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h3>
 
-<h3><a href='{{link}}' target='_blank' rel='noopener'>{{title}}</a></h3>
 {{#by_info}}<b>{{by_info}}</b>{{/by_info}}
+
 <p>{{description}}</p>
+
 <p>
   {{#rating}}{{rating}}{{/rating}}
   {{#isbn_asin}}{{isbn_asin_text}}: {{isbn_asin}}, {{/isbn_asin}}

diff --git a/templates/githubblob.mustache b/templates/githubblob.mustache
@@ -1,42 +1,52 @@
 <h4><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h4>
+
 {{^has_lines}}
-{{#model_file}}
-<iframe class="render-viewer" width="{{width}}" height="{{height}}" src="{{content}}" sandbox="allow-scripts allow-same-origin allow-top-navigation ">
-Viewer requires iframe.
-</iframe>
-{{/model_file}}
-{{^model_file}}
-<pre><code class='{{lang}}'>{{content}}</code></pre>
-{{/model_file}}
+  {{#model_file}}
+    <iframe class="render-viewer" width="{{width}}" height="{{height}}" src="{{content}}" sandbox="allow-scripts allow-same-origin allow-top-navigation ">
+      Viewer requires iframe.
+    </iframe>
+  {{/model_file}}
+
+  {{^model_file}}
+    <pre><code class="{{lang}}">{{content}}</code></pre>
+  {{/model_file}}
 {{/has_lines}}
+
 {{#has_lines}}
-{{! This is a template comment  | Sample rules for this box
-<style>
-pre.onebox code ol{
-	margin-left:0px;
-}
-pre.onebox code ol .lines{
-	margin-left:30px;
-}
-pre.onebox code ol.lines li {
-	list-style-type: decimal;
-	margin-left:45px;
-}
-pre.onebox code li{
-	list-style-type: none;
-	background-color:#fff;
-	border-bottom:1px solid #F0F0F0;
-	padding-left:5px;
+  {{! This is a template comment  | Sample rules for this box
+  <style>
+  pre.onebox code ol{
+    margin-left:0px;
+  }
+  pre.onebox code ol .lines{
+    margin-left:30px;
+  }
+  pre.onebox code ol.lines li {
+    list-style-type: decimal;
+    margin-left:45px;
+  }
+  pre.onebox code li{
+    list-style-type: none;
+    background-color:#fff;
+    border-bottom:1px solid #F0F0F0;
+    padding-left:5px;
+
+  }
+  pre.onebox code li.selected{
+    background-color:#cfc
+  }
+  </style>
+  }}
 
-}
-pre.onebox code li.selected{
-	background-color:#cfc
-}
-</style>
-}}
-<pre class='onebox' ><code class='{{lang}}'><ol class='start lines' start="{{cr_results.from}}" style='counter-reset: li-counter {{cr_results.from_minus_one}} ;'>
-{{#lines}}<li{{#selected}} class="selected"{{/selected}}>{{data}}</li>{{/lines}}
-</ol></code></pre>
+  <pre class="onebox">
+    <code class="{{lang}}">
+      <ol class="start lines" start="{{cr_results.from}}" style="counter-reset: li-counter {{cr_results.from_minus_one}} ;">
+        {{#lines}}
+          <li{{#selected}} class="selected"{{/selected}}>{{data}}</li>
+        {{/lines}}
+      </ol>
+    </code>
+  </pre>
 {{/has_lines}}
 
 {{#truncated}}

diff --git a/templates/githubcommit.mustache b/templates/githubcommit.mustache
@@ -10,15 +10,14 @@
 
     <div class="github-info">
       <div class="date">
-        committed <span class="discourse-local-date" data-format='ll' data-date="{{committed_at_date}}" data-time="{{committed_at_time}}" data-timezone="UTC">{{committed_at}}</span>
+        committed <span class="discourse-local-date" data-format="ll" data-date="{{committed_at_date}}" data-time="{{committed_at_time}}" data-timezone="UTC">{{committed_at}}</span>
       </div>
 
       <div class="user">
         <a href="{{author.html_url}}" target="_blank" rel="noopener">
           <img alt="{{author.login}}" src="{{author.avatar_url}}" class="onebox-avatar-inline" width="20" height="20">
           {{author.login}}
         </a>
-
       </div>
 
       <div class="lines" title="changed {{files.length}} files with {{stats.additions}} additions and {{stats.deletions}} deletions">
@@ -28,7 +27,6 @@
         </a>
       </div>
     </div>
-
   </div>
 </div>
 

diff --git a/templates/githubfolder.mustache b/templates/githubfolder.mustache
@@ -1,9 +1,9 @@
 {{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
 
-<h3><a href='{{link}}' target="_blank" rel="noopener">{{title}}</a></h3>
+<h3><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h3>
 
 {{#path}}
-<p><a href='{{link}}' target="_blank" rel="noopener">{{path}}</a></p>
+  <p><a href="{{link}}" target="_blank" rel="noopener">{{path}}</a></p>
 {{/path}}
 
 {{#description}}

diff --git a/templates/githubgist.mustache b/templates/githubgist.mustache
@@ -1,12 +1,15 @@
 <h4><a href="{{link}}" target="_blank" rel="noopener">{{link}}</a></h4>
+
 {{#gist_files}}
-<h5>{{filename}}</h5>
-<pre><code class='{{language}}'>{{content}}</code></pre>
-{{#truncated?}}This file has been truncated. <a href="{{link}}" target="_blank" rel="noopener">show original</a>{{/truncated?}}
+  <h5>{{filename}}</h5>
+  <pre><code class="{{language}}">{{content}}</code></pre>
+  {{#truncated?}}
+    This file has been truncated. <a href="{{link}}" target="_blank" rel="noopener">show original</a>
+  {{/truncated?}}
 {{/gist_files}}
 
 <p>
-{{#truncated_files?}}
-  There are more than three files. <a href="{{link}}" target="_blank" rel="noopener">show original</a>
-{{/truncated_files?}}
+  {{#truncated_files?}}
+    There are more than three files. <a href="{{link}}" target="_blank" rel="noopener">show original</a>
+  {{/truncated_files?}}
 </p>
diff --git a/templates/githubissue.mustache b/templates/githubissue.mustache
@@ -10,12 +10,12 @@
 
     <div class="github-info">
       <div class="date">
-        opened <span class="discourse-local-date" data-format='ll' data-date="{{created_at_date}}" data-time="{{created_at_time}}" data-timezone="UTC">{{created_at}}</span>
+        opened <span class="discourse-local-date" data-format="ll" data-date="{{created_at_date}}" data-time="{{created_at_time}}" data-timezone="UTC">{{created_at}}</span>
       </div>
 
       {{#closed_at}}
         <div class="date">
-          closed <span class="discourse-local-date" data-format='ll' data-date="{{closed_at_date}}" data-time="{{closed_at_time}}" data-timezone="UTC">{{closed_at}}</span>
+          closed <span class="discourse-local-date" data-format="ll" data-date="{{closed_at_date}}" data-time="{{closed_at_time}}" data-timezone="UTC">{{closed_at}}</span>
         </div>
       {{/closed_at}}
 
@@ -27,7 +27,7 @@
       </div>
     </div>
 
-    <div class='labels'>
+    <div class="labels">
       {{#labels}}
         <span style="display:inline-block;margin-top:2px;background-color: #B8B8B8;padding: 2px;border-radius: 4px;color: #fff;margin-left: 3px;">{{name}}</span>
       {{/labels}}

diff --git a/templates/githubpullrequest.mustache b/templates/githubpullrequest.mustache
@@ -14,7 +14,7 @@
 
     <div class="github-info">
       <div class="date">
-        opened <span class="discourse-local-date" data-format='ll' data-date="{{created_at_date}}" data-time="{{created_at_time}}" data-timezone="UTC">{{created_at}}</span>
+        opened <span class="discourse-local-date" data-format="ll" data-date="{{created_at_date}}" data-time="{{created_at_time}}" data-timezone="UTC">{{created_at}}</span>
       </div>
 
       <div class="user">

diff --git a/templates/gitlabblob.mustache b/templates/gitlabblob.mustache
@@ -1,12 +1,19 @@
 <h4><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h4>
+
 {{^has_lines}}
-<pre><code class='{{lang}}'>{{content}}</code></pre>
+  <pre><code class="{{lang}}">{{content}}</code></pre>
 {{/has_lines}}
 
 {{#has_lines}}
-<pre class='onebox'><code class='{{lang}}'><ol class='start lines' start="{{cr_results.from}}" style='counter-reset: li-counter {{cr_results.from_minus_one}} ;'>
-{{#lines}}<li{{#selected}} class="selected"{{/selected}}>{{data}}</li>{{/lines}}
-</ol></code></pre>
+  <pre class="onebox">
+    <code class="{{lang}}">
+      <ol class="start lines" start="{{cr_results.from}}" style="counter-reset: li-counter {{cr_results.from_minus_one}} ;">
+        {{#lines}}
+          <li{{#selected}} class="selected"{{/selected}}>{{data}}</li>
+        {{/lines}}
+      </ol>
+    </code>
+  </pre>
 {{/has_lines}}
 
 {{#truncated}}

diff --git a/templates/googledocs.mustache b/templates/googledocs.mustache
@@ -1,5 +1,5 @@
-<a href='{{link}}' target="_blank" rel="noopener"><span class='googledocs-onebox-logo g-{{type}}-logo'></span></a>
+<a href="{{link}}" target="_blank" rel="noopener"><span class="googledocs-onebox-logo g-{{type}}-logo"></span></a>
 
-<h3><a href='{{link}}' target="_blank" rel="noopener">{{title}}</a></h3>
+<h3><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h3>
 
 <p>{{description}}</p>
diff --git a/templates/googledrive.mustache b/templates/googledrive.mustache
@@ -1,8 +1,8 @@
 {{^image}}
-  <a href='{{link}}' target="_blank" rel="noopener"><span class='googledocs-onebox-logo g-drive-logo'></span></a>
+  <a href="{{link}}" target="_blank" rel="noopener"><span class="googledocs-onebox-logo g-drive-logo"></span></a>
 {{/image}}
 
-{{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
+{{#image}}<img src="{{image}}" class="thumbnail">{{/image}}
 
 <h3><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h3>
 

diff --git a/templates/googleplayapp.mustache b/templates/googleplayapp.mustache
@@ -1,4 +1,5 @@
 <h3>{{title}}</h3>
-<img src="{{image}}" class="thumbnail"/>
+
+<img src="{{image}}" class="thumbnail">
 <p>{{description}}</p>
 <em>{{price}}</em>
diff --git a/templates/instagram.mustache b/templates/instagram.mustache
@@ -3,7 +3,7 @@
 {{#image}}
   <div class="instagram-images">
     <a href="{{{link}}}" target="_blank" rel="noopener">
-      <img class="instagram-image" src="{{{image}}}"/>
+      <img class="instagram-image" src="{{{image}}}">
     </a>
   </div>
 {{/image}}

diff --git a/templates/pastebin.mustache b/templates/pastebin.mustache
@@ -1,3 +1,7 @@
 <h4><a href="{{link}}" target="_blank" rel="noopener">{{link}}</a></h4>
-<pre><code class='lang-auto'>{{content}}</code></pre>
-{{#truncated?}}This paste has been truncated. <a href="{{link}}" target="_blank" rel="noopener">show original</a>{{/truncated?}}
+
+<pre><code class="lang-auto">{{content}}</code></pre>
+
+{{#truncated?}}
+  This paste has been truncated. <a href="{{link}}" target="_blank" rel="noopener">show original</a>
+{{/truncated?}}
diff --git a/templates/pdf.mustache b/templates/pdf.mustache
@@ -1,4 +1,7 @@
-<a href='{{link}}' target="_blank" rel="noopener"><span class='pdf-onebox-logo'></span></a>
-<h3><a href='{{link}}' target="_blank" rel="noopener">{{title}}</a></h3>
+<a href="{{link}}" target="_blank" rel="noopener"><span class="pdf-onebox-logo"></span></a>
 
-{{#filesize}}<p class='filesize'>{{filesize}}</p>{{/filesize}}
+<h3><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h3>
+
+{{#filesize}}
+  <p class="filesize">{{filesize}}</p>
+{{/filesize}}
diff --git a/templates/stackexchange.mustache b/templates/stackexchange.mustache
@@ -3,6 +3,7 @@
     <img alt="{{owner.display_name}}" src="{{owner.profile_image}}" class="thumbnail onebox-avatar">
   </a>
 {{/owner.profile_image}}
+
 <h4>
   <a href="{{link}}" target="_blank" rel="noopener">{{{title}}}</a>
 </h4>

diff --git a/templates/twitterstatus.mustache b/templates/twitterstatus.mustache
@@ -1,23 +1,38 @@
 {{#avatar}}<img src="{{avatar}}" class="thumbnail onebox-avatar">{{/avatar}}
 
-<h4><a href='{{link}}' target='_blank' rel='noopener'>{{title}}</a></h4>
+<h4><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h4>
 
-<div class="tweet"> {{{tweet}}}{{#quoted_tweet}}<div class="quoted"><a class="quoted-link" href="{{quoted_link}}"><p class="quoted-title">{{quoted_full_name}} <span>@{{quoted_screen_name}}</span></p></a><div>{{quoted_tweet}}</div></div>{{/quoted_tweet}}</div>
+<div class="tweet">
+  {{{tweet}}}
+  {{#quoted_tweet}}
+    <div class="quoted">
+      <a class="quoted-link" href="{{quoted_link}}">
+        <p class="quoted-title">{{quoted_full_name}} <span>@{{quoted_screen_name}}</span></p>
+      </a>
 
-<div class='date'>
+      <div>{{quoted_tweet}}</div>
+    </div>
+  {{/quoted_tweet}}
+</div>
+
+<div class="date">
   <a href="{{link}}" target="_blank" rel="noopener">{{timestamp}}</a>
+
   {{#likes}}
     <span class="like">
       <svg viewBox="0 0 512 512" width="14px" height="16px" aria-hidden="true">
         <path d="M462.3 62.6C407.5 15.9 326 24.3 275.7 76.2L256 96.5l-19.7-20.3C186.1 24.3 104.5 15.9 49.7 62.6c-62.8 53.6-66.1 149.8-9.9 207.9l193.5 199.8c12.5 12.9 32.8 12.9 45.3 0l193.5-199.8c56.3-58.1 53-154.3-9.8-207.9z"></path>
-      </svg> {{likes}}
+      </svg>
+      {{likes}}
     </span>
   {{/likes}}
+
   {{#retweets}}
     <span class="retweet">
       <svg viewBox="0 0 640 512" width="14px" height="16px" aria-hidden="true">
         <path d="M629.657 343.598L528.971 444.284c-9.373 9.372-24.568 9.372-33.941 0L394.343 343.598c-9.373-9.373-9.373-24.569 0-33.941l10.823-10.823c9.562-9.562 25.133-9.34 34.419.492L480 342.118V160H292.451a24.005 24.005 0 0 1-16.971-7.029l-16-16C244.361 121.851 255.069 96 276.451 96H520c13.255 0 24 10.745 24 24v222.118l40.416-42.792c9.285-9.831 24.856-10.054 34.419-.492l10.823 10.823c9.372 9.372 9.372 24.569-.001 33.941zm-265.138 15.431A23.999 23.999 0 0 0 347.548 352H160V169.881l40.416 42.792c9.286 9.831 24.856 10.054 34.419.491l10.822-10.822c9.373-9.373 9.373-24.569 0-33.941L144.971 67.716c-9.373-9.373-24.569-9.373-33.941 0L10.343 168.402c-9.373 9.373-9.373 24.569 0 33.941l10.822 10.822c9.562 9.562 25.133 9.34 34.419-.491L96 169.881V392c0 13.255 10.745 24 24 24h243.549c21.382 0 32.09-25.851 16.971-40.971l-16.001-16z"></path>
-      </svg> {{retweets}}
+      </svg>
+      {{retweets}}
     </span>
   {{/retweets}}
 </div>
diff --git a/templates/wikimedia.mustache b/templates/wikimedia.mustache
@@ -1,3 +1,3 @@
-{{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
+{{#image}}<img src="{{image}}" class="thumbnail">{{/image}}
 
-<h3><a href='{{link}}' target='_blank' rel='noopener'>{{title}}</a></h3>
+<h3><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h3>
diff --git a/templates/wikipedia.mustache b/templates/wikipedia.mustache
@@ -1,5 +1,5 @@
-{{#image}}<img src="{{image}}" class="thumbnail"/>{{/image}}
+{{#image}}<img src="{{image}}" class="thumbnail">{{/image}}
 
-<h3><a href='{{link}}' target='_blank' rel='noopener'>{{title}}</a></h3>
+<h3><a href="{{link}}" target="_blank" rel="noopener">{{title}}</a></h3>
 
 <p>{{description}}</p>
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,7 @@ @@
         <img alt="{{owner.display_name}}" src="{{owner.profile_image}}" class="thumbnail onebox-avatar">
       </a>
     {{/owner.profile_image}}
     <h4>
       <a href="{{link}}" target="_blank" rel="noopener">{{{title}}}</a>
     </h4>
@@ Expand Down @@