summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorluca-marie <ml.kochsiek@fu-berlin.de>2016-09-09 13:19:51 +0200
committerluca-marie <ml.kochsiek@fu-berlin.de>2016-09-09 13:19:51 +0200
commit3408ac694a60df0380a3bf444077165a1f30e87e (patch)
tree3b76d8bdc160b193c95887fbcd4541d6b721c355 /app/views
parent4a09c2df8df3db979049ee8d98b202ad9f2125a8 (diff)
Added changes in css, view and main view file, as well as default avatar is now set as twitter official logo (added 2 official twitter logo images; changed footer text.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/home/_content.html.haml4
-rw-r--r--app/views/twitter/_index.html.erb41
2 files changed, 27 insertions, 18 deletions
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index ecd8524..5341189 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,4 +1,4 @@
-.col-md-9
+.col-md-8
.row
%h1= t(:welcome, :provider => APP_CONFIG[:domain])
.p=t(:welcome_message_html)
@@ -6,6 +6,8 @@
.row
= home_page_buttons
+.col-md-1
+
.col-md-3
.row
= render 'twitter/index'
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2d17aad..2cba033 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,30 +1,37 @@
<% if twitter_enabled == true %>
<div class="twitter">
- <div class="twitter_header">
- <p>These are the most recent tweets by </br><%= twitter_name%></p>
+ <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_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></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("rails.png") %></div>
+ <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> -->
- <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="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>
- <% end %>
- </div>
- <div class="twitter_footer">
- To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
- </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>
<% end %>