From 1e93c0ee14afc01d2e4484f6a709cf6a970ba35b Mon Sep 17 00:00:00 2001 From: Lisa Hamm Date: Thu, 26 Feb 2015 15:50:41 -0600 Subject: [PATCH] Added setup error messages to index view --- public/css/main.css | 4 ++-- views/index.erb | 18 ++++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/public/css/main.css b/public/css/main.css index f637807..4fdd937 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -41,9 +41,9 @@ input#setup-submit { width: 80px; } -#setup-form p { +#setup-form div.error { color: red; - font-size: 0.9em; + font-size: 0.8em; font-weight: 300; margin: 5px; } diff --git a/views/index.erb b/views/index.erb index ece989c..2b44282 100644 --- a/views/index.erb +++ b/views/index.erb @@ -7,8 +7,10 @@ O - <% if params[:player_mark] == {} %> -

<%= @invalid_input_messages[:player_mark] %>

+ <% if flash[:errors] %> +
+

*<%= flash[:errors].fetch(:player_mark) %>

+
<% end %>
@@ -17,8 +19,10 @@ No
- <% if params[:opponent] == nil %> -

<%= @invalid_input_messages[:opponent] %>

+ <% if flash[:errors] %> +
+

*<%= flash[:errors].fetch(:opponent) %>

+
<% end %>
@@ -27,8 +31,10 @@ Second
- <% if params[:player_order] == nil %> -

<%= @invalid_input_messages[:player_order] %>

+ <% if flash[:errors] %> +
+

*<%= flash[:errors].fetch(:player_order) %>

+
<% end %>