Merge remote-tracking branch 'upstream/pull/4770'

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

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 02852dc67f12a1cc3f286872c3e8993a2a63daff..3d830c63f7fab352aa47b893a7c3fdfa0d9a9e07 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -48,6 +48,15 @@ class SiteController < ApplicationController
 
   def key
     expires_in 7.days, :public => true
 
   def key
     expires_in 7.days, :public => true

+    @key = YAML.load_file(Rails.root.join("config/key.yml"))
+    @key.each_value do |layer_data|
+      layer_data.each do |entry|
+        entry["name"] = Array(entry["name"])
+      end
+      layer_data.each_cons(2) do |entry, next_entry|
+        entry["max_zoom"] = next_entry["min_zoom"] - 1 if entry["name"] == next_entry["name"] && !entry["max_zoom"] && next_entry["min_zoom"]
+      end
+    end

     render :layout => false
   end
 
     render :layout => false
   end
 


@@ -107,9 +116,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


@@ -136,7 +156,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