Merging in maps

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()

app/assets/javascripts/darkswarm/services/map.js.coffee

@@ -6,17 +6,7 @@ Darkswarm.factory "OfnMap", (enterprisesForMap, MapModal)->
     # Adding methods to each enterprise
     extend: (enterprise)->
       new class MapMarker
-<<<<<<< HEAD
-        icon: "/test.opng"
-        constructor: ->
-          @[k] = v for k, v of enterprise
-
-        reveal: =>
-
-          console.log @
-=======
         constructor: ->
           @[k] = v for k, v of enterprise
         reveal: =>
->>>>>>> master
           MapModal.open @

app/views/layouts/darkswarm.html.haml

@@ -27,8 +27,6 @@
       .inner-wrap
         = render partial: "shared/menu/menu"
 
-        %ofn-flash
-
         %section{ role: "main" }
           = yield
           

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'"} 
-
-

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"