diff options
| author | Marie <ml.kochsiek@fu-berlin.de> | 2016-09-23 13:47:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 13:47:50 +0000 |
| commit | a5958e51fbf106fa841a7aca444b705600714585 (patch) | |
| tree | 59c5d1f0e62440a22e90a45fface4e3dfc48b45e /app/views/twitter/_index.html.erb | |
| parent | 782be39862394c05a069eab9b7dd8f6779354917 (diff) | |
| parent | a7ab66b0478c1845ed0fdbff7dd3c83ea804826c (diff) | |
Merge pull request #16 from LoadToCode/temp_1_marie
Temp 1 marie
Diffstat (limited to 'app/views/twitter/_index.html.erb')
| -rw-r--r-- | app/views/twitter/_index.html.erb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb index a7ebd1b..cdfff4b 100644 --- a/app/views/twitter/_index.html.erb +++ b/app/views/twitter/_index.html.erb @@ -3,20 +3,21 @@ <div class="twitter_header"> <div class="twitter_id"> - <div class="twitter_image_frame"><%= image_tag("Twitter_Logo_Blue.png") %></div> - <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div> + <div class="twitter_image_frame"><%= image_tag("Avatar_Pic.png") %></div> + <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/<%= twitter_handle %>">@<%= twitter_handle %></a></div> </div> </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"><%= sanitize(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"> |