diff options
| author | luca-marie <ml.kochsiek@fu-berlin.de> | 2016-08-24 15:23:07 +0200 |
|---|---|---|
| committer | thea <ta.kupler@gmail.com> | 2016-09-01 12:08:46 +0200 |
| commit | e1e98d0229b8b79de2105515f0312903a23dc335 (patch) | |
| tree | 2a7b0c492ffbd9819f05b226e263d5826fcc44d9 /app/views | |
| parent | 92481029074f34342cc35937f3aab94aca7887c7 (diff) | |
Update with Twitter
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/home/_content.html.haml | 6 | ||||
| -rw-r--r-- | app/views/home/index.html.haml | 3 | ||||
| -rw-r--r-- | app/views/twitter/_index.html.erb | 26 |
3 files changed, 32 insertions, 3 deletions
diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml index 67e4533..725c391 100644 --- a/app/views/home/_content.html.haml +++ b/app/views/home/_content.html.haml @@ -1,10 +1,12 @@ -.row +.left.column %h1= t(:welcome, :provider => APP_CONFIG[:domain]) .p=t(:welcome_message_html) -.row = home_page_buttons +.right.column + = render :partial => '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 147cacd..7f07460 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -3,7 +3,8 @@ #main .container-fluid = render 'home/content' + #push -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3 #footer - = render 'layouts/footer'
\ No newline at end of file + = render 'layouts/footer' diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb new file mode 100644 index 0000000..9825afa --- /dev/null +++ b/app/views/twitter/_index.html.erb @@ -0,0 +1,26 @@ +<% unless Rails.application.secrets.twitter['enabled'] == false %> + <div class=twitter> + <div class="twitter_header"> + 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> + <% end %> + <div class="twitter_footer"> + To prevent leakage no links are displayed. For more information visit @<%= @twitter_name %> on twitter.com.</p> + </div> + </div> + <% end %> |