diff options
| author | Marie <ml.kochsiek@fu-berlin.de> | 2016-09-23 13:47:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 13:47:50 +0000 |
| commit | a5958e51fbf106fa841a7aca444b705600714585 (patch) | |
| tree | 59c5d1f0e62440a22e90a45fface4e3dfc48b45e /app/views/home | |
| parent | 782be39862394c05a069eab9b7dd8f6779354917 (diff) | |
| parent | a7ab66b0478c1845ed0fdbff7dd3c83ea804826c (diff) | |
Merge pull request #16 from LoadToCode/temp_1_marie
Temp 1 marie
Diffstat (limited to 'app/views/home')
| -rw-r--r-- | app/views/home/_content.html.haml | 22 | ||||
| -rw-r--r-- | app/views/home/index.html.haml | 2 |
2 files changed, 16 insertions, 8 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 |