Permalink
Browse files

Merge pull request #112 from swalkinshaw/request-protocol

Use request.protocol instead of hardcoded http
  • Loading branch information...
2 parents d135319 + 561328f commit df0e8159c19e0ac48dc1d536a20ec0e980f67f82 @jipiboily committed Nov 10, 2012
@@ -1,7 +1,7 @@
<meta property="og:title" content="<%= monologue_accurate_title %>"/>
<meta property="og:type" content="<%= controller.action_name == "show" ? "article" : "blog" %>"/>
-<meta property="og:url" content="http://<%= request.host_with_port %><%= request.path.gsub("//","/") %>"/>
+<meta property="og:url" content="<%= request.protocol %><%= request.host_with_port %><%= request.path.gsub("//","/") %>"/>
<meta property="og:site_name" content="<%= Monologue.site_name %>"/>
<% if Monologue.facebook_logo%>
<meta property="og:image" content="<%= absolute_image_url(image_path(Monologue.facebook_logo)) %>" />
-<% end %>
+<% end %>
@@ -2,6 +2,6 @@
<% if Monologue.twitter_username %>
<meta name="twitter:site" content="<%= Monologue.twitter_username %>">
<% end %>
-<meta name="twitter:url" content="http://<%= request.host_with_port %><%= request.path.gsub("//","/") %>">
+<meta name="twitter:url" content="<%= request.protocol %><%= request.host_with_port %><%= request.path.gsub("//","/") %>">
<meta name="twitter:title" content="<%= monologue_accurate_title %>">
-<meta name="twitter:description" content="<%= content_for?(:meta_description) ? yield(:meta_description) : Monologue.meta_description %>">
+<meta name="twitter:description" content="<%= content_for?(:meta_description) ? yield(:meta_description) : Monologue.meta_description %>">
@@ -2,7 +2,7 @@
<span class="social-tagline"><%= t(".tagline") %></span>
<div id="social-share">
<div id="google-plus">
- <!-- GOOGLE +1 -->
+ <!-- GOOGLE +1 -->
<!-- Placez cette balise là où vous souhaitez positionner le bouton +1. -->
<g:plusone size="medium"></g:plusone>
@@ -16,13 +16,13 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})();
</script>
- <!-- /GOOGLE +1 -->
+ <!-- /GOOGLE +1 -->
</div>
<div id="twitter">
<!-- TWITTER -->
<a href="https://twitter.com/share" class="twitter-share-button"
data-lang="<%= Monologue.twitter_locale || "en" %>"
- data-url="http://<%= request.host_with_port %><%= request.path.gsub("//","/") %>"
+ data-url="<%= request.protocol %><%= request.host_with_port %><%= request.path.gsub("//","/") %>"
data-via="<%=Monologue.twitter_username%>"
data-text="<%=@revision.title%>"
data-count="horizontal">Tweet</a>
@@ -34,7 +34,7 @@
<div id="facebook">
<!-- FACEBOOK LIKE -->
- <div id="fb-root"></div>
+ <div id="fb-root"></div>
<script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return;
@@ -48,4 +48,4 @@
</div>
-</footer>
+</footer>

0 comments on commit df0e815

Please sign in to comment.