Remove border=0 from feed icons

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index db8b51f5cd9e7f7d30b904bf3cd227913c128113..e81a9d4019897f54c9bd4fcbebc9f45b4051a3e0 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -9,32 +9,12 @@ module ApplicationHelper
     end
   end
 
     end
   end
 

-  def rss_link_to(*args)
-    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall")
+  def rss_link_to(args = {})
+    link_to(image_tag("RSS.png", :size => "16x16"), args, :class => "rsssmall")

   end
 
   end
 

-  def atom_link_to(*args)
-    link_to(image_tag("RSS.png", :size => "16x16", :border => 0), Hash[*args], :class => "rsssmall")
-  end
-
-  def richtext_area(object_name, method, options = {})
-    id = "#{object_name}_#{method}"
-    type = options.delete(:format) || "markdown"
-
-    tag.div(:id => "#{id}_container", :class => "richtext_container") do
-      output_buffer << tag.div(:id => "#{id}_content", :class => "richtext_content") do
-        output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:type => type)))
-        output_buffer << tag.div("", :id => "#{id}_preview", :class => "richtext_preview richtext text-break")
-      end
-
-      output_buffer << tag.div(:id => "#{id}_help", :class => "richtext_help") do
-        output_buffer << render("site/#{type}_help")
-        output_buffer << tag.div(:class => "buttons") do
-          output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit deemphasize", :disabled => true)
-          output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview deemphasize")
-        end
-      end
-    end
+  def atom_link_to(args = {})
+    link_to(image_tag("RSS.png", :size => "16x16"), args, :class => "rsssmall")

   end
 
   def dir
   end
 
   def dir


@@ -46,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


@@ -61,31 +41,38 @@ 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]

-
-    if oauth_token
-      data[:token] = oauth_token.token
-      data[:token_secret] = oauth_token.secret
-      data[:consumer_key] = oauth_token.client_application.key
-      data[:consumer_secret] = oauth_token.client_application.secret
-    end
+    data[:oauth_token] = oauth_token.token if oauth_token

 
     data
   end
 
     data
   end

+
+  # If the flash is a hash, then it will be a partial with a hash of locals, so we can call `render` on that
+  # This allows us to render html into a flash message in a safe manner.
+  def render_flash(flash)
+    if flash.is_a?(Hash)
+      render flash.with_indifferent_access
+    else
+      flash
+    end
+  rescue StandardError
+    flash.inspect if Rails.env.development?
+  end

 end
 end