boostrap and email editing

lawrencely · Oct 9, 2014 · 7cd03f8 · 7cd03f8
1 parent 432d758
commit 7cd03f8
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -84,7 +84,7 @@ margin-top: 130px;
 font-size: 100%;
 }
 .home-page-words h1 {
-  font-size: 200px;
+  font-size: 150px;
 }
 .home-page-words h4 {
   font-size: 30px;
@@ -125,6 +125,9 @@ h3 {
   display: inline-block;
   margin-top: 3em;
 }
+.home-page-words p {
+font-size: 18px;
+}
 
 .task-group  {
   min-height: 220px;

diff --git a/app/mailers/user_sign_up_notification.rb b/app/mailers/user_sign_up_notification.rb
@@ -4,11 +4,11 @@ class UserSignUpNotification < ActionMailer::Base
   def welcome_email(user)
     @user = user
     @url = 'http://paideuo.herokuapp.com/login'
-    mail(to: @user.email, subject: 'Welcome <%= @user.name %>')
+    mail(to: @user.email, subject: 'Welcome')
   end
 
   def paideuo_email(partner)
     @partner = partner
-    mail(to: @partner.email, subject: '<%= @partner.name %>, Paideuo Time')
+    mail(to: @partner.email, subject: 'Paideuo Time')
   end
 end
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
@@ -22,7 +22,7 @@
     <div class="container">
       <div class="home-page-words">
       <h1>Paideuó</h1>
-    <h4><em>Please Sign up or login<em></h4>
+      <p>Paideuó, Pronounced (pahee-dyoo'-o) means "a child under development with strict training" – properly,<br> to train up a child, so they mature and realize their full potential (development).<br>This requires necessary discipline (training), which includes administering chastisement (punishment).</p>
     </div>
     </div>
 <% end %>

diff --git a/app/views/user_sign_up_notification/paideuo_email.html.erb b/app/views/user_sign_up_notification/paideuo_email.html.erb
@@ -4,12 +4,16 @@
     <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
   </head>
   <body>
-    <h1><%= @partner.name %> it's Paideuó Time.</h1>
+    <h1><%= @partner.name.capitalize %> it's Paideuó Time.</h1>
 
-    <p><%= @partner.name %> you were carefully chosen to encourage and give paideuó.</p>
+    <p><%= @partner.name.capitalize %> you were carefully chosen to encourage and give paideuó.</p>
     <p>
       Paideuó, Pronounced (pahee-dyoo'-o) means "a child under development with strict training" – properly, to train up a child, so they mature and realize their full potential development. This requires necessary discipline (training), which includes administering chastisement (punishment).
     </p>
+    <p>
+      If this is the first time they have failed to complete a task, we suggest you give them encouragement and support, but if this is becoming a consistent theme some you know what to do.
+    </p>
+
 
     <p>Thanks for joining and have a great day!</p>
     <p>Under Paideuó</p>

diff --git a/app/views/user_sign_up_notification/paideuo_email.text.erb b/app/views/user_sign_up_notification/paideuo_email.text.erb
@@ -1,10 +1,12 @@
-<%= @partner.name %> it's Paideuó Time.
+<%= @partner.name.capitalize %> it's Paideuó Time.
 ===============================================
 
-<%= @partner.name %> you were carefully chosen to encourage and give paideuó.
+<%= @partner.name.capitalize %> you were carefully chosen to encourage and give paideuó.
 
 Paideuó, Pronounced (pahee-dyoo'-o) means "a child under development with strict training" – properly, to train up a child, so they mature and realize their full potential (development). This requires necessary discipline (training), which includes administering chastisement (punishment).
 
+If this is the first time they have failed to complete a task, we suggest you give them encouragement and support, but if this is becoming a consistent theme some you know what to do.
+
 So dish it out and get them back on track!
 
 Under Paideuó

diff --git a/app/views/user_sign_up_notification/welcome_email.text.erb b/app/views/user_sign_up_notification/welcome_email.text.erb
@@ -1,8 +1,8 @@
-Welcome to Paideuó, <%= @user.name %>
+Welcome to Paideuó, <%= @user.name.capitalize %>
 ===============================================
 
 You have successfully signed up to Paideuó,
-your username is: <%= @user.name %>.
+your username is: <%= @user.name.capitalize %>.
 
 To login to the site, just follow this link: <%= @url %>.