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/home/_content.html.haml | 13 +++++++------
 app/views/twitter/_index.html.erb | 38 ++++++++++++++++++--------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

(limited to 'app/views')

diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 725c391..6efd2d0 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,14 +1,15 @@
-.left.column
+.row
   %h1= t(:welcome, :provider => APP_CONFIG[:domain])
   .p=t(:welcome_message_html)
 
-  = home_page_buttons
-
-.right.column
-  = render :partial => 'twitter/index'
+.row
+  .col-md-9
+    = home_page_buttons
+  .col-md-3
+    = render 'twitter/index'
 
   - if Rails.env == 'development'
     .row
       %hr
       %p
-        = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
+= link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
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