summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/home/_content.html.haml22
-rw-r--r--config/initializers/twitter.rb37
2 files changed, 15 insertions, 44 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/config/initializers/twitter.rb b/config/initializers/twitter.rb
deleted file mode 100644
index 9f537e9..0000000
--- a/config/initializers/twitter.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# When deploying, common customizations can be dropped in config/customizations. This initializer makes this work.
-#
-APP_CONFIG["customization_directory"] ||= "#{Rails.root}/config/customization"
-customization_directory = APP_CONFIG["customization_directory"]
-
-#
-# Set customization views as the first view path
-#
-# Rails.application.config.paths['app/views'].unshift "config/customization/views"
-# (For some reason, this does not work here. See application.rb for where this is actually called.)
-
-#
-# Set customization stylesheets as the first asset path
-#
-# Some notes:
-#
-# * This cannot go in application.rb, as far as I can tell. In application.rb, the default paths
-# haven't been loaded yet, so the path we add will always end up at the end unless we add it here.
-#
-# * For this to work, config.assets.initialize_on_precompile MUST be set to true, otherwise
-# this initializer will never get called in production mode when the assets are precompiled.
-#
-Rails.application.config.assets.paths.unshift "#{customization_directory}/stylesheets"
-
-#
-# Copy files to public
-#
-if !defined?(RAKE) && Dir.exist?("#{customization_directory}/public")
- require 'fileutils'
- FileUtils.cp_r("#{customization_directory}/public/.", "#{Rails.root}/public", :preserve => true)
-end
-
-#
-# Add I18n path
-#
-Rails.application.config.i18n.load_path += Dir["#{customization_directory}/locales/*.{rb,yml,yaml}"]