Extract repeated map code to new partial

openfoodfoundation · May 25, 2020 · a3660df · a3660df
1 parent e03005e
commit a3660df
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/app/views/groups/show.html.haml b/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-controller" => "MapCtrl", "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: "OfnMap.enterprises", 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",

diff --git a/app/views/map/index.html.haml b/app/views/map/index.html.haml
@@ -4,13 +4,7 @@
 - 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'"}
+= render partial: "shared/map"
 
 .map-footer
   %a{:href => "http://www.openstreetmap.org/copyright"} &copy; OpenStreetMap contributors
diff --git a/app/views/shared/_map.html.haml b/app/views/shared/_map.html.haml
@@ -0,0 +1,8 @@
+.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'"}