Remove border css class used by previous version of paginator

[rails.git] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 1cb848ea6ef09685407b622c3e83d4131fdfdb1c..5fb8aa111183455586693a2f601024e40e674d55 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -7,6 +7,7 @@ class SiteController < ApplicationController
   before_action :redirect_browse_params, :only => :index
   before_action :redirect_map_params, :only => [:index, :edit, :export]
   before_action :require_oauth, :only => [:index]
   before_action :redirect_browse_params, :only => :index
   before_action :redirect_map_params, :only => [:index, :edit, :export]
   before_action :require_oauth, :only => [:index]

+  before_action :require_user, :only => [:id]

   before_action :update_totp, :only => [:index]
 
   authorize_resource :class => false
   before_action :update_totp, :only => [:index]
 
   authorize_resource :class => false


@@ -61,14 +62,7 @@ class SiteController < ApplicationController
       require_user
     end
 
       require_user
     end
 

-    if %w[potlatch potlatch2].include?(editor)
-      append_content_security_policy_directives(
-        :connect_src => %w[*],
-        :object_src => %w[*],
-        :plugin_types => %w[application/x-shockwave-flash],
-        :script_src => %w['unsafe-inline']
-      )
-    elsif %w[id].include?(editor)
+    if %w[id].include?(editor)

       append_content_security_policy_directives(
         :frame_src => %w[blob:]
       )
       append_content_security_policy_directives(
         :frame_src => %w[blob:]
       )


@@ -113,9 +107,20 @@ class SiteController < ApplicationController
     @locale = params[:about_locale] || I18n.locale
   end
 
     @locale = params[:about_locale] || I18n.locale
   end
 

+  def communities
+    @local_chapters = Community.where(:type => "osm-lc").where.not(:id => "OSMF")
+  end
+

   def export; end
 
   def export; end
 

-  def offline; end
+  def offline
+    flash.now[:warning] = if Settings.status == "database_offline"
+                            t("layouts.osm_offline")
+                          else
+                            t("layouts.osm_read_only")
+                          end
+    render :html => nil, :layout => true
+  end

 
   def preview
     render :html => RichText.new(params[:type], params[:text]).to_html
 
   def preview
     render :html => RichText.new(params[:type], params[:text]).to_html


@@ -142,7 +147,7 @@ class SiteController < ApplicationController
     elsif params[:relation]
       redirect_to relation_path(params[:relation])
     elsif params[:note]
     elsif params[:relation]
       redirect_to relation_path(params[:relation])
     elsif params[:note]

-      redirect_to browse_note_path(params[:note])
+      redirect_to note_path(params[:note])

     elsif params[:query]
       redirect_to search_path(:query => params[:query])
     end
     elsif params[:query]
       redirect_to search_path(:query => params[:query])
     end