2 files changed, 45 insertions, 12 deletions
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 67e4533..5341189 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,12 +1,19 @@
-.row
-  %h1= t(:welcome, :provider => APP_CONFIG[:domain])
-  .p=t(:welcome_message_html)
-
-.row
-  = home_page_buttons
-
-  - if Rails.env == 'development'
-    .row
-      %hr
-      %p
-        = link_to "make donation", new_payment_path if APP_CONFIG[:payment].present?
+.col-md-8
+  .row
+    %h1= t(:welcome, :provider => APP_CONFIG[:domain])
+    .p=t(:welcome_message_html)
+
+  .row
+    = home_page_buttons
+
+.col-md-1
+
+.col-md-3
+  .row
+    = render 'twitter/index'
+
+    - if Rails.env == 'development'
+      .row
+        %hr
+        %p
+          = 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
new file mode 100644
index 0000000..a7ebd1b
--- /dev/null
+++ b/app/views/twitter/_index.html.erb
@@ -0,0 +1,26 @@
+<% if twitter_enabled == true %>
+  <div class="twitter">
+
+      <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 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>
+        <% 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 %>