X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d57dd1f4da4d4605f534607b69944e3c977e4db5..4de0815b541a36b5cfe77d80f22c0800a4838433:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 5d63e79fd..aa107bcb6 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -107,6 +107,14 @@ class SiteController < ApplicationController rescue ActiveRecord::RecordNotFound # don't try and derive a location from a missing/deleted object end + + if api_status != "online" + flash.now[:warning] = { :partial => "layouts/offline_flash" } + elsif current_user && !current_user.data_public? + flash.now[:warning] = { :partial => "not_public_flash" } + else + @enable_editor = true + end end def copyright @@ -129,16 +137,17 @@ class SiteController < ApplicationController def export; end def offline - flash.now[:warning] = if Settings.status == "database_offline" - t("layouts.osm_offline") - else - t("layouts.osm_read_only") - end + flash.now[:warning] = { :partial => "layouts/offline_flash" } render :html => nil, :layout => true 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