Skip to content

Commit

Permalink
Merge pull request #103 from msevestre/master
Browse files Browse the repository at this point in the history
URL for tag are lower case + little UI Change in social sharing
  • Loading branch information
jipiboily committed Oct 2, 2012
2 parents c08f8bf + f7fa45b commit 2387fdb
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 34 deletions.
8 changes: 4 additions & 4 deletions app/assets/stylesheets/monologue/blog/monologue.css
Expand Up @@ -158,7 +158,7 @@ a.social {
line-height: 32px; line-height: 32px;
margin-bottom: 4px; margin-bottom: 4px;
} }

none
/* footer */ /* footer */


.content article footer h1 { .content article footer h1 {
Expand All @@ -174,12 +174,12 @@ a.social {
} }


#social-share { #social-share {
text-align: center; /*text-align: center;*/
width: 100%; width: 100%;
} }


#facebook, #twitter, #google-plus { #facebook, #twitter, #google-plus {
display: inline; display: inline;
margin: 0 40px 0 40px; /*margin: 0 40px 0 40px;*/
padding: 0 0 0 0; /*padding: 0 0 0 0;*/
} }
2 changes: 1 addition & 1 deletion app/helpers/monologue/application_helper.rb
Expand Up @@ -50,7 +50,7 @@ def facebook_icon


# TODO: That should be move in TagHelper if I manage to get that loaded # TODO: That should be move in TagHelper if I manage to get that loaded
def tag_url(tag) def tag_url(tag)
"#{Monologue::Engine.routes.url_helpers.root_path}tags/#{tag.name}" "#{Monologue::Engine.routes.url_helpers.root_path}tags/#{tag.name.downcase}"
end end


def label_for_tag(tag, min, max) def label_for_tag(tag, min, max)
Expand Down
60 changes: 31 additions & 29 deletions app/views/monologue/posts/_social_sharing.html.erb
@@ -1,49 +1,51 @@
<footer class="monologue-social-sharing" data-monologue="monologue-social-sharing"> <footer class="monologue-social-sharing" data-monologue="monologue-social-sharing">
<h1><%= t(".tagline") %></h1> <h1><%= t(".tagline") %></h1>
<div id="social-share"> <div id="social-share">
<div id="facebook"> <div id="google-plus">
<!-- FACEBOOK LIKE --> <!-- GOOGLE +1 -->
<div id="fb-root"></div> <!-- Placez cette balise là où vous souhaitez positionner le bouton +1. -->
<script>(function(d, s, id) { <g:plusone size="medium"></g:plusone>
var js, fjs = d.getElementsByTagName(s)[0];
if (d.getElementById(id)) return; <!-- Placez cet appel d'affichage à l'endroit approprié. -->
js = d.createElement(s); js.id = id; <script type="text/javascript">
js.src = "//connect.facebook.net/<%= Monologue.facebook_like_locale || "en_US" %>/all.js#xfbml=1&appId=288133081204194"; window.___gcfg = {lang: '<%=Monologue.google_plusone_locale || "en" %>'};
fjs.parentNode.insertBefore(js, fjs);
}(document, 'script', 'facebook-jssdk'));</script>
<div class="fb-like" data-layout="box_count" data-show-faces="true" data-font="verdana"></div>
<!-- /FACEBOOK LIKE -->
</div>


(function() {
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
po.src = 'https://apis.google.com/js/plusone.js';
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
})();
</script>
<!-- /GOOGLE +1 -->
</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="http://<%= 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="vertical">Tweet</a> data-count="horizontal">Tweet</a>


<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script> <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
<!-- /TWITTER --> <!-- /TWITTER -->
</div> </div>


<div id="google-plus">
<!-- GOOGLE +1 -->
<!-- Placez cette balise là où vous souhaitez positionner le bouton +1. -->
<g:plusone size="tall"></g:plusone>


<!-- Placez cet appel d'affichage à l'endroit approprié. --> <div id="facebook">
<script type="text/javascript"> <!-- FACEBOOK LIKE -->
window.___gcfg = {lang: '<%=Monologue.google_plusone_locale || "en" %>'}; <div id="fb-root"></div>

<script>(function(d, s, id) {
(function() { var js, fjs = d.getElementsByTagName(s)[0];
var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true; if (d.getElementById(id)) return;
po.src = 'https://apis.google.com/js/plusone.js'; js = d.createElement(s); js.id = id;
var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s); js.src = "//connect.facebook.net/<%= Monologue.facebook_like_locale || "en_US" %>/all.js#xfbml=1&appId=288133081204194";
})(); fjs.parentNode.insertBefore(js, fjs);
</script> }(document, 'script', 'facebook-jssdk'));</script>
<!-- /GOOGLE +1 --> <div class="fb-like" data-send="false" data-width="450" data-show-faces="false"></div>
<!-- /FACEBOOK LIKE -->
</div> </div>


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

0 comments on commit 2387fdb

Please sign in to comment.