Permalink
Browse files

Merge pull request #103 from msevestre/master

URL for tag are lower case + little UI Change in social sharing
  • Loading branch information...
2 parents c08f8bf + f7fa45b commit 2387fdb615dadc042fc95842b1ee0d3f90c20fac @jipiboily committed Oct 2, 2012
@@ -158,7 +158,7 @@ a.social {
line-height: 32px;
margin-bottom: 4px;
}
-
+ none
/* footer */
.content article footer h1 {
@@ -174,12 +174,12 @@ a.social {
}
#social-share {
- text-align: center;
+ /*text-align: center;*/
width: 100%;
}
#facebook, #twitter, #google-plus {
display: inline;
- margin: 0 40px 0 40px;
- padding: 0 0 0 0;
+ /*margin: 0 40px 0 40px;*/
+ /*padding: 0 0 0 0;*/
}
@@ -50,7 +50,7 @@ def facebook_icon
# TODO: That should be move in TagHelper if I manage to get that loaded
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
def label_for_tag(tag, min, max)
@@ -1,49 +1,51 @@
<footer class="monologue-social-sharing" data-monologue="monologue-social-sharing">
<h1><%= t(".tagline") %></h1>
<div id="social-share">
- <div id="facebook">
- <!-- FACEBOOK LIKE -->
- <div id="fb-root"></div>
- <script>(function(d, s, id) {
- var js, fjs = d.getElementsByTagName(s)[0];
- if (d.getElementById(id)) return;
- js = d.createElement(s); js.id = id;
- js.src = "//connect.facebook.net/<%= Monologue.facebook_like_locale || "en_US" %>/all.js#xfbml=1&appId=288133081204194";
- 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>
+ <div id="google-plus">
+ <!-- GOOGLE +1 -->
+ <!-- Placez cette balise là où vous souhaitez positionner le bouton +1. -->
+ <g:plusone size="medium"></g:plusone>
+
+ <!-- Placez cet appel d'affichage à l'endroit approprié. -->
+ <script type="text/javascript">
+ window.___gcfg = {lang: '<%=Monologue.google_plusone_locale || "en" %>'};
+ (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">
<!-- 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-via="<%=Monologue.twitter_username%>"
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>
<!-- /TWITTER -->
</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é. -->
- <script type="text/javascript">
- window.___gcfg = {lang: '<%=Monologue.google_plusone_locale || "en" %>'};
-
- (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 id="facebook">
+ <!-- FACEBOOK LIKE -->
+ <div id="fb-root"></div>
+ <script>(function(d, s, id) {
+ var js, fjs = d.getElementsByTagName(s)[0];
+ if (d.getElementById(id)) return;
+ js = d.createElement(s); js.id = id;
+ js.src = "//connect.facebook.net/<%= Monologue.facebook_like_locale || "en_US" %>/all.js#xfbml=1&appId=288133081204194";
+ fjs.parentNode.insertBefore(js, fjs);
+ }(document, 'script', 'facebook-jssdk'));</script>
+ <div class="fb-like" data-send="false" data-width="450" data-show-faces="false"></div>
+ <!-- /FACEBOOK LIKE -->
</div>
+
+
</div>
</footer>

0 comments on commit 2387fdb

Please sign in to comment.