headstart 0.5.2 → 0.5.3

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.5.3

data/app/models/headstart_mailer.rb

@@ -15,14 +15,5 @@ class HeadstartMailer
       GenericMailer.deliver_welcome(user)
     end
   end
-  
-  def self.deliver_confirmation(user)
-    if MadMimiMailer.api_settings.present? && MadMimiMailer.api_settings[:username].present? && MadMimiMailer.api_settings[:api_key].present?
-      MimiMailer.deliver_confirmation(user)
-    else
-      GenericMailer.deliver_confirmation(user)
-    end
-  end
-  
 
 end

data/app/views/generic_mailer/welcome.html.erb

@@ -1 +1,7 @@
-Welcome
+Welcome to <%= Settings.title %>. Thanks for registering and trying it out. Please <%= link_to "click here", new_user_confirmation_url(
+      :user_id => @user,
+      :token   => @user.confirmation_token,
+      :encode  => false) %> to confirm you received this email and activate your account.
+
+Thank you,
+Team <%= Settings.title %>

data/generators/headstart_admin/templates/app/views/admin/users/_form.html.erb

@@ -12,8 +12,8 @@
   <%= form.text_field :email %>
 </p>
 <p class="text_field">
-  <%= form.label :password %></p>
-  <%= form.password_field :password %></p>
+  <%= form.label :password %>
+  <%= form.password_field :password %>
 </p>
 <p class="password_field">
   <%= form.label :password_confirmation, "Confirm password" %>

data/generators/headstart_admin/templates/app/views/admin/users/index.html.erb

@@ -1,7 +1,7 @@
 <%= render :partial => 'admin/admin_header' %>
 <div class="report">
 	<h2>Users</h2>
-	<%= link_to image_tag("/images/add.png", :border=>0)+" New user", {:action => :new}, {:style => "font-size:12px;"}  %>
+	<%= link_to image_tag("/images/add.png", :border=>0)+" New user", {:action => :new}, {:style => "font-size:12px;text-decoration:none"}  %>
 	
 	
 	<%= will_paginate @users %>

data/lib/headstart/user.rb

@@ -233,10 +233,7 @@ module Headstart
           end
         end
       end
-      
-      def send_confirmation_email
-        HeadstartMailer.deliver_confirmation self
-      end
+
       
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: headstart
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Bran Burridge
@@ -106,7 +106,6 @@ files:
 - app/models/impersonation.rb
 - app/models/mimi_mailer.rb
 - app/views/generic_mailer/change_password.html.erb
-- app/views/generic_mailer/confirmation.html.erb
 - app/views/generic_mailer/welcome.html.erb
 - app/views/impersonations/index.html.erb
 - app/views/passwords/edit.html.erb

data/app/views/generic_mailer/confirmation.html.erb

@@ -1,5 +0,0 @@
-
-<%= new_user_confirmation_url(
-      :user_id => @user,
-      :token   => @user.confirmation_token,
-      :encode  => false) %>