Merge pull request #5494 from Matt-Yorkley/group-maps-fix

Fix group maps

app/assets/javascripts/darkswarm/controllers/group_page_controller.js.coffee

@@ -1,6 +1,3 @@
-Darkswarm.controller "GroupPageCtrl", ($scope, enterprises, Enterprises, MapConfiguration, OfnMap) ->
+Darkswarm.controller "GroupPageCtrl", ($scope, enterprises, Enterprises) ->
   $scope.Enterprises = Enterprises
-
-  $scope.map = angular.copy MapConfiguration.options
-  $scope.mapMarkers = OfnMap.enterprise_markers enterprises
   $scope.embedded_layout = window.location.search.indexOf("embedded_shopfront=true") != -1

app/assets/stylesheets/darkswarm/map.css.scss

@@ -63,3 +63,8 @@
     left: 0px;
   }
 }
+
+.tabs-content .map-footer {
+  position: relative;
+  bottom: 30px;
+}

app/views/groups/show.html.haml

@@ -32,13 +32,8 @@
             %tab{heading: t(:label_map),
                 active: "tabs.map.active",
                 select: "select(\'map\')"}
-              .map-container
-                %map{"ng-if" => "(isActive(\'/map\') && (mapShowed = true)) || mapShowed"}
-                  %ui-gmap-google-map{options: "map.additional_options", center: "map.center", zoom: "map.zoom", styles: "map.styles", draggable: "true"}
-                    %map-osm-tiles
-                    %map-search
-                    %ui-gmap-markers{models: "mapMarkers", fit: "true",
-                    coords: "'self'", icon: "'icon'", click: "'reveal'"}
+              %div{"ng-if" => "(isActive(\'/map\') && (mapShowed = true)) || mapShowed"}
+                = render partial: "shared/map"
 
             %tab{heading: t(:groups_about),
                 active: "tabs.about.active",

app/views/map/index.html.haml

@@ -4,13 +4,4 @@
 - content_for :injection_data do
   = inject_enterprise_shopfront_list
 
-.map-container{"fill-vertical" => true}
-  %map{"ng-controller" => "MapCtrl"}
-    %ui-gmap-google-map{options: "map.additional_options", center: "map.center", zoom: "map.zoom", styles: "map.styles", draggable: "true"}
-      %map-osm-tiles
-      %map-search
-      %ui-gmap-markers{models: "OfnMap.enterprises", fit: "true",
-      coords: "'self'", icon: "'icon'", click: "'reveal'"}
-
-.map-footer
-  %a{:href => "http://www.openstreetmap.org/copyright"} © OpenStreetMap contributors
+= render partial: "shared/map"

app/views/shared/_map.html.haml

@@ -0,0 +1,11 @@
+.map-container
+  %map{"ng-controller" => "MapCtrl"}
+    %ui-gmap-google-map{options: "map.additional_options", center: "map.center", zoom: "map.zoom",
+                        styles: "map.styles", draggable: "true"}
+      %map-osm-tiles
+      %map-search
+      %ui-gmap-markers{models: "OfnMap.enterprises", fit: "true",
+                       coords: "'self'", icon: "'icon'", click: "'reveal'"}
+
+.map-footer
+  %a{:href => "http://www.openstreetmap.org/copyright"} © OpenStreetMap contributors