jsrouting: mouseover an instruction, highlight the route segment

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index c4e4d425a5ef997a97dbb84cc2d75eeac53a5cac..b192a63d558ee4c4ba8bd7e06dc815536168a1fa 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,8 +1,4 @@
 module BrowseHelper
 module BrowseHelper

-  def link_to_page(page, page_param)
-    return link_to(page, page_param => page)
-  end
-

   def printable_name(object, version=false)
     if object.id.is_a?(Array)
       id = object.id[0]
   def printable_name(object, version=false)
     if object.id.is_a?(Array)
       id = object.id[0]


@@ -28,11 +24,16 @@ module BrowseHelper
   end
 
   def link_class(type, object)
   end
 
   def link_class(type, object)

+    classes = [ type ]
+

     if object.redacted?
     if object.redacted?

-      type + " deleted"
+      classes << "deleted"

     else
     else

-      type + " " + h(icon_tags(object).join(' ')) + (object.visible == false ? ' deleted' : '')
+      classes += icon_tags(object).flatten.map { |t| h(t) }
+      classes << "deleted" unless object.visible?

     end
     end

+
+    classes.join(" ")

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


@@ -61,6 +62,18 @@ module BrowseHelper
     end
   end
 
     end
   end
 

+  def type_and_paginated_count(type, pages)
+    if pages.page_count == 1
+      t "browse.changeset.#{type}",
+        :count => pages.item_count
+    else
+      t "browse.changeset.#{type}_paginated",
+        :x => pages.current_page.first_item,
+        :y => pages.current_page.last_item,
+        :count => pages.item_count
+    end
+  end
+

 private
 
   ICON_TAGS = [
 private
 
   ICON_TAGS = [


@@ -106,16 +119,25 @@ private
         lang = 'en'
       end
     elsif key =~ /^wikipedia:(\S+)$/
         lang = 'en'
       end
     elsif key =~ /^wikipedia:(\S+)$/

-      # Language is in the key, so assume value is a simple title
+      # Language is in the key, so assume value is the title

       lang = $1
     else
       # Not a wikipedia key!
       return nil
     end
 
       lang = $1
     else
       # Not a wikipedia key!
       return nil
     end
 

+    if value =~ /^([^#]*)(#.*)/ then
+      # Contains a reference to a section of the wikipedia article
+      # Must break it up to correctly build the url
+      value = $1
+      section = $2
+    else
+      section = ""
+    end
+

     return {
     return {

-      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}",
-      :title => value
+      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{section}",
+      :title => value + section

     }
   end
 end
     }
   end
 end