summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorthea <ta.kupler@gmail.com>2016-09-23 16:08:53 +0200
committerthea <ta.kupler@gmail.com>2016-09-23 16:08:53 +0200
commite8bcd666441311f4e4285c07b63a91750d6815c5 (patch)
tree6426713b247d0ce686c221779e7acb6df3c99df3 /app/views
parent873ba38715bb0e08f39a1effd64a26e9d05af78b (diff)
parentd18ad52a8bd35c53b5dee5041527f313aa18015a (diff)
Merge branch 'marie' into develop
Diffstat (limited to 'app/views')
-rw-r--r--app/views/home/_content.html.haml22
-rw-r--r--app/views/twitter/_index.html.erb6
2 files changed, 18 insertions, 10 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/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index 8529b83..cdfff4b 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -3,8 +3,8 @@
<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>
@@ -12,7 +12,7 @@
<%if tweets == [] then%><%= error_message %><% end %>
<% tweets.each do |e| %>
<div class="tweet">
- <div class="tweet_text"><%= " #{e.text}" %>
+ <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>