bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Fix for Quill editor

Browse Source
This commit is contained in:
Godwin 2017-05-19 19:31:41 -07:00
parent 9909c1b2e1
commit d08e8a9088
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/editor.js
View File

@ -12,6 +12,7 @@
modules: { modules: {
toolbar: [ toolbar: [
[{ 'header': [1, 2, false] }], [{ 'header': [1, 2, false] }],
['link', 'image'],
['bold', 'italic', 'underline', 'strike'], ['bold', 'italic', 'underline', 'strike'],
[{ 'script': 'sub'}, { 'script': 'super' }], [{ 'script': 'sub'}, { 'script': 'super' }],
[{ 'list': 'ordered'}, { 'list': 'bullet' }, 'blockquote'] [{ 'list': 'ordered'}, { 'list': 'bullet' }, 'blockquote']

4
app/assets/stylesheets/_application.scss
View File

@ -1205,7 +1205,7 @@ fieldset {
} }
} }
ul { .locale-select, .text-editors {
list-style: none; list-style: none;
padding: 0; padding: 0;
margin: 0; margin: 0;
@ -1253,7 +1253,7 @@ fieldset {
position: relative; position: relative;
background-color: $white; background-color: $white;
li { li[data-locale] {
display: none; display: none;
&.selected { &.selected {

6
app/controllers/application_controller.rb
View File

@ -8,6 +8,10 @@ class ApplicationController < BaseController
@@test_host @@test_host
@@test_location @@test_location
def default_url_options
{ host: "#{request.protocol}#{request.host_with_port}" }
end
def capture_page_info def capture_page_info
# capture request info in case an error occurs # capture request info in case an error occurs
if request.method == "GET" && (params[:controller] != 'application' || params[:action] != 'contact') if request.method == "GET" && (params[:controller] != 'application' || params[:action] != 'contact')
@ -225,7 +229,7 @@ class ApplicationController < BaseController
@conference.organizations.each do |org| @conference.organizations.each do |org|
org.users.each do |user| org.users.each do |user|
email_list << user.named_email # email_list << user.named_email
end end
end end
end end

8
config/environments/production.rb
View File

@ -88,14 +88,14 @@ BikeBike::Application.configure do
config.action_mailer.delivery_method = :smtp config.action_mailer.delivery_method = :smtp
config.action_mailer.smtp_settings = { config.action_mailer.smtp_settings = {
:address => 'mail.bikebike.org', :address => 'smtp.gmail.com',
:domain => 'preview.bikebike.org', :domain => 'bikebike.org',
:port => 587, :port => 587,
:authentication => :plain, :authentication => :plain,
:enable_starttls_auto => true, :enable_starttls_auto => true,
:openssl_verify_mode => 'none', :openssl_verify_mode => 'none',
:user_name => 'info@preview.bikebike.org', :user_name => '',
:password => 'test' :password => ''
} }
config.action_mailer.raise_delivery_errors = true config.action_mailer.raise_delivery_errors = true
config.action_mailer.perform_deliveries = true config.action_mailer.perform_deliveries = true