summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorluca-marie <ml.kochsiek@fu-berlin.de>2016-09-13 12:20:12 +0200
committerluca-marie <ml.kochsiek@fu-berlin.de>2016-09-13 12:20:12 +0200
commit2ef8707a7539622007b6d679a7708a5979594ff3 (patch)
treefc9d11a126dcc2cc040c0fc6a9e96a70dd8737e9 /app/views
parent3408ac694a60df0380a3bf444077165a1f30e87e (diff)
Cleaning CSS &view code, updating twitter helper with develop
Diffstat (limited to 'app/views')
-rw-r--r--app/views/twitter/_index.html.erb41
1 files changed, 16 insertions, 25 deletions
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2cba033..41fbf26 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,37 +1,28 @@
<% if twitter_enabled == true %>
<div class="twitter">
- <div class="twitter_header">
- <div class="twitter_id">
- <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
+ <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>
</div>
- </div>
-
- <!-- <div class="twitter_header">
- <p>These are the most recent tweets by <%= twitter_name%></p>
- <div class="twitter_id">
- <div class="twitter_pic twitter_image_frame"><%= image_tag("Twitter_Logo_White_On_Blue.png") %></div>
- <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
- </div>
- </div> -->
+ <div class="twitter_list">
+ <% twitter_timeline.each do |e| %>
+ <div class="tweet">
+ <div class="tweet_text"><%= " #{e.text}" %>
+ </div>
- <div class="twitter_list">
- <% 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 class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
</div>
+ <% end %>
+ </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 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>
<% end %>