summaryrefslogtreecommitdiff
path: root/app/views/home
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-09-26 09:55:37 +0200
committerAzul <azul@riseup.net>2016-09-26 09:55:37 +0200
commit917cddbeb6e3adaf346a7c5784fa9e6d70462e03 (patch)
tree7665d638e722be4b17bad33bdfb446c89966445d /app/views/home
parent4a73c2ca2938ae748588d7ca72a785af99724c92 (diff)
parent69b182b1bf811e1d09c734debf0f71f8412dd6b7 (diff)
Merge remote-tracking branch 'pr/239' into develop
Diffstat (limited to 'app/views/home')
-rw-r--r--app/views/home/_content.html.haml22
1 files changed, 15 insertions, 7 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