From 21b6e91913548dfaa3db60d7a4e8aa9edba1f6e7 Mon Sep 17 00:00:00 2001
From: Will Marshall <will@willmarshall.me>
Date: Tue, 10 Jun 2014 12:29:31 +1000
Subject: [PATCH] Moving OFN flash to fixed block

---
 app/assets/javascripts/darkswarm/directives/flash.js.coffee | 2 +-
 app/views/layouts/darkswarm.html.haml                       | 2 --
 app/views/map/index.html.haml                               | 2 --
 app/views/shared/menu/_menu.html.haml                       | 1 +
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/darkswarm/directives/flash.js.coffee b/app/assets/javascripts/darkswarm/directives/flash.js.coffee
index a302a2a891..b5c9aaddd8 100644
--- a/app/assets/javascripts/darkswarm/directives/flash.js.coffee
+++ b/app/assets/javascripts/darkswarm/directives/flash.js.coffee
@@ -16,7 +16,7 @@ Darkswarm.directive "ofnFlash", (flash, $timeout, RailsFlashLoader)->
     show = (message, type)=>
       if message
         $scope.flashes.push({message: message, type: typePairings[type]})
-        $timeout($scope.delete, 5000)
+        $timeout($scope.delete, 10000)
 
     $scope.delete = ->
       $scope.flashes.shift()
diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml
index 1b1d97f85d..48fec6aa9d 100644
--- a/app/views/layouts/darkswarm.html.haml
+++ b/app/views/layouts/darkswarm.html.haml
@@ -27,8 +27,6 @@
       .inner-wrap
         = render partial: "shared/menu/menu"
 
-        %ofn-flash
-
         %section{ role: "main" }
           = yield
           
diff --git a/app/views/map/index.html.haml b/app/views/map/index.html.haml
index 9fec2290d8..45c6a8778c 100644
--- a/app/views/map/index.html.haml
+++ b/app/views/map/index.html.haml
@@ -5,5 +5,3 @@
     %google-map{center: "map.center", zoom: "map.zoom", styles: "map.styles", draggable: "true"}
       %markers{models: "OfnMap.enterprises", fit: "true", 
       coords: "'self'", icon: "'icon'", click: "'reveal'"} 
-
-
diff --git a/app/views/shared/menu/_menu.html.haml b/app/views/shared/menu/_menu.html.haml
index d673a962db..616b128d78 100644
--- a/app/views/shared/menu/_menu.html.haml
+++ b/app/views/shared/menu/_menu.html.haml
@@ -1,3 +1,4 @@
 .fixed
   = render partial: "shared/menu/large_menu"
+  %ofn-flash
 = render partial: "shared/menu/mobile_menu"