Skip to content

Commit

Permalink
Update #桜2012 to #桜2013
Browse files Browse the repository at this point in the history
  • Loading branch information
keiko713 committed Mar 15, 2013
2 parents 7fcc557 + bdcaed7 commit 7973279
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion LICENSE
@@ -1,4 +1,4 @@
Copyright 2012 Keiko Oda
Copyright 2013 Keiko Oda

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -3,7 +3,7 @@

Let's look at beautiful Japanese SAKURA pictures from Twitter!

This application shows the photos that were tweeted with #桜2012 hash tag.
This application shows the photos that were tweeted with #桜2013 hash tag.



Expand All @@ -28,7 +28,7 @@ Before quick start (Never run Django before? Do this!)

Copyright and license
----------
Copyright 2012 [Keiko Oda](http://twitter.com/keiko713)
Copyright 2013 [Keiko Oda](http://twitter.com/keiko713)

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this work except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions templates/index.html
Expand Up @@ -36,14 +36,14 @@
<div class="navbar-inner">
<div class="container">
<a class="brand" href="/">
SAKURA #桜2012 PHOTOS
SAKURA #桜2013 PHOTOS
</a>
<span class="pull-right twbutton">
<a href="https://twitter.com/share" class="twitter-share-button" data-via="keiko713" data-count="none" data-hashtags="桜2012">Tweet</a>
<a href="https://twitter.com/share" class="twitter-share-button" data-via="keiko713" data-count="none" data-hashtags="桜2013">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>
</span>
<span class="pull-right twbutton">
<a href="https://twitter.com/intent/tweet?button_hashtag=%E6%A1%9C2012" class="twitter-hashtag-button">Tweet #%E6%A1%9C2012</a>
<a href="https://twitter.com/intent/tweet?button_hashtag=%E6%A1%9C2013" class="twitter-hashtag-button">Tweet #%E6%A1%9C2013</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>
</span>
</div>
Expand Down
4 changes: 2 additions & 2 deletions tweets/views.py
Expand Up @@ -34,11 +34,11 @@ def get_page(request, page_id):

def search_photos(page_id):
"""
Search photos that have hashtag #桜2012
Search photos that have hashtag #桜2013
"""
photos = []
END_POINT = 'http://search.twitter.com/search.json'
search_key_uni = u'#桜2012'
search_key_uni = u'#桜2013'
search_key = urllib2.quote(search_key_uni.encode('utf-8'))
address = '%s?q=%s&include_entities=1&rpp=100&page=%s' % (
END_POINT, search_key, page_id)
Expand Down

0 comments on commit 7973279

Please sign in to comment.