Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use request.protocol instead of hardcoded http #112

Merged
merged 1 commit into from
Nov 10, 2012
Merged

Use request.protocol instead of hardcoded http #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/views/layouts/monologue/application/_fb_open_graph.html.erb
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
@@ -1,7 +1,7 @@
<meta property="og:title" content="<%= monologue_accurate_title %>"/> <meta property="og:title" content="<%= monologue_accurate_title %>"/>
<meta property="og:type" content="<%= controller.action_name == "show" ? "article" : "blog" %>"/> <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 %>"/> <meta property="og:site_name" content="<%= Monologue.site_name %>"/>
<% if Monologue.facebook_logo%> <% if Monologue.facebook_logo%>
<meta property="og:image" content="<%= absolute_image_url(image_path(Monologue.facebook_logo)) %>" /> <meta property="og:image" content="<%= absolute_image_url(image_path(Monologue.facebook_logo)) %>" />
<% end %> <% end %>
4 changes: 2 additions & 2 deletions app/views/layouts/monologue/application/_twitter_cards.html.erb
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<% if Monologue.twitter_username %> <% if Monologue.twitter_username %>
<meta name="twitter:site" content="<%= Monologue.twitter_username %>"> <meta name="twitter:site" content="<%= Monologue.twitter_username %>">
<% end %> <% 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: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 %>">
10 changes: 5 additions & 5 deletions app/views/monologue/posts/_social_sharing.html.erb
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<span class="social-tagline"><%= t(".tagline") %></span> <span class="social-tagline"><%= t(".tagline") %></span>
<div id="social-share"> <div id="social-share">
<div id="google-plus"> <div id="google-plus">
<!-- GOOGLE +1 --> <!-- GOOGLE +1 -->
<!-- Placez cette balise là où vous souhaitez positionner le bouton +1. --> <!-- Placez cette balise là où vous souhaitez positionner le bouton +1. -->
<g:plusone size="medium"></g:plusone> <g:plusone size="medium"></g:plusone>


Expand All @@ -16,13 +16,13 @@
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s); var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})(); })();
</script> </script>
<!-- /GOOGLE +1 --> <!-- /GOOGLE +1 -->
</div> </div>
<div id="twitter"> <div id="twitter">
<!-- TWITTER --> <!-- TWITTER -->
<a href="https://twitter.com/share" class="twitter-share-button" <a href="https://twitter.com/share" class="twitter-share-button"
data-lang="<%= Monologue.twitter_locale || "en" %>" 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-via="<%=Monologue.twitter_username%>"
data-text="<%=@revision.title%>" data-text="<%=@revision.title%>"
data-count="horizontal">Tweet</a> data-count="horizontal">Tweet</a>
Expand All @@ -34,7 +34,7 @@


<div id="facebook"> <div id="facebook">
<!-- FACEBOOK LIKE --> <!-- FACEBOOK LIKE -->
<div id="fb-root"></div> <div id="fb-root"></div>
<script>(function(d, s, id) { <script>(function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0]; var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return; if (d.getElementById(id)) return;
Expand All @@ -48,4 +48,4 @@




</div> </div>
</footer> </footer>