Commit c71b8b5

Stephen Peasley <s@stephenpeasley.com>
2015-05-30 16:21:21
Correct name spelling
master
1 parent fb8872e
Changed files (7)
app
mailers
user_mailer.rb
views
layouts
_terms_content.html.erb
application.html.erb
public.html.erb
user_mailer
registration_email.html.erb
registration_email.text.erb
spec
mailers
user_mailer_spec.rb
app/mailers/user_mailer.rb
@@ -1,6 +1,6 @@
 class UserMailer < ApplicationMailer
   def registration_email(user)
     @username = user.username
-    mail to: user.email, subject: "Welcome to Strong Lifters."
+    mail to: user.email, subject: "Welcome to Stronglifters."
   end
 end
app/views/layouts/_terms_content.html.erb
@@ -14,19 +14,19 @@
 <ol type="a">
 	<li>
 		Permission is granted to temporarily download one copy of the materials 
-		(information or software) on Strong Lifters web site for personal, 
+		(information or software) on Stronglifters web site for personal, 
 		non-commercial transitory viewing only. This is the grant of a license, 
 		not a transfer of title, and under this license you may not:
 		<ol type="i">
 			<li>modify or copy the materials;</li>
 			<li>use the materials for any commercial purpose, or for any public display (commercial or non-commercial);</li>
-			<li>attempt to decompile or reverse engineer any software contained on Strong Lifters web site;</li>
+			<li>attempt to decompile or reverse engineer any software contained on Stronglifters web site;</li>
 			<li>remove any copyright or other proprietary notations from the materials; or</li>
 			<li>transfer the materials to another person or "mirror" the materials on any other server.</li>
 		</ol>
 	</li>
 	<li>
-		This license shall automatically terminate if you violate any of these restrictions and may be terminated by Strong Lifters at any time. Upon terminating your viewing of these materials or upon the termination of this license, you must destroy any downloaded materials in your possession whether in electronic or printed format.
+		This license shall automatically terminate if you violate any of these restrictions and may be terminated by Stronglifters at any time. Upon terminating your viewing of these materials or upon the termination of this license, you must destroy any downloaded materials in your possession whether in electronic or printed format.
 	</li>
 </ol>
 <h3>
@@ -34,38 +34,38 @@
 </h3>
 <ol type="a">
 	<li>
-		The materials on Strong Lifters web site are provided "as is". Strong Lifters makes no warranties, expressed or implied, and hereby disclaims and negates all other warranties, including without limitation, implied warranties or conditions of merchantability, fitness for a particular purpose, or non-infringement of intellectual property or other violation of rights. Further, Strong Lifters does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on its Internet web site or otherwise relating to such materials or on any sites linked to this site.
+		The materials on Stronglifters web site are provided "as is". Stronglifters makes no warranties, expressed or implied, and hereby disclaims and negates all other warranties, including without limitation, implied warranties or conditions of merchantability, fitness for a particular purpose, or non-infringement of intellectual property or other violation of rights. Further, Stronglifters does not warrant or make any representations concerning the accuracy, likely results, or reliability of the use of the materials on its Internet web site or otherwise relating to such materials or on any sites linked to this site.
 	</li>
 </ol>
 <h3>
 	4. Limitations
 </h3>
 <p>
-	In no event shall Strong Lifters or its suppliers be liable for any damages (including, without limitation, damages for loss of data or profit, or due to business interruption,) arising out of the use or inability to use the materials on Strong Lifters Internet site, even if Strong Lifter or a Strong Lifter authorized representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages, these limitations may not apply to you.
+	In no event shall Stronglifters or its suppliers be liable for any damages (including, without limitation, damages for loss of data or profit, or due to business interruption,) arising out of the use or inability to use the materials on Stronglifters Internet site, even if Strong Lifter or a Strong Lifter authorized representative has been notified orally or in writing of the possibility of such damage. Because some jurisdictions do not allow limitations on implied warranties, or limitations of liability for consequential or incidental damages, these limitations may not apply to you.
 </p>
 <h3>
 	5. Revisions and Errata
 </h3>
 <p>
-	The materials appearing on Strong Lifters web site could include technical, typographical, or photographic errors. Strong Lifters does not warrant that any of the materials on its web site are accurate, complete, or current. Strong Lifters may make changes to the materials contained on its web site at any time without notice. Strong Lifters does not, however, make any commitment to update the materials.
+	The materials appearing on Stronglifters web site could include technical, typographical, or photographic errors. Stronglifters does not warrant that any of the materials on its web site are accurate, complete, or current. Stronglifters may make changes to the materials contained on its web site at any time without notice. Stronglifters does not, however, make any commitment to update the materials.
 </p>
 <h3>
 	6. Links
 </h3>
 <p>
-	Strong Lifters has not reviewed all of the sites linked to its Internet web site and is not responsible for the contents of any such linked site. The inclusion of any link does not imply endorsement by Strong Lifters of the site. Use of any such linked web site is at the user's own risk.
+	Stronglifters has not reviewed all of the sites linked to its Internet web site and is not responsible for the contents of any such linked site. The inclusion of any link does not imply endorsement by Stronglifters of the site. Use of any such linked web site is at the user's own risk.
 </p>
 <h3>
 	7. Site Terms of Use Modifications
 </h3>
 <p>
-	Strong Lifters may revise these terms of use for its web site at any time without notice. By using this web site you are agreeing to be bound by the then current version of these Terms and Conditions of Use.
+	Stronglifters may revise these terms of use for its web site at any time without notice. By using this web site you are agreeing to be bound by the then current version of these Terms and Conditions of Use.
 </p>
 <h3>
 	8. Governing Law
 </h3>
 <p>
-	Any claim relating to Strong Lifters's web site shall be governed by the laws of the State of Alberta without regard to its conflict of law provisions.
+	Any claim relating to Stronglifters's web site shall be governed by the laws of the State of Alberta without regard to its conflict of law provisions.
 </p>
 <p>
 	General Terms and Conditions applicable to Use of a Web Site.
app/views/layouts/application.html.erb
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title><%= content_for?(:title) ? "Strong Lifters | #{yield(:title)}" : "Strong Lifters" %></title>
+    <title><%= content_for?(:title) ? "Stronglifters | #{yield(:title)}" : "Stronglifters" %></title>
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "vendor/modernizr" %>
     <%= csrf_meta_tags %>
@@ -20,9 +20,9 @@
                 <!-- Title Area -->
                 <li class="name">
                   <svg viewBox="0 0 82.515 266.693">
-                    <use xlink:href="<%= asset_path "sprite.svg#feather" %>"></use>
+                    <use xlink:href="<%= asset_path "logos.svg#lg" %>"></use>
                   </svg>
-                  <h1><%= link_to "Strong Lifters", dashboard_path %></h1>
+                  <h1><%= link_to "Stronglifters", dashboard_path %></h1>
                 </li>
                 <li class="toggle-topbar menu-icon"><a href="#"><span>menu</span></a></li>
               </ul>
app/views/layouts/public.html.erb
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title><%= content_for?(:title) ? yield(:title) : "Strong Lifters" %></title>
+    <title><%= content_for?(:title) ? yield(:title) : "Stronglifters" %></title>
     <%= stylesheet_link_tag "application" %>
     <%= javascript_include_tag "vendor/modernizr" %>
     <%= csrf_meta_tags %>
@@ -13,7 +13,7 @@
     <header>
       <div class="row">
         <div class="small-12 columns text-center">
-          <h1>Strong <span class="svg-container"><%= image_tag "sprite.svg#feather", alt: "Strong Lifters", class: "feather" %></span>Lifters</h1>
+          <h1><span class="svg-container"><%= image_tag "logos.svg#lg", alt: "Stronglifters", class: "lg" %></span></h1>
         </div>
       </div>
     </header>
app/views/user_mailer/registration_email.html.erb
@@ -1,2 +1,2 @@
 <p><%= "Hi, #{@username}." %></p>
-<p>The Strong Lifters Team</p>
+<p>The Stronglifters Team</p>
app/views/user_mailer/registration_email.text.erb
@@ -1,3 +1,3 @@
 <%= "Hi, #{@username}." %>
 
-The Strong Lifters Team
+The Stronglifters Team
spec/mailers/user_mailer_spec.rb
@@ -5,7 +5,7 @@ RSpec.describe UserMailer, type: :mailer do
     let(:user) { double User, username: "blah", email:"blah@example.com" }
     let(:mail) { UserMailer.registration_email(user) }
     it "renders the subject" do
-      expect(mail.subject).to eql("Welcome to Strong Lifters.")
+      expect(mail.subject).to eql("Welcome to Stronglifters.")
     end
     it "renders the recipient email" do
       expect(mail.to).to eql([user.email])