Merge pull request #278 from pdehaan/view-tidy

Reformat views/ directory and give images absolute path
mozilla · Aug 22, 2018 · c70a6b0 · c70a6b0
2 parents 780d773 + fb35e4b
commit c70a6b0
Show file tree

Hide file tree

Showing 16 changed files with 44 additions and 53 deletions.
diff --git a/views/partials/breach_listing.hbs b/views/partials/breach_listing.hbs
@@ -1,11 +1,11 @@
 <div class="account">
-    <div class="image-wrap">
-        <img alt="{{ Title }}" src="img/logos/{{ Name }}.{{ LogoType }}" />
-    </div>
-    <div class="breach-info-wrap">
-        <h4>{{ Title }}</h4>
-        <span class="breach-info"><span class="medium">Breach date:</span> {{prettyDate BreachDate }}</span>
-        <span class="breach-info"><span class="medium">Compromised accounts:</span> {{localeString PwnCount }}</span>
-        <span class="breach-info"><span class="medium">Compromised data:</span> {{breachDataClasses DataClasses }}</span>
-    </div>
+  <div class="image-wrap">
+    <img alt="{{ Title }}" src="/img/logos/{{ Name }}.{{ LogoType }}" />
+  </div>
+  <div class="breach-info-wrap">
+    <h4>{{ Title }}</h4>
+    <span class="breach-info"><span class="medium">Breach date:</span> {{prettyDate BreachDate }}</span>
+    <span class="breach-info"><span class="medium">Compromised accounts:</span> {{localeString PwnCount }}</span>
+    <span class="breach-info"><span class="medium">Compromised data:</span> {{breachDataClasses DataClasses }}</span>
+  </div>
 </div>
diff --git a/views/partials/compromised_accounts.hbs b/views/partials/compromised_accounts.hbs
@@ -11,14 +11,14 @@
         {{/if}}
       </h3>
 
-<!--list first 5 breaches-->
-{{#each_from_to foundBreaches 0 4 }}
-  <div class="half listings">
-    {{> breach_listing }}
-  </div>
-{{/each_from_to}}
+      <!--list first 5 breaches-->
+      {{#each_from_to foundBreaches 0 4 }}
+        <div class="half listings">
+          {{> breach_listing }}
+        </div>
+      {{/each_from_to}}
 
-<!--display button and list remainder of breaches on click-->
+      <!--display button and list remainder of breaches on click-->
       {{#if_conditional foundBreaches 4}}
         <div id="additional-breaches" class="section-wrapper">
           {{#each_from_to foundBreaches 4 foundBreaches.length }}
@@ -33,4 +33,3 @@
     </div><!--closes section-wrapper-->
   </div><!--closes .compromised-accounts-->
 {{/if}}
-
diff --git a/views/partials/confirm_account.hbs b/views/partials/confirm_account.hbs
@@ -1,5 +1,5 @@
 <div id="confirm-your-account" class="modal-content">
   <h3>Confirm Your Account</h3>
   <p>Check your email for the verification link.</p>
-   <button class="close-modal">Close</button>
+  <button class="close-modal">Close</button>
 </div>
diff --git a/views/partials/featured_breach.hbs b/views/partials/featured_breach.hbs
@@ -2,7 +2,7 @@
   <div class="account">
     <div id="breach-title-wrapper">
       <div class="image-wrap">
-        <img alt="{{ featuredBreach.Title }}" src="img/logos/{{ featuredBreach.Name }}.{{ featuredBreach.LogoType }}">
+        <img alt="{{ featuredBreach.Title }}" src="/img/logos/{{ featuredBreach.Name }}.{{ featuredBreach.LogoType }}">
       </div>
       <span class="breach-headline">{{ featuredBreach.Title }}</span>
     </div>

diff --git a/views/partials/featured_compromised_account_headline.hbs b/views/partials/featured_compromised_account_headline.hbs
@@ -1,6 +1,6 @@
 <div id="featured-compromised-account-headline">
   <h3 class="whole section-headline">
-      <!--if their account was involved in the featured breach-->
+    <!--if their account was involved in the featured breach-->
     {{#if userAccountCompromised }}
       The account you scanned was compromised in the {{ featuredBreach.Title }} breach.
     <!--their account wasn't involved in the breach, but they still scanned their email from a 'featured breach page'-->

diff --git a/views/partials/hibp_attribution.hbs b/views/partials/hibp_attribution.hbs
@@ -1 +1 @@
- <span class="source-info">Breach data provided by <a href="https://www.haveibeenpwned.com" target="_blank" rel="noopener noreferrer">Have I Been Pwned</a></span>
+<span class="source-info">Breach data provided by <a href="https://www.haveibeenpwned.com" target="_blank" rel="noopener noreferrer">Have I Been Pwned</a></span>
diff --git a/views/partials/password_tip_svg.hbs b/views/partials/password_tip_svg.hbs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg role="img" width="87px" height="87px" viewBox="0 0 87 87" aria-labelledby="title" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>{{tip_title}}</title>
+  <title>{{ tip_title }}</title>
   <defs>
     <linearGradient x1="89.9287684%" y1="19.2233456%" x2="14.0441176%" y2="85.9352022%" id="linearGradient-1">
       <stop stop-color="#18BAFF" offset="0%"></stop>

diff --git a/views/partials/scan_another_email.hbs b/views/partials/scan_another_email.hbs
@@ -1,6 +1,6 @@
 <div class="section-wrapper scan-another-email">
-    <div class="half">
-        <span class="section-headline">Scan Another Email Address</span>
-        {{> scan_form}}
-    </div>
+  <div class="half">
+    <span class="section-headline">Scan Another Email Address</span>
+    {{> scan_form}}
+  </div>
 </div>
diff --git a/views/partials/scan_form.hbs b/views/partials/scan_form.hbs
@@ -3,13 +3,13 @@
     <input class="input-group-field email-to-hash" type="email" name="email" placeholder="Enter Email Address" aria-label="Enter Email Address" tabindex="0" autocomplete="off" />
     <span id="invalid-email-message" class="error-message">Must be a valid email.</span>
   </div>
-    <input type="hidden" name="emailHash" />
-    {{#if featuredBreach}}
-      <input id="featured" type="hidden" name="featuredBreach" value="{{ featuredBreach.Name }}"/>
-    {{/if}}
-    <div class="input-group-button">
-      <input id="scan-email" type="submit" class="button submit transparent-button" value="Search" tabindex="0"/>
-      <img class="loader" src="img/loader.gif" alt="loading data" />
-    </div>
+  <input type="hidden" name="emailHash" />
+  {{#if featuredBreach}}
+    <input id="featured" type="hidden" name="featuredBreach" value="{{ featuredBreach.Name }}"/>
+  {{/if}}
+  <div class="input-group-button">
+    <input id="scan-email" type="submit" class="button submit transparent-button" value="Search" tabindex="0"/>
+    <img class="loader" src="/img/loader.gif" alt="loading data" />
+  </div>
 </form>
-<span class="privacy-policy">Your email will not be stored. <br>Find out more in our <a href="https://www.mozilla.org/privacy/firefox/" aria-label="Mozilla Firefox privacy policy">Privacy Policy.</a></span>
+<span class="privacy-policy">Your email will not be stored.<br>Find out more in our <a href="https://www.mozilla.org/privacy/firefox/" aria-label="Mozilla Firefox privacy policy">Privacy Policy.</a></span>
diff --git a/views/partials/scan_results_headline.hbs b/views/partials/scan_results_headline.hbs
@@ -3,4 +3,3 @@
 {{ else }}
   <h2 id="no-breaches" class="section-headline">So far, so good.</h2>
 {{/if}}
-
diff --git a/views/partials/sign_up_banner.hbs b/views/partials/sign_up_banner.hbs
@@ -1,7 +1,7 @@
 <div id="sign-up-banner">
   <div class="section-wrapper">
     <div class="fourth subscribe-icon-wrapper">
-      <img src="img/subscribe-icon.svg" />
+      <img src="/img/subscribe-icon.svg" />
     </div>
     <div class="half">
       <span class="medium">Subscribe to Firefox Monitor</span>

diff --git a/views/partials/sign_up_ffxm.hbs b/views/partials/sign_up_ffxm.hbs
@@ -12,7 +12,7 @@
       <label for="additional-emails-checkbox">Get the lastest news from Mozilla and Firefox.</label>
     </div>
     <div class="input-group-button">
-      <img class="loader" src="img/loader.gif" alt="loading data" />
+      <img class="loader" src="/img/loader.gif" alt="loading data" />
       <input id="subscribe-submit" type="submit" class="button submit-email transparent-button" value="Submit" tabindex="0" />
     </div>
   </form>

diff --git a/views/partials/subscribe_modal.hbs b/views/partials/subscribe_modal.hbs
@@ -1,4 +1,4 @@
 <section id="subscribe-modal" class="modal-container">
-        {{> confirm_account}}
-        {{> sign_up_ffxm}}
+  {{> confirm_account}}
+  {{> sign_up_ffxm}}
 </section>
diff --git a/views/partials/tips.hbs b/views/partials/tips.hbs
@@ -5,6 +5,7 @@
       <h4 class="section-sub-head">The Key to Account Security</h4>
       <p>Your passwords protect all of the personal information that resides in your online accounts, from bank balances and credit card numbers to your home address and private messages. Passwords are so valuable that thousands of passwords are stolen every day and accounts are traded on the black market.  Take these six steps to protect yours.</p>
     </section>
+
     {{#each passwordTips}}
      <div class="tip-container third">
       <div class="tip">

diff --git a/views/partials/what_to_do.hbs b/views/partials/what_to_do.hbs
@@ -3,27 +3,19 @@
     <h3 class="whole section-headline">What To Do</h3>
     <div class="fourth">
       {{> what_to_do_svg number=1 }}
-      <p>
-        <span class="bold">Change your password</span> on these sites and anywhere else you've used the same password.
-      </p>
+      <p><span class="bold">Change your password</span> on these sites and anywhere else you've used the same password.</p>
     </div>
     <div class="fourth">
       {{> what_to_do_svg number=2 }}
-      <p>
-        Make your answers to <span class="bold">security questions</span> just as strong as your passwords.
-      </p>
+      <p>Make your answers to <span class="bold">security questions</span> just as strong as your passwords.</p>
     </div>
     <div class="fourth">
       {{> what_to_do_svg number=3 }}
-      <p>
-        <span class="bold">Use password managers</span> like 1Password, LastPass, or Dashlane to generate strong passwords for you, remember them for you, and fill them into websites so you don't have to type them in.
-      </p>
+      <p><span class="bold">Use password managers</span> like 1Password, LastPass, or Dashlane to generate strong passwords for you, remember them for you, and fill them into websites so you don't have to type them in.</p>
     </div>
     <div class="fourth">
       {{> what_to_do_svg number=4 }}
-      <p>
-        <span class="bold">Subscribe</span> for alerts from Firefox Monitor to learn sooner about your compromised accounts.
-      </p>
+      <p><span class="bold">Subscribe</span> for alerts from Firefox Monitor to learn sooner about your compromised accounts.</p>
     </div>
   </div>
 </div>
diff --git a/views/partials/what_to_do_svg.hbs b/views/partials/what_to_do_svg.hbs
@@ -1,5 +1,5 @@
 <svg role="img" width="42px" height="42px" viewBox="0 0 42 42" aria-labelledby="title" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <title>{{tip_title}}</title>
+  <title>{{ tip_title }}</title>
   <defs>
     <linearGradient x1="100%" y1="0%" x2="0%" y2="100%" id="linearGradient-1">
       <stop stop-color="#18BAFF" offset="0%"></stop>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<span class="source-info">Breach data provided by <a href="https://www.haveibeenpwned.com" target="_blank" rel="noopener noreferrer">Have I Been Pwned</a></span>
		<span class="source-info">Breach data provided by <a href="https://www.haveibeenpwned.com" target="_blank" rel="noopener noreferrer">Have I Been Pwned</a></span>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,4 +3,3 @@
		{{ else }}
		<h2 id="no-breaches" class="section-headline">So far, so good.</h2>
		{{/if}}