# HG changeset patch # User nanaya # Date 1433639605 -32400 # Node ID 62fef621f39cbd5f67f94e6a85c2615ca90e0073 # Parent 7ba798dee39d04f68486f70248bb8351848dd197 Move alerts to layout. diff -r 7ba798dee39d -r 62fef621f39c app/views/layouts/_alerts.html.erb --- a/app/views/layouts/_alerts.html.erb Sun Jun 07 02:59:29 2015 +0900 +++ b/app/views/layouts/_alerts.html.erb Sun Jun 07 10:13:25 2015 +0900 @@ -1,13 +1,13 @@ -<% if params[:notice] %> +<% if notice %>
Info: - <%= params[:notice] %> + <%= notice %>
<% end %> -<% if @paste && @paste.errors.any? %> +<% if alert %>
Error: - <%= @paste.errors.full_messages.to_sentence %> + <%= alert %>
<% end %> diff -r 7ba798dee39d -r 62fef621f39c app/views/layouts/application.html.erb --- a/app/views/layouts/application.html.erb Sun Jun 07 02:59:29 2015 +0900 +++ b/app/views/layouts/application.html.erb Sun Jun 07 10:13:25 2015 +0900 @@ -17,6 +17,8 @@
+ <%= render "layouts/alerts" %> + <%= yield %>
diff -r 7ba798dee39d -r 62fef621f39c app/views/pastes/new.html.erb --- a/app/views/pastes/new.html.erb Sun Jun 07 02:59:29 2015 +0900 +++ b/app/views/pastes/new.html.erb Sun Jun 07 10:13:25 2015 +0900 @@ -1,17 +1,3 @@ <% provide :title, 'New Paste' %> -<% if notice %> -
- Info: - <%= notice %> -
-<% end %> - -<% if alert %> -
- Error: - <%= alert %> -
-<% end %> - <%= render 'form' %>