Merge branch 'pull/5297'

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index bb09f3a49953bd66ec26fcb8734befb800c767e1..fcf253289ea45ff65e11f0f30c5909146bfa1f10 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -10,11 +10,11 @@ module ApplicationHelper
   end
 
   def rss_link_to(args = {})
   end
 
   def rss_link_to(args = {})

-    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall")
+    link_to image_tag("RSS.png", :size => "16x16", :class => "align-text-bottom"), args

   end
 
   def atom_link_to(args = {})
   end
 
   def atom_link_to(args = {})

-    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), args, :class => "rsssmall")
+    link_to image_tag("RSS.png", :size => "16x16", :class => "align-text-bottom"), args

   end
 
   def dir
   end
 
   def dir


@@ -26,11 +26,11 @@ module ApplicationHelper
   end
 
   def friendly_date(date)
   end
 
   def friendly_date(date)

-    tag.span(time_ago_in_words(date), :title => l(date, :format => :friendly))
+    tag.time(time_ago_in_words(date), :title => l(date, :format => :friendly), :datetime => date.xmlschema)

   end
 
   def friendly_date_ago(date)
   end
 
   def friendly_date_ago(date)

-    tag.span(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly))
+    tag.time(time_ago_in_words(date, :scope => :"datetime.distance_in_words_ago"), :title => l(date, :format => :friendly), :datetime => date.xmlschema)

   end
 
   def body_class
   end
 
   def body_class


@@ -41,20 +41,21 @@ module ApplicationHelper
     end
   end
 
     end
   end
 

-  def current_page_class(path)
-    :current if current_page?(path)
+  def header_nav_link_class(path)
+    ["nav-link", current_page?(path) ? "text-secondary-emphasis" : "text-secondary"]

   end
 
   def application_data
     data = {
       :locale => I18n.locale,
   end
 
   def application_data
     data = {
       :locale => I18n.locale,

-      :preferred_editor => preferred_editor
+      :preferred_editor => preferred_editor,
+      :preferred_languages => preferred_languages.expand.map(&:to_s)

     }
 
     if current_user
       data[:user] = current_user.id.to_json
 
     }
 
     if current_user
       data[:user] = current_user.id.to_json
 

-      data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } unless current_user.home_lon.nil? || current_user.home_lat.nil?
+      data[:user_home] = { :lat => current_user.home_lat, :lon => current_user.home_lon } if current_user.home_location?

     end
 
     data[:location] = session[:location] if session[:location]
     end
 
     data[:location] = session[:location] if session[:location]