Merge remote-tracking branch 'upstream/pull/4892'

[rails.git] / app / helpers / open_graph_helper.rb

diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb
index 12c794dd08d6ddcb929a0bb73452e07e302f2297..aebb5d85678b05a581ea25936fafc8977eb78ca6 100644 (file)
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -1,16 +1,16 @@
 module OpenGraphHelper
 module OpenGraphHelper

-  def opengraph_tags(title = nil)
+  def opengraph_tags(title = nil, og_image = nil)

     tags = {
       "og:site_name" => t("layouts.project_name.title"),
     tags = {
       "og:site_name" => t("layouts.project_name.title"),

-      "og:title" => [t("layouts.project_name.title"), title].compact.join(" | "),
+      "og:title" => title || t("layouts.project_name.title"),

       "og:type" => "website",
       "og:type" => "website",

-      "og:image" => image_path("osm_logo.svg", :host => SERVER_URL),
-      "og:image:width" => "200",
-      "og:image:height" => "200"
+      "og:image" => og_image ? URI.join(root_url, og_image) : image_url("osm_logo_256.png"),
+      "og:url" => url_for(:only_path => false),
+      "og:description" => t("layouts.intro_text")

     }
 
     }
 

-    tags.map do |property, content|
-      tag(:meta, :property => property, :content => content)
-    end.join("").html_safe
+    safe_join(tags.map do |property, content|
+      tag.meta(:property => property, :content => content)
+    end, "\n")

   end
 end
   end
 end