From dc024cb2d29f5f33c86706d29f91aa38067a6fbb Mon Sep 17 00:00:00 2001 From: Godwin Date: Fri, 19 May 2017 19:31:41 -0700 Subject: [PATCH] Fix for Quill editor --- app/assets/javascripts/editor.js | 1 + app/assets/stylesheets/_application.scss | 4 +- app/controllers/application_controller.rb | 4 + config/environments/production.rb | 104 ++++++++++++++++++++++ 4 files changed, 111 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/editor.js b/app/assets/javascripts/editor.js index 72cbdd4..5ba62e5 100644 --- a/app/assets/javascripts/editor.js +++ b/app/assets/javascripts/editor.js @@ -12,6 +12,7 @@ modules: { toolbar: [ [{ 'header': [1, 2, false] }], + ['link', 'image'], ['bold', 'italic', 'underline', 'strike'], [{ 'script': 'sub'}, { 'script': 'super' }], [{ 'list': 'ordered'}, { 'list': 'bullet' }, 'blockquote'] diff --git a/app/assets/stylesheets/_application.scss b/app/assets/stylesheets/_application.scss index d38248c..5ff7ea0 100644 --- a/app/assets/stylesheets/_application.scss +++ b/app/assets/stylesheets/_application.scss @@ -1205,7 +1205,7 @@ fieldset { } } - ul { + .locale-select, .text-editors { list-style: none; padding: 0; margin: 0; @@ -1253,7 +1253,7 @@ fieldset { position: relative; background-color: $white; - li { + li[data-locale] { display: none; &.selected { diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2ae5dcf..2649ab3 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -12,6 +12,10 @@ class ApplicationController < BaseController { host: "#{request.protocol}#{request.host_with_port}", trailing_slash: true } end + def default_url_options + { host: "#{request.protocol}#{request.host_with_port}" } + end + def capture_page_info # capture request info in case an error occurs # if request.method == "GET" && (params[:controller] != 'application' || params[:action] != 'contact') diff --git a/config/environments/production.rb b/config/environments/production.rb index 82fd268..782b53a 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -1,4 +1,5 @@ BikeBike::Application.configure do +<<<<<<< HEAD # Settings specified here will take precedence over those in config/application.rb. # Code is not reloaded between requests. @@ -99,4 +100,107 @@ BikeBike::Application.configure do config.action_mailer.raise_delivery_errors = true config.action_mailer.perform_deliveries = true I18n.config.language_detection_method = I18n::Config::DETECT_LANGUAGE_FROM_SUBDOMAIN +======= + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both thread web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Enable Rack::Cache to put a simple HTTP cache in front of your application + # Add `rack-cache` to your Gemfile before enabling this. + # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. + # config.action_dispatch.rack_cache = true + + # Disable Rails's static asset server (Apache or nginx will already do this). + config.serve_static_files = true + + # Compress JavaScripts and CSS. + config.assets.js_compressor = :uglifier + # config.assets.css_compressor = :sass + + # Do not fallback to assets pipeline if a precompiled asset is missed. + #config.assets.compile = true + + # Generate digests for assets URLs. + config.assets.digest = true + + # Version of your assets, change this if you want to expire all your assets. + config.assets.version = '1.01' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + #config.force_ssl = true + + # Set to :debug to see everything in the log. + config.log_level = :info + + #config.cache_classes = true + #config.serve_static_assets = true + #config.assets.compile = true + # config.assets.digest = true + + # Prepend all log lines with the following tags. + # config.log_tags = [ :subdomain, :uuid ] + + # Use a different logger for distributed setups. + # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = "http://assets.example.com" + + # Precompile additional assets. + # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. + # config.assets.precompile += %w( search.js ) + #config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif) + config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif *.svg) + #config.action_controller.asset_host = "https://cdn.bikebike.org" + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation can not be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Disable automatic flushing of the log to improve performance. + # config.autoflush_log = false + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + config.action_mailer.delivery_method = :smtp + config.action_mailer.smtp_settings = { + :address => 'smtp.gmail.com', + :domain => 'bikebike.org', + :port => 587, + :authentication => :plain, + :enable_starttls_auto => true, + :openssl_verify_mode => 'none', + :user_name => '', + :password => '' + } + config.action_mailer.raise_delivery_errors = true + config.action_mailer.perform_deliveries = true + I18n.config.language_detection_method = I18n::Config::DETECT_LANGUAGE_FROM_SUBDOMAIN +>>>>>>> d08e8a9... Fix for Quill editor end