summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorMarie <ml.kochsiek@fu-berlin.de>2016-09-22 19:34:16 +0200
committerGitHub <noreply@github.com>2016-09-22 19:34:16 +0200
commit873ba38715bb0e08f39a1effd64a26e9d05af78b (patch)
tree7a1472480072f20ccd19b22f1b09b0259efaeff9 /app/views
parent22478d315af3590d2a344eb1aa8cf2aec0730506 (diff)
parentd44fc9292637ed6d1a4a7e04883e8b3b88dc3c15 (diff)
Merge pull request #15 from LoadToCode/thea
errorhandling and small changes
Diffstat (limited to 'app/views')
-rw-r--r--app/views/twitter/_index.html.erb15
1 files changed, 8 insertions, 7 deletions
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index a7ebd1b..8529b83 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -9,14 +9,15 @@
</div>
<div class="twitter_list">
- <% tweets.each do |e| %>
- <div class="tweet">
- <div class="tweet_text"><%= " #{e.text}" %>
+ <%if tweets == [] then%><%= error_message %><% end %>
+ <% tweets.each do |e| %>
+ <div class="tweet">
+ <div class="tweet_text"><%= " #{e.text}" %>
+ </div>
+ <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+ </div>
</div>
- <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
- </div>
- </div>
- <% end %>
+ <% end %>
</div>
<div class="twitter_footer">