From ccafe50f19a353560e00d510ae5eb8b8a31fb23e Mon Sep 17 00:00:00 2001 From: Ferran Rodenas Date: Tue, 17 Jan 2012 01:43:41 +0100 Subject: [PATCH] Add handler to close flash messages --- app/assets/javascripts/application.js | 10 +++++ app/assets/javascripts/apps.js.erb | 24 +++++------ app/assets/javascripts/appsshow.js.erb | 42 +++++++++---------- app/assets/javascripts/services.js.erb | 8 ++-- app/assets/javascripts/users.js.erb | 8 ++-- app/assets/stylesheets/application.scss | 17 ++++++++ app/views/apps/create.js.erb | 4 +- app/views/apps/delete.js.erb | 4 +- app/views/apps/envvars/set_var.js.erb | 2 +- app/views/apps/envvars/unset_var.js.erb | 4 +- app/views/apps/files/app_view_file.html.haml | 4 +- app/views/apps/files/files.js.erb | 4 +- app/views/apps/files/view_file.js.erb | 4 +- app/views/apps/restart.js.erb | 4 +- app/views/apps/services/bind_service.js.erb | 2 +- app/views/apps/services/unbind_service.js.erb | 4 +- app/views/apps/start.js.erb | 4 +- app/views/apps/stop.js.erb | 4 +- app/views/apps/update_bits.js.erb | 4 +- app/views/apps/urls/map_url.js.erb | 2 +- app/views/apps/urls/unmap_url.js.erb | 4 +- app/views/layouts/_flashes.html.haml | 8 ++-- app/views/services/create.js.erb | 2 +- app/views/services/delete.js.erb | 4 +- app/views/users/create.js.erb | 2 +- app/views/users/delete.js.erb | 4 +- 26 files changed, 106 insertions(+), 77 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index abaa0d3..0f21715 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -22,6 +22,15 @@ //= require users //= require_self +// JQuery handler to close flash messages +$(function() { + $('body').on('click', '#flash .close', function(e) { + $(this).parent('#flash').fadeOut('slow'); + e && e.preventDefault() + }); +}); + +// Browser Update var $buoop = {vs:{i:8,f:4,o:11,s:5,n:9}} $buoop.ol = window.onload; window.onload=function(){ @@ -32,6 +41,7 @@ window.onload=function(){ document.body.appendChild(e); } +// Google Analytics var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview'],['_trackPageLoadTime']]; (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0]; g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js'; diff --git a/app/assets/javascripts/apps.js.erb b/app/assets/javascripts/apps.js.erb index bb25690..fdf5fdf 100644 --- a/app/assets/javascripts/apps.js.erb +++ b/app/assets/javascripts/apps.js.erb @@ -69,8 +69,8 @@ $(function() { } }) .on('ajax:error', function(evt, xhr, status, error) { - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { @@ -85,8 +85,8 @@ $(function() { $(this).find('img').attr({ src : '<%= asset_path('wait.gif') %>'}).removeClass('start'); }) .on('ajax:error', function(evt, xhr, status, error) { - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { @@ -100,8 +100,8 @@ $(function() { $(this).find('img').attr({ src : '<%= asset_path('wait.gif') %>'}).removeClass('stop'); }) .on('ajax:error', function(evt, xhr, status, error) { - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { @@ -115,8 +115,8 @@ $(function() { $(this).find('img').attr({ src : '<%= asset_path('wait.gif') %>'}).removeClass('restart'); }) .on('ajax:error', function(evt, xhr, status, error) { - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { @@ -139,8 +139,8 @@ $(function() { } }) .on('ajax:error', function(evt, xhr, status, error) { - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { @@ -154,8 +154,8 @@ $(function() { $(this).find('img').attr({ src : '<%= asset_path('wait.gif') %>'}).removeClass('delete'); }) .on('ajax:error', function(evt, xhr, status, error) { - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { diff --git a/app/assets/javascripts/appsshow.js.erb b/app/assets/javascripts/appsshow.js.erb index 1998e61..aca92e9 100644 --- a/app/assets/javascripts/appsshow.js.erb +++ b/app/assets/javascripts/appsshow.js.erb @@ -74,7 +74,7 @@ $(function() { row.fadeIn(1800, function() { $(this).removeClass('highlight'); }); - $('#flash').empty(); + $('#flash-content').empty(); }, 'submitdata' : function(value, settings) { var value = rangeapi.getValue(); @@ -82,8 +82,8 @@ $(function() { }, 'onerror' : function(settings, original, xhr) { original.reset(); - $('#flash').empty(); - $('#flash').append('
Error ' + xhr.status + ': ' + xhr.responseText + '
'); + $('#flash-content').empty(); + $('#flash-content').append('
Error ' + xhr.status + ': ' + xhr.responseText + '
'); $('#flash').fadeIn('slow'); } }); @@ -101,12 +101,12 @@ $(function() { row.fadeIn(1800, function() { $(this).removeClass('highlight'); }); - $('#flash').empty(); + $('#flash-content').empty(); }, 'onerror' : function(settings, original, xhr) { original.reset(); - $('#flash').empty(); - $('#flash').append('
Error ' + xhr.status + ': ' + xhr.responseText + '
'); + $('#flash-content').empty(); + $('#flash-content').append('
Error ' + xhr.status + ': ' + xhr.responseText + '
'); $('#flash').fadeIn('slow'); } }); @@ -155,7 +155,7 @@ $(function() { $(this).removeClass('highlight'); }); appEnvvarsTable.fnUpdate(value, aPos[0], aPos[1]); - $('#flash').empty(); + $('#flash-content').empty(); }, 'submitdata': function(value, settings) { return { @@ -166,8 +166,8 @@ $(function() { }, 'onerror' : function(settings, original, xhr) { original.reset(); - $('#flash').empty(); - $('#flash').append('
Error ' + xhr.status + ': ' + xhr.responseText + '
'); + $('#flash-content').empty(); + $('#flash-content').append('
Error ' + xhr.status + ': ' + xhr.responseText + '
'); $('#flash').fadeIn('slow'); } }); @@ -232,8 +232,8 @@ $(function() { }) .on('ajax:error', function(evt, xhr, status, error) { request_processed = true; - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) {; @@ -247,8 +247,8 @@ $(function() { $(this).find('img').attr({ src : '<%= asset_path('wait.gif') %>'}).removeClass('delete'); }) .on('ajax:error', function(evt, xhr, status, error) { - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { @@ -270,8 +270,8 @@ $(function() { }) .on('ajax:error', function(evt, xhr, status, error) { request_processed = true; - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) {; @@ -285,8 +285,8 @@ $(function() { $(this).find('img').attr({ src : '<%= asset_path('wait.gif') %>'}).removeClass('delete'); }) .on('ajax:error', function(evt, xhr, status, error) { - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { @@ -308,8 +308,8 @@ $(function() { }) .on('ajax:error', function(evt, xhr, status, error) { request_processed = true; - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { @@ -323,8 +323,8 @@ $(function() { $(this).find('img').attr({ src : '<%= asset_path('wait.gif') %>'}).removeClass('delete'); }) .on('ajax:error', function(evt, xhr, status, error) { - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { diff --git a/app/assets/javascripts/services.js.erb b/app/assets/javascripts/services.js.erb index 6e60566..c0bcfbc 100644 --- a/app/assets/javascripts/services.js.erb +++ b/app/assets/javascripts/services.js.erb @@ -55,8 +55,8 @@ $(function() { }) .on('ajax:error', function(evt, xhr, status, error) { request_processed = true; - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { @@ -70,8 +70,8 @@ $(function() { $(this).find('img').attr({ src : '<%= asset_path('wait.gif') %>'}).removeClass('delete'); }) .on('ajax:error', function(evt, xhr, status, error) { - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { diff --git a/app/assets/javascripts/users.js.erb b/app/assets/javascripts/users.js.erb index 7e40601..7815b5b 100644 --- a/app/assets/javascripts/users.js.erb +++ b/app/assets/javascripts/users.js.erb @@ -44,8 +44,8 @@ $(function() { }) .on('ajax:error', function(evt, xhr, status, error) { request_processed = true; - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { @@ -59,8 +59,8 @@ $(function() { $(this).find('img').attr({ src : '<%= asset_path('wait.gif') %>'}).removeClass('delete'); }) .on('ajax:error', function(evt, xhr, status, error) { - $('#flash').empty(); - $('#flash').append('
An error occurred processing your request, please reload the page and try again.
'); + $('#flash-content').empty(); + $('#flash-content').append('
An error occurred processing your request, please reload the page and try again.
'); $('#flash').fadeIn('slow'); }) .on('ajax:complete', function(evt, xhr, status) { diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 39c59e3..29a32c2 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -182,6 +182,23 @@ header a:hover { padding: 1em; } +#main #flash .close { + color: #404040; + cursor: pointer; + float: right; + font-weight: bold; + opacity: 0.50; + padding: .5em; +} + +#main #flash a.close, #main #flash a.close:active, #main #flash a.close:visited { + text-decoration: none; +} + +#main #flash a.close:hover { + opacity: 0.75; +} + #main h1 { font-size: 150%; margin-bottom: 1em; diff --git a/app/views/apps/create.js.erb b/app/views/apps/create.js.erb index 947be0c..15eede4 100644 --- a/app/views/apps/create.js.erb +++ b/app/views/apps/create.js.erb @@ -1,4 +1,4 @@ -$('#flash').empty(); +$('#flash-content').empty(); $('.modalBox-flash').empty(); <%- if flash[:alert] %> request_processed = false; @@ -11,7 +11,7 @@ $('.modalBox-flash').empty(); appsTable.dataTable().fnDestroy(); appsTable.dataTable(appsTable_Settings); <%- if flash[:notice] %> - $('#flash').append('
<%= escape_javascript(flash[:notice]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:notice]) %>
'); $('#flash').fadeIn('slow'); <%- end %> <%- end %> diff --git a/app/views/apps/delete.js.erb b/app/views/apps/delete.js.erb index 4445ac9..a50d711 100644 --- a/app/views/apps/delete.js.erb +++ b/app/views/apps/delete.js.erb @@ -1,6 +1,6 @@ -$('#flash').empty(); +$('#flash-content').empty(); <%- if flash[:alert] %> - $('#flash').append('
<%= escape_javascript(flash[:alert]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:alert]) %>
'); $('#flash').fadeIn('slow'); <%- else %> var row = $('tr.#app-<%= @name %>').html('<%= escape_javascript(flash[:notice]) %>').addClass('highlight'); diff --git a/app/views/apps/envvars/set_var.js.erb b/app/views/apps/envvars/set_var.js.erb index 125edc9..f1abd5e 100644 --- a/app/views/apps/envvars/set_var.js.erb +++ b/app/views/apps/envvars/set_var.js.erb @@ -5,7 +5,7 @@ <%= escape_javascript @var_value %> <%- end %> <%- else %> - $('#flash').empty(); + $('#flash-content').empty(); $('.modalBox-flash').empty(); <%- if flash[:alert] %> request_processed = false; diff --git a/app/views/apps/envvars/unset_var.js.erb b/app/views/apps/envvars/unset_var.js.erb index 36c27d6..4df8088 100644 --- a/app/views/apps/envvars/unset_var.js.erb +++ b/app/views/apps/envvars/unset_var.js.erb @@ -1,6 +1,6 @@ -$('#flash').empty(); +$('#flash-content').empty(); <%- if flash[:alert] %> - $('#flash').append('
<%= escape_javascript(flash[:alert]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:alert]) %>
'); $('#flash').fadeIn('slow'); <%- else %> var row = $('tr.#app-<%= @name %>-envvar-<%= @var_name %>').html('<%= escape_javascript(flash[:notice]) %>').addClass('highlight'); diff --git a/app/views/apps/files/app_view_file.html.haml b/app/views/apps/files/app_view_file.html.haml index 0af163c..927d712 100644 --- a/app/views/apps/files/app_view_file.html.haml +++ b/app/views/apps/files/app_view_file.html.haml @@ -14,7 +14,7 @@ - if flash[:alert] :javascript $(function() { - $('#flash').empty(); + $('#flash-content').empty(); $('.modalLog-flash').empty(); $('.modalLog-flash').append('
#{escape_javascript(flash[:alert])}
'); $('.modalLog-flash').fadeIn('slow'); @@ -22,7 +22,7 @@ - else :javascript $(function() { - $('#flash').empty(); + $('#flash-content').empty(); $('.modalLog-flash').empty(); appLogfileTable_Settings = { 'bAutoWidth': false, diff --git a/app/views/apps/files/files.js.erb b/app/views/apps/files/files.js.erb index 92e3323..e78a165 100644 --- a/app/views/apps/files/files.js.erb +++ b/app/views/apps/files/files.js.erb @@ -1,6 +1,6 @@ -$('#flash').empty(); +$('#flash-content').empty(); <%- if flash[:alert] %> - $('#flash').append('
<%= escape_javascript(flash[:alert]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:alert]) %>
'); $('#flash').fadeIn('slow'); <%- else %> $('#app-files').hide(150, function() { diff --git a/app/views/apps/files/view_file.js.erb b/app/views/apps/files/view_file.js.erb index 5ded0c8..ed76a66 100644 --- a/app/views/apps/files/view_file.js.erb +++ b/app/views/apps/files/view_file.js.erb @@ -1,6 +1,6 @@ -$('#flash').empty(); +$('#flash-content').empty(); <%- if flash[:alert] %> - $('#flash').append('
<%= escape_javascript(flash[:alert]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:alert]) %>
'); $('#flash').fadeIn('slow'); <%- else %> $('#app-files').hide(150, function() { diff --git a/app/views/apps/restart.js.erb b/app/views/apps/restart.js.erb index 83c34dc..8eb5f01 100644 --- a/app/views/apps/restart.js.erb +++ b/app/views/apps/restart.js.erb @@ -1,7 +1,7 @@ -$('#flash').empty(); +$('#flash-content').empty(); <%- if flash[:alert] %> request_processed = false; - $('#flash').append('
<%= escape_javascript(flash[:alert]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:alert]) %>
'); $('#flash').fadeIn('slow'); <%- else %> request_processed = true; diff --git a/app/views/apps/services/bind_service.js.erb b/app/views/apps/services/bind_service.js.erb index 14b4ab8..abbe170 100644 --- a/app/views/apps/services/bind_service.js.erb +++ b/app/views/apps/services/bind_service.js.erb @@ -1,4 +1,4 @@ -$('#flash').empty(); +$('#flash-content').empty(); $('.modalBox-flash').empty(); <%- if flash[:alert] %> request_processed = false; diff --git a/app/views/apps/services/unbind_service.js.erb b/app/views/apps/services/unbind_service.js.erb index fb9b15b..5202096 100644 --- a/app/views/apps/services/unbind_service.js.erb +++ b/app/views/apps/services/unbind_service.js.erb @@ -1,6 +1,6 @@ -$('#flash').empty(); +$('#flash-content').empty(); <%- if flash[:alert] %> - $('#flash').append('
<%= escape_javascript(flash[:alert]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:alert]) %>
'); $('#flash').fadeIn('slow'); <%- else %> var row = $('tr.#app-<%= @name %>-service-<%= @service %>').html('<%= escape_javascript(flash[:notice]) %>').addClass('highlight'); diff --git a/app/views/apps/start.js.erb b/app/views/apps/start.js.erb index 83c34dc..8eb5f01 100644 --- a/app/views/apps/start.js.erb +++ b/app/views/apps/start.js.erb @@ -1,7 +1,7 @@ -$('#flash').empty(); +$('#flash-content').empty(); <%- if flash[:alert] %> request_processed = false; - $('#flash').append('
<%= escape_javascript(flash[:alert]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:alert]) %>
'); $('#flash').fadeIn('slow'); <%- else %> request_processed = true; diff --git a/app/views/apps/stop.js.erb b/app/views/apps/stop.js.erb index 83c34dc..8eb5f01 100644 --- a/app/views/apps/stop.js.erb +++ b/app/views/apps/stop.js.erb @@ -1,7 +1,7 @@ -$('#flash').empty(); +$('#flash-content').empty(); <%- if flash[:alert] %> request_processed = false; - $('#flash').append('
<%= escape_javascript(flash[:alert]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:alert]) %>
'); $('#flash').fadeIn('slow'); <%- else %> request_processed = true; diff --git a/app/views/apps/update_bits.js.erb b/app/views/apps/update_bits.js.erb index d93fb27..f75a54c 100644 --- a/app/views/apps/update_bits.js.erb +++ b/app/views/apps/update_bits.js.erb @@ -1,4 +1,4 @@ -$('#flash').empty(); +$('#flash-content').empty(); $('.modalBox-flash').empty(); <%- if flash[:alert] %> request_processed = false; @@ -7,7 +7,7 @@ $('.modalBox-flash').empty(); <%- else %> request_processed = true; <%- if flash[:notice] %> - $('#flash').append('
<%= escape_javascript(flash[:notice]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:notice]) %>
'); $('#flash').fadeIn('slow'); <%- end %> <%- end %> \ No newline at end of file diff --git a/app/views/apps/urls/map_url.js.erb b/app/views/apps/urls/map_url.js.erb index 9dd7839..0b07fd9 100644 --- a/app/views/apps/urls/map_url.js.erb +++ b/app/views/apps/urls/map_url.js.erb @@ -1,4 +1,4 @@ -$('#flash').empty(); +$('#flash-content').empty(); $('.modalBox-flash').empty(); <%- if flash[:alert] %> request_processed = false; diff --git a/app/views/apps/urls/unmap_url.js.erb b/app/views/apps/urls/unmap_url.js.erb index 309cf5b..06d1822 100644 --- a/app/views/apps/urls/unmap_url.js.erb +++ b/app/views/apps/urls/unmap_url.js.erb @@ -1,6 +1,6 @@ -$('#flash').empty(); +$('#flash-content').empty(); <%- if flash[:alert] %> - $('#flash').append('
<%= escape_javascript(flash[:alert]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:alert]) %>
'); $('#flash').fadeIn('slow'); <%- else %> var row = $('tr.#app-<%= @name %>-url-<%= @url_hash %>').html('<%= escape_javascript(flash[:notice]) %>').addClass('highlight'); diff --git a/app/views/layouts/_flashes.html.haml b/app/views/layouts/_flashes.html.haml index 4f575a7..a2aeb32 100644 --- a/app/views/layouts/_flashes.html.haml +++ b/app/views/layouts/_flashes.html.haml @@ -1,7 +1,9 @@ #flash - - flash.each do |key, value| - .message{:class => key} - %p= value + %a.close{:href => "#"}x + #flash-content + - flash.each do |key, value| + .message{:class => key} + %p= value - if !flash.empty? - content_for :javascripts do diff --git a/app/views/services/create.js.erb b/app/views/services/create.js.erb index 594f257..f0c4aea 100644 --- a/app/views/services/create.js.erb +++ b/app/views/services/create.js.erb @@ -1,4 +1,4 @@ -$('#flash').empty(); +$('#flash-content').empty(); $('.modalBox-flash').empty(); <%- if flash[:alert] %> request_processed = false; diff --git a/app/views/services/delete.js.erb b/app/views/services/delete.js.erb index ebe7883..ced6f9a 100644 --- a/app/views/services/delete.js.erb +++ b/app/views/services/delete.js.erb @@ -1,6 +1,6 @@ -$('#flash').empty(); +$('#flash-content').empty(); <%- if flash[:alert] %> - $('#flash').append('
<%= escape_javascript(flash[:alert]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:alert]) %>
'); $('#flash').fadeIn('slow'); <%- else %> var row = $('tr.#service-<%= @name %>').html('<%= escape_javascript(flash[:notice]) %>').addClass('highlight'); diff --git a/app/views/users/create.js.erb b/app/views/users/create.js.erb index 85913f1..3a8c36f 100644 --- a/app/views/users/create.js.erb +++ b/app/views/users/create.js.erb @@ -1,4 +1,4 @@ -$('#flash').empty(); +$('#flash-content').empty(); $('.modalBox-flash').empty(); <%- if flash[:alert] %> request_processed = false; diff --git a/app/views/users/delete.js.erb b/app/views/users/delete.js.erb index b59d434..0f75b34 100644 --- a/app/views/users/delete.js.erb +++ b/app/views/users/delete.js.erb @@ -1,6 +1,6 @@ -$('#flash').empty(); +$('#flash-content').empty(); <%- if flash[:alert] %> - $('#flash').append('
<%= escape_javascript(flash[:alert]) %>
'); + $('#flash-content').append('
<%= escape_javascript(flash[:alert]) %>
'); $('#flash').fadeIn('slow'); <%- else %> var row = $('tr.#user-<%= @email.hash.to_s %>').html('<%= escape_javascript(flash[:notice]) %>').addClass('highlight');