Merge pull request #5770 from openfoodfoundation/revert-5601-enhancem…

…ent/5454-links-to-shops-in-new-tabs Revert "Enhancement/5454 make links to shops under Groups > Producers open in new tab"
openfoodfoundation · Aug 5, 2020 · d8acf90 · d8acf90
2 parents 6cc2969 + efacca6
commit d8acf90
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/views/producers/_fat.html.haml b/app/views/producers/_fat.html.haml
@@ -78,8 +78,8 @@
     .row.cta-container
       .columns.small-12
         %a.cta-hub{"ng-repeat" => "hub in producer.hubs | orderBy:'-active'",
-        "ng-href" => "{{::hub.path}}", "ng-attr-target" => "_blank",
-        "ng-class" => "::{primary: hub.active, secondary: !hub.active}", "target" => "_blank"}
+        "ng-href" => "{{::hub.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined }}",
+        "ng-class" => "::{primary: hub.active, secondary: !hub.active}"}
           %i.ofn-i_068-shop-reversed{"ng-if" => "::hub.active"}
           %i.ofn-i_068-shop-reversed{"ng-if" => "::!hub.active"}
           .hub-name{"ng-bind" => "::hub.name"}

diff --git a/app/views/producers/_skinny.html.haml b/app/views/producers/_skinny.html.haml
@@ -3,7 +3,7 @@
     %span{"ng-if" => "::producer.is_distributor" }
       .row.vertical-align-middle
         .columns.small-12
-          %a.is_distributor{"ng-href" => "{{::producer.path}}", "ng-attr-target" => "_blank", "data-is-link" => "true", "target" => "_blank"}
+          %a.is_distributor{"ng-href" => "{{::producer.path}}", "ng-attr-target" => "{{ embedded_layout ? '_blank' : undefined}}", "data-is-link" => "true"}
             %i{ng: {class: "::producer.producer_icon_font"}}
             %span.margin-top
               %strong{"ng-bind" => "::producer.name"}