diff options
| author | Azul <azul@riseup.net> | 2016-09-26 09:55:37 +0200 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2016-09-26 09:55:37 +0200 |
| commit | 917cddbeb6e3adaf346a7c5784fa9e6d70462e03 (patch) | |
| tree | 7665d638e722be4b17bad33bdfb446c89966445d /app/views | |
| parent | 4a73c2ca2938ae748588d7ca72a785af99724c92 (diff) | |
| parent | 69b182b1bf811e1d09c734debf0f71f8412dd6b7 (diff) | |
Merge remote-tracking branch 'pr/239' into develop
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/home/_content.html.haml | 22 | ||||
| -rw-r--r-- | app/views/twitter/_index.html.erb | 19 |
2 files changed, 25 insertions, 16 deletions
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index 3f4f36e..45afd92 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) @@ -8,12 +22,6 @@ .row = render 'home/provider_message' -.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 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"> |