diff --git a/app/css/loading.sass b/app/css/loading.sass new file mode 100644 index 0000000..43e99f7 --- /dev/null +++ b/app/css/loading.sass @@ -0,0 +1,5 @@ +html, body.loading + height: 100% + +body.loading + background: #eee url(/images/bodyload.gif?embed) center center no-repeat diff --git a/app/images/bodyload.gif b/app/images/bodyload.gif new file mode 100644 index 0000000..7b64478 Binary files /dev/null and b/app/images/bodyload.gif differ diff --git a/app/init/js_css.rb b/app/init/js_css.rb index c1e4f9b..d6efa4b 100644 --- a/app/init/js_css.rb +++ b/app/init/js_css.rb @@ -17,16 +17,9 @@ class Main /js/setup.js ] - css :main, '/main.css', %w[ - /css/style.css - ] - - css :error, '/error.css', %w[ - /css/error.css - ] - - css :print, '/print.css', %w[ - /css/print.css - ] + css :main, '/main.css', %w[/css/style.css] + css :error, '/error.css', %w[/css/error.css] + css :print, '/print.css', %w[/css/print.css] + css :loading, '/loading.css', %w[/css/loading.css] end end diff --git a/app/js/app/views.coffee b/app/js/app/views.coffee index 41d8040..ae1be6e 100644 --- a/app/js/app/views.coffee +++ b/app/js/app/views.coffee @@ -59,6 +59,7 @@ class App.ChromeView extends Backbone.View 'click a': 'onTabClick' render: -> + $('body').removeClass 'loading' $(@el).html JST['editor/chrome']() @$iframe = @$("iframe") diff --git a/app/views/layout.haml b/app/views/layout.haml index 17454e7..3094917 100644 --- a/app/views/layout.haml +++ b/app/views/layout.haml @@ -12,7 +12,7 @@ %title!= title != css :main, media: 'screen, projection' - != css :print, media: 'print' + != css :loading, media: 'screen, projection' != js_cdn :modernizr != "" @@ -28,7 +28,7 @@ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); - %body + %body.loading != yield - unless request.xhr?