X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e488e4cf6780f651c986e6450fa9c1d80560e900..86fae8980d97ba7fdd9345eb5e372fd4f8f20b7f:/app/controllers/site_controller.rb?ds=sidebyside diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 172be5653..58f0a11c9 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -18,8 +18,8 @@ class SiteController < ApplicationController content_security_policy(:only => :id) do |policy| policy.connect_src("*") - policy.img_src("*", :blob) - policy.script_src(*policy.script_src, "dev.virtualearth.net", :unsafe_eval) + policy.img_src(*policy.img_src, "*", :blob) + policy.script_src(*policy.script_src, :unsafe_eval) policy.style_src(*policy.style_src, :unsafe_inline) end @@ -110,6 +110,7 @@ class SiteController < ApplicationController end def copyright + @title = t ".title" @locale = params[:copyright_locale] || I18n.locale end @@ -137,7 +138,12 @@ class SiteController < ApplicationController end def preview - render :html => RichText.new(params[:type], params[:text]).to_html + if params[:text].blank? + flash.now[:warning] = t("layouts.nothing_to_preview") + render :partial => "layouts/flash" + else + render :html => RichText.new(params[:type], params[:text]).to_html + end end def id