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/home/_content.html.haml |  6 ++++--
 app/views/home/index.html.haml    |  3 ++-
 app/views/twitter/_index.html.erb | 26 ++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 app/views/twitter/_index.html.erb

(limited to 'app/views')

diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 67e4533..725c391 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,10 +1,12 @@
-.row
+.left.column
   %h1= t(:welcome, :provider => APP_CONFIG[:domain])
   .p=t(:welcome_message_html)
 
-.row
   = home_page_buttons
 
+.right.column
+  = render :partial => 'twitter/index'
+
   - if Rails.env == 'development'
     .row
       %hr
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 147cacd..7f07460 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -3,7 +3,8 @@
   #main
     .container-fluid
       = render 'home/content'
+
   #push
     -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
 #footer
-  = render 'layouts/footer'
\ No newline at end of file
+  = render 'layouts/footer'
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