moparisthebest/android.moparisthebest.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/android.moparisthebest.org synced 2025-02-28 08:21:52 -05:00
Code Issues Releases Wiki Activity

Merge branch 'site' of github.com:imathis/octopress into site

Browse Source
This commit is contained in:
Frederic Hemberger 2011-09-30 15:31:43 +02:00
commit ba2af4847f
8 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.themes/classic/source/_includes/after_footer.html Normal file
View File

@ -0,0 +1,5 @@
{% include disqus.html %}
{% include google_plus_one.html %}
{% include twitter_sharing.html %}
{% include google_analytics.html %}
{% include custom/after_footer.html %}

3
.themes/classic/source/_includes/custom/after_footer.html Normal file
View File

@ -0,0 +1,3 @@
{% comment %}
Add content to be output at the bottom of each page. (You might use this for analytics scripts, for example)
{% endcomment %}

5
.themes/classic/source/_layouts/default.html
View File

@ -9,9 +9,6 @@
</div>
</div>
<footer role="contentinfo">{% include footer.html %}</footer>
{% include disqus.html %}
{% include google_analytics.html %}
{% include google_plus_one.html %}
{% include twitter_sharing.html %}
{% include after_footer.html %}
</body>
</html>

7
.themes/classic/source/javascripts/twitter.js
View File

@ -49,7 +49,6 @@ function linkifyTweet(text, url) {
if(url[u].expanded_url != null){
var shortUrl = new RegExp( url[u].url.replace(/https?:\/\//, ''), 'g');
text = text.replace(shortUrl, url[u].display_url);
console.log(text);
}
}
return text
@ -66,11 +65,11 @@ function showTwitterFeed(tweets, twitter_user) {
}
function getTwitterFeed(user, count, replies) {
count = parseInt(count, 10);
$.ajax({
url: "http://api.twitter.com/1/statuses/user_timeline/" + user + ".json?trim_user=true&count=" + (parseInt(count, 10)) + "&include_entities=1&exclude_replies=" + (replies ? "0" : "1") + "&callback=?"
url: "http://api.twitter.com/1/statuses/user_timeline/" + user + ".json?trim_user=true&count=" + (count + 20) + "&include_entities=1&exclude_replies=" + (replies ? "0" : "1") + "&callback=?"
, type: 'jsonp'
, error: function (err) { $('#tweets li.loading').addClass('error').text("Twitter's busted"); }
, success: function(data) { showTwitterFeed(data, user); }
, success: function(data) { showTwitterFeed(data.slice(0, count), user); }
})
}

5
source/_includes/after_footer.html Normal file
View File

@ -0,0 +1,5 @@
{% include disqus.html %}
{% include google_plus_one.html %}
{% include twitter_sharing.html %}
{% include google_analytics.html %}
{% include custom/after_footer.html %}

3
source/_includes/custom/after_footer.html Normal file
View File

@ -0,0 +1,3 @@
{% comment %}
Add content to be output at the bottom of each page. (You might use this for analytics scripts, for example)
{% endcomment %}

5
source/_layouts/default.html
View File

@ -9,9 +9,6 @@
</div>
</div>
<footer role="contentinfo">{% include footer.html %}</footer>
{% include disqus.html %}
{% include google_analytics.html %}
{% include google_plus_one.html %}
{% include twitter_sharing.html %}
{% include after_footer.html %}
</body>
</html>

7
source/javascripts/twitter.js
View File

@ -49,7 +49,6 @@ function linkifyTweet(text, url) {
if(url[u].expanded_url != null){
var shortUrl = new RegExp( url[u].url.replace(/https?:\/\//, ''), 'g');
text = text.replace(shortUrl, url[u].display_url);
console.log(text);
}
}
return text
@ -66,11 +65,11 @@ function showTwitterFeed(tweets, twitter_user) {
}
function getTwitterFeed(user, count, replies) {
count = parseInt(count, 10);
$.ajax({
url: "http://api.twitter.com/1/statuses/user_timeline/" + user + ".json?trim_user=true&count=" + (parseInt(count, 10)) + "&include_entities=1&exclude_replies=" + (replies ? "0" : "1") + "&callback=?"
url: "http://api.twitter.com/1/statuses/user_timeline/" + user + ".json?trim_user=true&count=" + (count + 20) + "&include_entities=1&exclude_replies=" + (replies ? "0" : "1") + "&callback=?"
, type: 'jsonp'
, error: function (err) { $('#tweets li.loading').addClass('error').text("Twitter's busted"); }
, success: function(data) { showTwitterFeed(data, user); }
, success: function(data) { showTwitterFeed(data.slice(0, count), user); }
})
}