aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2016-07-11 15:38:19 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2016-07-11 16:38:32 +0100
commit03ad5de783ac71695b1ce0d377dde549fc7311cb (patch)
treea315d42b10eabe9fedf537cd7831ee79434cf52c
parent5b8ead95e50d8469821f398de8fa1d0be45b2562 (diff)
[fixmystreet.com] Update share buttons to be links
Having them as SDK-included buttons causes issues with the ajax report pull-ins, plus Firefox doesn't like them being hidden.
-rw-r--r--templates/web/base/report/display_tools.html21
-rw-r--r--web/cobrands/sass/_base.scss19
2 files changed, 23 insertions, 17 deletions
diff --git a/templates/web/base/report/display_tools.html b/templates/web/base/report/display_tools.html
index 435bfcbc1..590f81593 100644
--- a/templates/web/base/report/display_tools.html
+++ b/templates/web/base/report/display_tools.html
@@ -23,19 +23,14 @@
[% IF c.cobrand.moniker == 'fixmystreet' %]
<div id="report-share" class="hidden-js" align="center">
- <div id="fb-root"></div>
- <a href="https://twitter.com/share" class="twitter-share-button" data-text="I just reported &lsquo;[% problem.title_safe | html %]&rsquo;" data-via="fixmystreet" data-related="mysociety" data-count="none" data-dnt="true">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)) return;
- js = d.createElement(s); js.id = id;
- js.src = "//connect.facebook.net/en_GB/sdk.js#xfbml=1&version=v2.6";
- fjs.parentNode.insertBefore(js, fjs);
- }(document, 'script', 'facebook-jssdk'));</script>
- <div style="line-height:1" class="fb-share-button" data-layout="button" data-mobile-iframe="true"><a class="fb-xfbml-parse-ignore" target="_blank" href="https://www.facebook.com/sharer/sharer.php?src=sdkpreparse">Share</a></div>
-
+ <a class="btn btn--social btn--twitter" href="https://twitter.com/intent/tweet?text=I%20just%20viewed%20this%20report:%20&lsquo;[% problem.title_safe | uri %]&rsquo;&amp;via=fixmystreet&amp;related=mySociety">
+ <img alt="" src="/i/twitter-icon-32.png" width="17" height="32">
+ Tweet
+ </a>
+ <a class="btn btn--social btn--facebook" href="https://www.facebook.com/sharer/sharer.php?u=[% c.cobrand.base_url %][% c.req.uri.path %]">
+ <img alt="" src="/i/facebook-icon-32.png" width="17" height="32">
+ Share
+ </a>
</div>
[% END %]
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index c5f9db467..e87f26690 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -651,8 +651,16 @@ body.mappage .wrapper {
float: $right;
}
-#report-share iframe {
- vertical-align: top;
+#report-share {
+ .btn {
+ padding-left: 1.5em;
+ padding-right: 1.5em;
+ display: inline-block;
+ }
+
+ .btn + .btn {
+ margin-left: 1em;
+ }
}
//footer blocks
@@ -749,10 +757,13 @@ input.final-submit {
}
}
+.btn--block {
+ display: block;
+ width: auto;
+}
+
// Under the button to override its text transform and width
.btn--social {
- display: block;
- width: 100%;
text-transform: none;
text-align: center;
}