From b62bc48bc3bfbd2781cef16d210749ded8d96c37 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Wed, 7 Sep 2016 16:22:20 +0200
Subject: changed naming for tweets-method in _index and included time-checking
 and a twitter call will only be made every 15 minutes

---
 app/views/twitter/_index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/views')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 2d17aad..ac10aa4 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -11,7 +11,7 @@
       </div>
 
       <div class="twitter_list">
-        <% tweets.each do |e| %>
+        <% twitter_timeline.each do |e| %>
           <div class="tweet">
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
-- 
cgit v1.2.3


From 42459748e9e8e30a9cc0c64eaf4b8e10814d2dc2 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 9 Sep 2016 13:19:51 +0200
Subject: 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.

---
 app/views/home/_content.html.haml |  4 +++-
 app/views/twitter/_index.html.erb | 25 +++++++++++++++----------
 2 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'app/views')

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 ac10aa4..ba618b3 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,30 +1,35 @@
 <% 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">
         <% twitter_timeline.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>
         <% end %>
-      </div>
+    </div>
 
-      <div class="twitter_footer">
-        To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</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 %>
-- 
cgit v1.2.3