summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
Diffstat (limited to 'app/views')
-rw-r--r--app/views/home/_content.html.haml22
-rw-r--r--app/views/home/index.html.haml2
-rw-r--r--app/views/twitter/_index.html.erb19
3 files changed, 26 insertions, 17 deletions
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 5341189..950f85e 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,4 +1,18 @@
-.col-md-8
+- if twitter_enabled == true
+ .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'
+- else
.row
%h1= t(:welcome, :provider => APP_CONFIG[:domain])
.p=t(:welcome_message_html)
@@ -6,12 +20,6 @@
.row
= home_page_buttons
-.col-md-1
-
-.col-md-3
- .row
- = render '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 5e33e62..147cacd 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -6,4 +6,4 @@
#push
-# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
#footer
- = render 'layouts/footer'
+ = render 'layouts/footer' \ No newline at end of file
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index a7ebd1b..cdfff4b 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -3,20 +3,21 @@
<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 class="twitter_image_frame"><%= image_tag("Avatar_Pic.png") %></div>
+ <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/<%= twitter_handle %>">@<%= twitter_handle %></a></div>
</div>
</div>
<div class="twitter_list">
- <% tweets.each do |e| %>
- <div class="tweet">
- <div class="tweet_text"><%= " #{e.text}" %>
+ <%if tweets == [] then%><%= error_message %><% end %>
+ <% tweets.each do |e| %>
+ <div class="tweet">
+ <div class="tweet_text"><%= sanitize(e.text) %>
+ </div>
+ <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+ </div>
</div>
- <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
- </div>
- </div>
- <% end %>
+ <% end %>
</div>
<div class="twitter_footer">