Make the text direction style come before the screen size style

[rails.git] / app / helpers / browse_helper.rb

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 54c99f5600bf78b93e3eb24963028d56ddac393e..ebcd58dd042b7671ed5f8e9dfd462189899deb07 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -4,7 +4,12 @@ module BrowseHelper
   end
 
   def printable_name(object, version=false)
   end
 
   def printable_name(object, version=false)

-    name = t 'printable_name.with_id', :id => object.id.to_s
+    if object.id.is_a?(Array)
+      id = object.id[0]
+    else
+      id = object.id
+    end
+    name = t 'printable_name.with_id', :id => id.to_s

     if version
       name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
     end
     if version
       name = t 'printable_name.with_version', :id => name, :version => object.version.to_s
     end


@@ -16,14 +21,12 @@ module BrowseHelper
     return name
   end
 
     return name
   end
 

-  def css_class(type, object)
-    css = type + " " + h(object.tags.find_all { |k,v| k == "aeroway" || k == "amenity" || k == "barrier" || k == "building" || k == "highway" || k == "landuse" || k == "leisure" || k == "man_made" || k == "natural" || k == "railway" || k == "shop" || k == "tourism" || k == "waterway" }.join(' '))
-    return css
+  def link_class(type, object)
+    return type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '')

   end
 
   def link_title(object)
   end
 
   def link_title(object)

-    title = h(object.tags.map { |k,v| k + '=' + v }.to_sentence)
-    return title
+    return h(icon_tags(object).map { |k,v| k + '=' + v }.to_sentence)

   end
 
   def format_key(key)
   end
 
   def format_key(key)


@@ -46,12 +49,27 @@ module BrowseHelper
 
 private
 
 
 private
 

+  ICON_TAGS = [ 
+    "aeroway", "amenity", "barrier", "building", "highway", "historic", "landuse",
+    "leisure", "man_made", "natural", "railway", "shop", "tourism", "waterway"
+  ]
+
+  def icon_tags(object)
+    object.tags.find_all { |k,v| ICON_TAGS.include? k }
+  end
+

   def wiki_link(type, lookup)
     locale = I18n.locale.to_s
 
   def wiki_link(type, lookup)
     locale = I18n.locale.to_s
 

-    if page = WIKI_PAGES[locale][type][lookup] rescue nil
+    # update-wiki-pages does s/ /_/g on keys before saving them, we
+    # have to replace spaces with underscore so we'll link
+    # e.g. `source=Isle of Man Government aerial imagery (2001)' to
+    # the correct page.
+    lookup_us = lookup.tr(" ", "_")
+
+    if page = WIKI_PAGES[locale][type][lookup_us] rescue nil

       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"

-    elsif page = WIKI_PAGES["en"][type][lookup] rescue nil
+    elsif page = WIKI_PAGES["en"][type][lookup_us] rescue nil

       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end
 
       url = "http://wiki.openstreetmap.org/wiki/#{page}?uselang=#{locale}"
     end