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.

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

Replace AddThis with SocialSharePrivacy (hopefully fixes #36) #57

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"devDependencies": {},
"scripts": {
"start": "node sharefest/server.js"
"start": "cd sharefest; node server.js"
},
"engines": {
"node": "0.6.x"
Expand Down
6 changes: 6 additions & 0 deletions sharefest/public/SocialSharePrivacy/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
The content of this folder was automatically generated. To regenerate it:

* `git clone https://github.com/thedod/SocialSharePrivacy-1.git` and cd there
* Install the dependencies as explained in the README, or figure them out as you go along ;)
* run `./build.sh -m mail,fbshare,twitter -l none -a off -p SocialSharePrivacy/ -o SocialSharePrivacy` (or something similar)

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 26 additions & 13 deletions sharefest/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,23 @@
<meta property="og:description" content="Sharefest is a free service to send files directly">
<meta name="description" content="Sharefest is a free service to send files directly">
<!-- Bootstrap -->
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>

<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
<script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
<link href="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css" rel="stylesheet">
<script src="https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>

<link href="css/main_new.css" rel="stylesheet">
<!-- begin SocialSharePrivacy -->
<script type="text/javascript" src="SocialSharePrivacy/javascripts/jquery.socialshareprivacy.min.js"></script>
<script type="text/javascript">
// define button order and other defaults:
$.fn.socialSharePrivacy.settings.order = ['mail', 'fbshare']; // "1-click" options first, the rest - alphabetically
$.fn.socialSharePrivacy.settings.perma_option = false;
$.fn.socialSharePrivacy.settings.info_link_target = '_blank';
$.fn.socialSharePrivacy.settings.layout = 'box';
</script>
<!-- end SocialSharePrivacy -->

<script type="text/javascript" src="/client.js"></script>
<script src="js/ui.js"></script>
<script src="js/files.js"></script>
Expand Down Expand Up @@ -260,12 +271,19 @@
</div>
</div>

<!-- begin SocialSharePrivacy -->
<div id="SocialSharePrivacy" style="display:none; position: fixed; left:740px; top:90px; z-index:666"></div>
<!-- end SocialSharePrivacy -->

<div class="container">
<div class="dragdrop text-pretty" id="dropbox" onclick="$('#files').click()">

<div id='notificationDiv' class="alert-error" style="display: none;cursor:default" onclick="stopPropogation(event)">
<!--<a class="close" onclick="$('.alert').hide()">×</a>-->
</div>
<!-- Social Share Privacy -->
<div style="margin:0 64px; position:relative; top:32px" onclick="stopPropogation(event)">
</div>
<!--<canvas id="cnvs" style="height: 0px"></canvas>-->
<div class="textDrag">
<img alt="logo" id="logo" src="img/logo.png"/>
Expand All @@ -289,13 +307,6 @@

<!--<span id="hs_cos_wrapper_social_sharing13591521802993" class="hs_cos_wrapper hs_cos_wrapper_widget hs_cos_wrapper_type_social_sharing" style="" data-hs-cos-general-type="widget" data-hs-cos-type="social_sharing"><a href="http://www.facebook.com/share.php?u=http%3A%2F%2Foffers.hubspot.com%2Fthe-science-of-twitter-free-chapter-download%3Futm_medium%3Dsocial%26utm_source%3Dfacebook" target="_blank" style="width:24px;border-width:0px;border:0px;"><img src="https://static.hubspot.com/final/img/common/icons/social/facebook-24x24.png" class="hs-image-widget " style="height:24px;width:24px;border-width:0px;border:0px;" width="24" height="24" hspace="0" alt="Share on Facebook"></a>&nbsp;<a href="http://www.linkedin.com/shareArticle?mini=true&amp;url=http%3A%2F%2Foffers.hubspot.com%2Fthe-science-of-twitter-free-chapter-download%3Futm_medium%3Dsocial%26utm_source%3Dlinkedin" target="_blank" style="width:24px;border-width:0px;border:0px;"><img src="https://static.hubspot.com/final/img/common/icons/social/linkedin-24x24.png" class="hs-image-widget " style="height:24px;width:24px;border-width:0px;border:0px;" width="24" height="24" hspace="0" alt="Share on LinkedIn"></a>&nbsp;<a href="https://twitter.com/intent/tweet?original_referer=http%3A%2F%2Foffers.hubspot.com%2Fthe-science-of-twitter-free-chapter-download%3Futm_medium%3Dsocial%26utm_source%3Dtwitter&amp;url=http%3A%2F%2Foffers.hubspot.com%2Fthe-science-of-twitter-free-chapter-download%3Futm_medium%3Dsocial%26utm_source%3Dtwitter&amp;source=tweetbutton" target="_blank" style="width:24px;border-width:0px;border:0px;"><img src="https://static.hubspot.com/final/img/common/icons/social/twitter-24x24.png" class="hs-image-widget " style="height:24px;width:24px;border-width:0px;border:0px;" width="24" height="24" hspace="0" alt="Share on Twitter"></a>&nbsp;<a href="https://plus.google.com/share?url=http%3A%2F%2Foffers.hubspot.com%2Fthe-science-of-twitter-free-chapter-download%3Futm_medium%3Dsocial%26utm_source%3Dgoogle_plus" target="_blank" style="width:24px;border-width:0px;border:0px;"><img src="https://static.hubspot.com/final/img/common/icons/social/googleplus-24x24.png" class="hs-image-widget " style="height:24px;width:24px;border-width:0px;border:0px;" width="24" height="24" hspace="0" alt="Share on Google+"></a>&nbsp;<a href="http://pinterest.com/pin/create/button/?url=http%3A%2F%2Foffers.hubspot.com%2Fthe-science-of-twitter-free-chapter-download%3Futm_medium%3Dsocial%26utm_source%3Dpinterest&amp;media=http%3A%2F%2Fcdn1.hubspot.com%2Fhub%2F53%2Fthe-science-of-twitter.png" target="_blank" style="width:24px;border-width:0px;border:0px;"><img src="https://static.hubspot.com/final/img/common/icons/social/pinterest-24x24.png" class="hs-image-widget " style="height:24px;width:24px;border-width:0px;border:0px;" width="24" height="24" hspace="0" alt="Share on Pinterest"></a>&nbsp;<a href="mailto:?subject=Check out http%3A%2F%2Foffers.hubspot.com%2Fthe-science-of-twitter-free-chapter-download%3Futm_medium%3Dsocial%26utm_source%3Demail &amp;body=Check out http%3A%2F%2Foffers.hubspot.com%2Fthe-science-of-twitter-free-chapter-download%3Futm_medium%3Dsocial%26utm_source%3Demail" target="_blank" style="width:24px;border-width:0px;border:0px;"><img src="https://static.hubspot.com/final/img/common/icons/social/email-24x24.png" class="hs-image-widget " style="height:24px;width:24px;border-width:0px;border:0px;" width="24" height="24" hspace="0" alt="Share on Email"></a></span>-->

<div class="addthis_toolbox addthis_default_style addthis_32x32_style" id="addthis" style="display:none">
<a class="addthis_button_email"></a>
<a class="addthis_button_facebook"></a>
<a class="addthis_button_twitter"></a>
<a class="addthis_button_google_plusone_share"></a>
<a class="addthis_button_sinaweibo"></a>
</div>
</div>

<div id="box-info">
Expand Down Expand Up @@ -388,11 +399,11 @@ <h1>Send files directly</h1>
</div>

<input onchange="addFiles(this.files)" type="file" id="files" name="files[]" multiple>

<!--<div id="tt" style="position: absolute; left: 50px; bottom: 50px; font-size: 5em;">0</div>-->
<!-- /container -->
<!-- AddThis Button BEGIN -->
<script type="text/javascript" src="https://s7.addthis.com/js/300/addthis_widget.js#pubid=undefined"></script>
<!-- <script type="text/javascript" src="https://s7.addthis.com/js/300/addthis_widget.js#pubid=undefined"></script> -->
<!-- AddThis Button END -->
<!--<style type='text/css'>@import url('https://getbarometer.s3.amazonaws.com/assets/barometer/css/barometer.css');</style>-->
<!--<script src='https://getbarometer.s3.amazonaws.com/assets/barometer/javascripts/barometer.js'-->
Expand All @@ -403,12 +414,14 @@ <h1>Send files directly</h1>

<!-- crazyegg -->
<script type="text/javascript">
if (location.host == 'www.sharefest.me') { // don't do crazy/eggy stuff if in wrong domain
setTimeout(function(){var a=document.createElement("script");
var b=document.getElementsByTagName("script")[0];
a.src=document.location.protocol+"//dnn506yrbagrg.cloudfront.net/pages/scripts/0018/2087.js?"+Math.floor(new Date().getTime()/3600000);
a.async=true;a.type="text/javascript";b.parentNode.insertBefore(a,b)}, 1);
}
</script>
<!-- crazyegg -->

</body>
</html>
</html>
10 changes: 2 additions & 8 deletions sharefest/public/js/ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,8 @@ function showLink() {
}

function updateShareButtons() {
var url = document.location.href;
// var element = $('#addthis')[0];
// $(element).attr('addthis:url',url);
addthis.update('share', 'url', url);
addthis.update('share', 'title', "Sharefest");
addthis.url = url;
addthis.toolbox(".addthis_toolbox");
$('#addthis').show()
$('title').text('ShareFest: '+$('#box-text').text());
$('#SocialSharePrivacy').socialSharePrivacy().show();
}

function onTextBoxClick(e) {
Expand Down