From e1e98d0229b8b79de2105515f0312903a23dc335 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Wed, 24 Aug 2016 15:23:07 +0200
Subject: Update with Twitter

---
 app/views/twitter/_index.html.erb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 app/views/twitter/_index.html.erb

(limited to 'app/views/twitter/_index.html.erb')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
new file mode 100644
index 0000000..9825afa
--- /dev/null
+++ b/app/views/twitter/_index.html.erb
@@ -0,0 +1,26 @@
+<% unless Rails.application.secrets.twitter['enabled'] == false %>
+  <div class=twitter>
+      <div class="twitter_header">
+        Tweets by <%= @twitter_name %></p>
+      </div>
+    <!-- <p><a href="/followers"> You have <%= @num_followers %> followers.</a></p> -->
+    <% @tweets.each do |e| %>
+      <div class=tweets>
+          <div class="tweets_pic twitter-image-frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
+          <!-- <img class="tweets_pic"></img> -->
+        <div class=tweets_name>
+          @<%= @twitter_screen_name %>
+        </div>
+        <div class=tweet_text>
+          <%= " #{e.text}" %>
+        </div>
+        <div class=text_date>
+          <%= @tweet_time %> <% t = e.created_at%> <%="#{t.strftime("%m/%d/%Y")}"%>
+        </div>
+      </div>
+    <% end %>
+      <div class="twitter_footer">
+        To prevent leakage no links are displayed. For more information visit @<%= @twitter_name %> on twitter.com.</p>
+      </div>
+    </div>
+  <% end %>
-- 
cgit v1.2.3


From fecc0e9e1985be2d3767664453d4776ac20897c0 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 25 Aug 2016 20:50:12 +0200
Subject: Twitter controller now as helper, some more styling in CSS, bug fix

---
 app/views/twitter/_index.html.erb | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

(limited to 'app/views/twitter/_index.html.erb')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 9825afa..3dab567 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,26 +1,24 @@
-<% unless Rails.application.secrets.twitter['enabled'] == false %>
-  <div class=twitter>
+  <div class="twitter">
       <div class="twitter_header">
-        Tweets by <%= @twitter_name %></p>
+        Tweets by <%= twitter_name %></p>
       </div>
-    <!-- <p><a href="/followers"> You have <%= @num_followers %> followers.</a></p> -->
-    <% @tweets.each do |e| %>
-      <div class=tweets>
-          <div class="tweets_pic twitter-image-frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
-          <!-- <img class="tweets_pic"></img> -->
-        <div class=tweets_name>
-          @<%= @twitter_screen_name %>
-        </div>
-        <div class=tweet_text>
-          <%= " #{e.text}" %>
-        </div>
-        <div class=text_date>
-          <%= @tweet_time %> <% t = e.created_at%> <%="#{t.strftime("%m/%d/%Y")}"%>
-        </div>
+      <div class="twitter_list">
+        <% tweets.each do |e| %>
+          <div class="tweet">
+              <div class="tweet_pic twitter_image_frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
+            <div class="tweet_name">
+              @<%= twitter_handle %>
+            </div>
+            <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>
-    <% end %>
       <div class="twitter_footer">
-        To prevent leakage no links are displayed. For more information visit @<%= @twitter_name %> on twitter.com.</p>
+        To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
       </div>
     </div>
-  <% end %>
-- 
cgit v1.2.3


From e87d797cdbfe5ebe8dff789742adb6a82d92aae4 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 26 Aug 2016 17:16:35 +0200
Subject: Small updates on method to check if twitter feed enabled

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

(limited to 'app/views/twitter/_index.html.erb')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 3dab567..8ac65be 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,3 +1,4 @@
+<% if twitter_enabled == true %>
   <div class="twitter">
       <div class="twitter_header">
         Tweets by <%= twitter_name %></p>
@@ -22,3 +23,4 @@
         To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
       </div>
     </div>
+<% end %>
-- 
cgit v1.2.3


From ea3fc6ffbb8f90aff28ce56fe4432a8d3ff18caa Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Mon, 29 Aug 2016 17:39:46 +0200
Subject: Changes mainly on CSS 'fine tuning' and shortening the Twitter API
 credentials, - only bearer token is needed to access Twitter API

---
 app/views/twitter/_index.html.erb | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'app/views/twitter/_index.html.erb')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 8ac65be..eba9675 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -1,26 +1,34 @@
 <% if twitter_enabled == true %>
   <div class="twitter">
+
       <div class="twitter_header">
-        Tweets by <%= twitter_name %></p>
+        Tweets by </br><%= twitter_name %></p>
       </div>
+
       <div class="twitter_list">
         <% tweets.each do |e| %>
           <div class="tweet">
+
+            <div class="tweet_title">
               <div class="tweet_pic twitter_image_frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
-            <div class="tweet_name">
-              @<%= twitter_handle %>
+                <div class="tweet_name">
+                  @<%= twitter_handle %>
+                </div>
             </div>
-            <div class="tweet_text">
-              <%= " #{e.text}" %>
+
+            <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 class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
             </div>
+
           </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 %>
-- 
cgit v1.2.3


From 92e7b90d619111fdaaf50ab0b8538c39605fe005 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 1 Sep 2016 12:17:05 +0200
Subject: Updating the view and CSS, no pic and twitter handle in each tweet;
 Displaying only 3 most tweets

---
 app/views/twitter/_index.html.erb | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'app/views/twitter/_index.html.erb')

diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index eba9675..2d17aad 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -2,20 +2,17 @@
   <div class="twitter">
 
       <div class="twitter_header">
-        Tweets by </br><%= twitter_name %></p>
+        <p>These are the most recent tweets by </br><%= twitter_name%></p>
+
+        <div class="twitter_id">
+          <div class="twitter_pic twitter_image_frame"><%= image_tag("rails.png") %></div>
+          <div class="twitter_name"><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+        </div>
       </div>
 
       <div class="twitter_list">
         <% tweets.each do |e| %>
           <div class="tweet">
-
-            <div class="tweet_title">
-              <div class="tweet_pic twitter_image_frame"><%= image_tag("team-loadtocode-Loading_icon.gif") %></div>
-                <div class="tweet_name">
-                  @<%= twitter_handle %>
-                </div>
-            </div>
-
             <div class="tweet_text"><%= " #{e.text}" %>
             </div>
 
@@ -29,6 +26,5 @@
       <div class="twitter_footer">
         To prevent leakage no links are displayed. For more information visit @<%= twitter_name %> on twitter.com.</p>
       </div>
-
-    </div>
+</div>
 <% end %>
-- 
cgit v1.2.3


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/twitter/_index.html.erb')

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 3408ac694a60df0380a3bf444077165a1f30e87e 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/twitter/_index.html.erb | 41 +++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

(limited to 'app/views/twitter/_index.html.erb')

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 %>
-- 
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/twitter/_index.html.erb | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'app/views/twitter/_index.html.erb')

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


From 2ef8707a7539622007b6d679a7708a5979594ff3 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 12:20:12 +0200
Subject: Cleaning CSS &view code, updating twitter helper with develop

---
 app/views/twitter/_index.html.erb | 41 +++++++++++++++------------------------
 1 file changed, 16 insertions(+), 25 deletions(-)

(limited to 'app/views/twitter/_index.html.erb')

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 %>
-- 
cgit v1.2.3


From 782be39862394c05a069eab9b7dd8f6779354917 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Tue, 13 Sep 2016 17:26:51 +0200
Subject: Change in code for caching

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

(limited to 'app/views/twitter/_index.html.erb')

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