From 28531171cb26c83cc3ead0c42ed68b6e28254681 Mon Sep 17 00:00:00 2001
From: David Bragdon <davefirecracker@gmail.com>
Date: Wed, 10 Sep 2014 14:28:54 -0400
Subject: [PATCH] Change over to html5 validations and remove previous error
 handling

---
 app/assets/stylesheets/styleguide.scss      |  2 +-
 app/helpers/devise_helper.rb                | 29 ---------------------
 app/views/devise/registrations/new.html.erb |  9 +++----
 app/views/devise/sessions/new.html.erb      |  6 ++---
 app/views/stories/new.html.erb              | 12 +--------
 5 files changed, 8 insertions(+), 50 deletions(-)
 delete mode 100644 app/helpers/devise_helper.rb

diff --git a/app/assets/stylesheets/styleguide.scss b/app/assets/stylesheets/styleguide.scss
index ef5b30b..29c1cb4 100644
--- a/app/assets/stylesheets/styleguide.scss
+++ b/app/assets/stylesheets/styleguide.scss
@@ -148,7 +148,7 @@ input[type='checkbox'] {
   right: 20px;
 }
 
-#error_explanation h3 {
+#error_explanation h2 {
   font-size: 14px;
   margin: 10px;
 }
diff --git a/app/helpers/devise_helper.rb b/app/helpers/devise_helper.rb
deleted file mode 100644
index 66f4abd..0000000
--- a/app/helpers/devise_helper.rb
+++ /dev/null
@@ -1,29 +0,0 @@
-module DeviseHelper
-
-  def devise_error_messages!
-    flash_alerts = []
-    error_key = 'errors.messages.not_saved'
-
-    if !flash.empty?
-      flash_alerts.push(flash[:error]) if flash[:error]
-      flash_alerts.push(flash[:alert]) if flash[:alert]
-      flash_alerts.push(flash[:notice]) if flash[:notice]
-      error_key = 'devise.failure.invalid'
-    end
-
-    return "" if resource.errors.empty? && flash_alerts.empty?
-    errors = resource.errors.empty? ? flash_alerts : resource.errors.full_messages
-
-    messages = errors.map { |msg| content_tag(:li, msg) }.join
-    sentence = I18n.t(error_key, :count    => errors.count,
-                                 :resource => resource.class.model_name.human.downcase)
-
-    html = "<div id='error_explanation'>
-            <h3>#{sentence}</h3>"
-    html += "<ul>#{messages}</ul>" unless "<li>#{sentence}</li>" == messages
-    html += "</div>"
-
-    html.html_safe
-  end
-
-end
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index cdb05b0..f9a8d91 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -4,18 +4,17 @@
       <h2>Sign Up</h2>
 
       <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
-      <%= devise_error_messages! %>
          <div>
-        <%= f.text_field :username, autofocus: true, placeholder: 'Username' %></div>
+        <%= f.text_field :username, autofocus: true, placeholder: 'Username', :required => true %></div>
 
         <div>
-        <%= f.email_field :email, placeholder: 'Email' %></div>
+        <%= f.email_field :email, placeholder: 'Email', :required => true %></div>
 
         <div>
-          <%= f.password_field :password, autocomplete: "off", placeholder: 'Password' %></div>
+          <%= f.password_field :password, autocomplete: "off", placeholder: 'Password', :required => true %></div>
 
         <div>
-          <%= f.password_field :password_confirmation, autocomplete: "off", placeholder: 'Confirm Password' %></div>
+          <%= f.password_field :password_confirmation, autocomplete: "off", placeholder: 'Confirm Password', :required => true %></div>
 
         <div><%= f.submit "Sign Up" %></div>
 
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
index afa430b..5d19361 100644
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -3,17 +3,15 @@
     <div class="loginform">
       <h2>Log In</h2>
       <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
-      <%= devise_error_messages! %>
-        <div><%= f.email_field :email, autofocus: true, placeholder: 'Email' %></div>
+        <div><%= f.email_field :email, autofocus: true, placeholder: 'Email', :required => true %></div>
 
-        <div><%= f.password_field :password, autocomplete: "off", placeholder: 'Password' %></div>
+        <div><%= f.password_field :password, autocomplete: "off", placeholder: 'Password', :required => true %></div>
 
         <% if devise_mapping.rememberable? -%>
           <div id="rememberme"><%= f.check_box :remember_me %><span id="remember">remember me</span></div>
         <% end -%>
 
         <div><%= f.submit "Log In" %></div>
-
       <% end %>
     </div>
   </div>
diff --git a/app/views/stories/new.html.erb b/app/views/stories/new.html.erb
index a712eea..36d507b 100644
--- a/app/views/stories/new.html.erb
+++ b/app/views/stories/new.html.erb
@@ -2,20 +2,10 @@
   <div class="absolute-center">
     <div class="newstoryform">
       <h2>What's your story's title?</h2>
-
       <%= form_for @story do |f| -%>
-
-        <%= f.text_field :name, placeholder: 'Title' %> <br>
-
+        <%= f.text_field :name, placeholder: 'Title', :required => true %> <br>
         <%= f.submit "Submit", :disable_with => 'Submiting...' %>
       <% end -%>
-      <% if @story.errors.full_messages.count > 0 %>
-        <div id="error_explanation">
-          <% @story.errors.full_messages.each do |msg| %>
-            <h3><%= msg %></h3>
-          <% end %>
-        </div>
-      <% end %>
    </div>
   </div>
 </div>