diff options
| -rw-r--r-- | app/assets/stylesheets/twitter.scss | 5 | ||||
| -rw-r--r-- | app/helpers/twitter_helper.rb | 14 | ||||
| -rw-r--r-- | app/views/twitter/_index.html.erb | 9 |
3 files changed, 24 insertions, 4 deletions
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss index a67c044..4419918 100644 --- a/app/assets/stylesheets/twitter.scss +++ b/app/assets/stylesheets/twitter.scss @@ -71,3 +71,8 @@ box-sizing: border-box; font-style: italic; font-size: 12px; } + +.more_tweets_link { + text-align: right; + font-size: 12px; +} diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb index f520286..1afe50d 100644 --- a/app/helpers/twitter_helper.rb +++ b/app/helpers/twitter_helper.rb @@ -22,7 +22,7 @@ module TwitterHelper def update_twitter_info twitter_user_info[0] = Time.now twitter_user_info[1] = twitter_client.user(twitter_handle).name - twitter_user_info[2] = twitter_client.user_timeline(twitter_handle, {:count => 200}).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3) + twitter_user_info[2] = twitter_client.user_timeline(twitter_handle, {:count => 200}).select{ |tweet| tweet.text.start_with?('RT','@')==false} if twitter_user_info[2] == nil error_handling twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly or contact your provider-admin." @@ -52,7 +52,7 @@ module TwitterHelper def error_handling twitter_user_info[2] = [] - return twitter_user_info + twitter_user_info end def cached_info @@ -70,11 +70,19 @@ module TwitterHelper cached_info[1] end + def num_of_tweets + 2 + end + def tweets - cached_info[2] + cached_info[2].take(num_of_tweets) end def error_message cached_info[3] end + + def all_tweets_count + twitter_user_info[2].count + end end diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb index cdfff4b..6e592c7 100644 --- a/app/views/twitter/_index.html.erb +++ b/app/views/twitter/_index.html.erb @@ -18,9 +18,16 @@ </div> </div> <% end %> - </div> + <%if all_tweets_count > num_of_tweets then%> + <div class="tweet"> + <div class="more_tweets_link"><a href="https://twitter.com/<%= twitter_handle %>">Show more tweets...</a> + </div> + </div> + <% end %> + </div> <div class="twitter_footer"> + <p>This feed uses a Ruby interface to access the Twitter API. Within LEAP Twitter does not track you.</p> </div> </div> |