diff options
author | thea <ta.kupler@gmail.com> | 2016-09-23 16:08:53 +0200 |
---|---|---|
committer | thea <ta.kupler@gmail.com> | 2016-09-23 16:08:53 +0200 |
commit | e8bcd666441311f4e4285c07b63a91750d6815c5 (patch) | |
tree | 6426713b247d0ce686c221779e7acb6df3c99df3 /app/views/home | |
parent | 873ba38715bb0e08f39a1effd64a26e9d05af78b (diff) | |
parent | d18ad52a8bd35c53b5dee5041527f313aa18015a (diff) |
Merge branch 'marie' into develop
Diffstat (limited to 'app/views/home')
-rw-r--r-- | app/views/home/_content.html.haml | 22 |
1 files changed, 15 insertions, 7 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 |