Modify alert styles, make confirmation non-manditory

app/assets/stylesheets/styles/_variables.scss

@@ -26,7 +26,7 @@ $primary-color:   #99B36C; // #008CBA;
 $secondary-color: #e7e7e7;
 $alert-color:     #ff6666;
 $success-color:   #74E29D;
-$warning-color:   #f08a24;
+$warning-color:   #F5C18C;
 $info-color:      #eecb91;
 
 // OpenFarm Colors

app/assets/stylesheets/styles/components/_alerts.css → app/assets/stylesheets/styles/components/_alerts.css.scss

@@ -10,3 +10,7 @@
 .home-alert-wrapper{
   height: 0;
 }
+
+.warning {
+  color: $of-dark;
+}

app/controllers/application_controller.rb

@@ -7,7 +7,7 @@ class ApplicationController < ActionController::Base
   # Allow certain fields for devise - needed in Rails 4.0+
   before_filter :update_sanitized_params, if: :devise_controller?
 
-  before_action :set_locale
+  before_action :set_locale, :check_for_confirmation
 
   def default_url_options(options = {})
     { locale: I18n.locale }
@@ -17,6 +17,12 @@ def set_locale
     I18n.locale = params[:locale] || I18n.default_locale
   end
 
+  def check_for_confirmation
+    if current_user && !current_user.confirmed?
+      flash[:warning] = I18n.t('users.need_confirmation')
+    end
+  end
+
   protected
 
   # This method allows devise to pass non standard attributes through and

app/controllers/registrations_controller.rb

@@ -11,20 +11,18 @@ def destroy
 
   protected
 
-  # TODO: this isn't relevant anymore now that confirmation
-  # emails are getting sent on sign up. There must be a way to
-  # figure this out though:
-  # have a look at: http://stackoverflow.com/questions/6499589/devise-redirect-page-after-confirmation
-
   # https://github.com/plataformatec/devise/wiki/How-To:-Redirect-to-a-specific-page-on-successful-sign-up-(registration)
-  # def after_sign_up_path_for(resource)
-  #   # stored resource gets cleared after it gets called apparently
-  #   go_to = stored_location_for(resource)
-  #   if go_to
-  #     go_to || request.referer || root_path
-  #   else
-  #     url_for(controller: 'users',
-  #       action: 'finish')
-  #   end
-  # end
+  def after_sign_up_path_for(resource)
+    # stored resource gets cleared after it gets called apparently
+    go_to = stored_location_for(resource)
+    if (!resource.confirmed?)
+      resource.send_confirmation_instructions
+    end
+    if go_to
+      go_to || request.referer || root_path
+    else
+      url_for(controller: 'users',
+        action: 'finish')
+    end
+  end
 end

app/models/user.rb

@@ -65,4 +65,9 @@ class User
   def user_setting
     UserSetting.find_or_create_by(user: self)
   end
+
+  protected
+  def confirmation_required?
+    false
+  end
 end

app/views/devise/shared/_user_form.html.erb

@@ -22,15 +22,17 @@
 
   <% if @user.new_record? %>
     <%= f.label :password, I18n.t('users.password') %>
-    <%= f.password_field :password, autocomplete: "off" %>
-    <%= f.check_box :agree %><%= f.label :agree, t('users.tos_privacy_html',
-          tos_url: page_path('tos'),
-          privacy_url: page_path('privacy') ) %>
+    <small id="passwordhelp"><%= t('users.at_least_8_characters') %></small>
+    <%= f.password_field :password, autocomplete: "off", ariaDescribedby: "passwordhelp" %>
+
+    <%= f.hidden_field :agree, value: true %><%= f.label :agree, t('users.tos_privacy_html',
+        tos_url: page_path('tos'),
+        privacy_url: page_path('privacy') ) %>
   <% else %>
     <%= f.label :current_password, I18n.t('users.current_password') %>
     <%= f.password_field :current_password, autocomplete: "off" %>
 
-    <%= f.label :password, I18n.t('users.password') + I18n.t('users.password_blank_ok') %>
+    <%= f.label :password, I18n.t('users.new_password') + I18n.t('users.password_blank_ok') %>
     <%= f.password_field :password, autocomplete: "off" %>
 
     <%= f.check_box :is_private %><%= f.label :is_private, I18n.t('users.is_private') %>

app/views/layouts/application.html.erb

@@ -122,6 +122,12 @@
           <a href="#" class="close">&times;</a>
         </div>
     <% end %>
+    <% if flash[:warning] %>
+        <div data-alert class="alert-box warning radius columns large-4 small-centered">
+          <%= flash[:warning] %>
+          <a href="#" class="close">&times;</a>
+        </div>
+    <% end %>
     <% if alert %>
         <div data-alert class="alert-box alert radius columns large-4 small-centered">
           <% if alert.is_a?(Array) %>

config/locales/en.yml

@@ -89,14 +89,17 @@ en:
       star_your_favorite_guides_and_crops: "Star your favorite crops and guides"
       create: "Create"
       share_your_knowledge_with_guide_creation: "Share your knowledge with guide creation"
-      email_address: "Email Address"
+      email_address: "Email Address:"
       tos_privacy_html: |
-          I agree to the <a href='%{tos_url}'>Terms of Service</a> and the
-          <a href='%{privacy_url}'>Privacy Policy</a>
+          By signing up you agree to the <a href='%{tos_url}'>Terms of Service</a>
+          and the <a href='%{privacy_url}'>Privacy Policy</a>
       is_private: "Check to keep your profile private."
       account_information: "Account Information"
       display_name: "Display Name:"
-      password: "New Password:"
+      password: "Password:"
+      at_least_8_characters: "At least 8 characters"
+      need_confirmation: "You need to confirm your account, check your email!"
+      new_password: "New Password:"
       current_password: "Current Password (we need this to confirm your changes)"
       password_blank_ok: " (leave blank if you don’t want to change it)"
       create_account: "Join OpenFarm"