diff options
| -rw-r--r-- | app/assets/javascripts/main.js.coffee | 5 | ||||
| -rw-r--r-- | app/assets/stylesheets/common.scss | 4 | ||||
| -rw-r--r-- | app/views/layouts/_flash.html.haml | 20 | ||||
| -rw-r--r-- | app/views/layouts/devise.html.haml | 2 |
4 files changed, 12 insertions, 19 deletions
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee index 3f4b0f61dc4..bdb83f49474 100644 --- a/app/assets/javascripts/main.js.coffee +++ b/app/assets/javascripts/main.js.coffee @@ -33,6 +33,11 @@ $ -> # Bottom tooltip $('.has_bottom_tooltip').tooltip(placement: 'bottom') + # Flash + if (flash = $("#flash-container")).length > 0 + flash.click -> $(@).slideUp("slow") + flash.slideDown "slow" + setTimeout (-> flash.slideUp("slow")), 3000 # Disable form buttons while a form is submitting $('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) -> diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c82ddc185b3..d79e97aa437 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -68,7 +68,7 @@ table a code { } /** FLASH message **/ -#flash_container { +#flash-container { height: 50px; position: fixed; z-index: 10001; @@ -79,6 +79,8 @@ table a code { background: white; cursor: pointer; border-bottom: 1px solid #ccc; + text-align: center; + display: none; h4 { color: #666; diff --git a/app/views/layouts/_flash.html.haml b/app/views/layouts/_flash.html.haml index 86564ad7110..9961ce8dd34 100644 --- a/app/views/layouts/_flash.html.haml +++ b/app/views/layouts/_flash.html.haml @@ -1,17 +1,3 @@ -- if alert || notice - - text = alert || notice - %div{style: "display:none", id: "flash_container"} - %center - %h4= text - :javascript - $(function(){ - $("#flash_container").slideDown("slow"); - $("#flash_container").click(function(){ - $(this).slideUp("slow"); - }); - setTimeout("hideFlash()",3000); - }); - - function hideFlash(){ - $("#flash_container").slideUp("slow"); - } +- if text = alert || notice + #flash-container + %h4= text diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml index 70c4f007ba1..36c6b4c6c35 100644 --- a/app/views/layouts/devise.html.haml +++ b/app/views/layouts/devise.html.haml @@ -2,5 +2,5 @@ %html{ lang: "en"} = render "layouts/head" %body.ui_basic.login-page - = render partial: "layouts/flash" + = render "layouts/flash" .container= yield |