Notes: show first comment as marker tooltip

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 5266bf633ecfa3c72d94b07c78846d13eee330db..329aa25e8c11143aca876943ddee6cc1760da035 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1,5 +1,5 @@
 module ApplicationHelper
 module ApplicationHelper

-  require 'rexml/document'
+  require "rexml/document"

 
   def linkify(text)
     if text.html_safe?
 
   def linkify(text)
     if text.html_safe?


@@ -10,11 +10,11 @@ module ApplicationHelper
   end
 
   def rss_link_to(*args)
   end
 
   def rss_link_to(*args)

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

   end
 
   def atom_link_to(*args)
   end
 
   def atom_link_to(*args)

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

   end
 
   def style_rules
   end
 
   def style_rules


@@ -25,10 +25,10 @@ module ApplicationHelper
     css << ".hide_if_logged_in { display: none !important }" if @user
     css << ".hide_if_user_#{@user.id} { display: none !important }" if @user
     css << ".show_if_user_#{@user.id} { display: inline !important }" if @user
     css << ".hide_if_logged_in { display: none !important }" if @user
     css << ".hide_if_user_#{@user.id} { display: none !important }" if @user
     css << ".show_if_user_#{@user.id} { display: inline !important }" if @user

-    css << ".hide_unless_administrator { display: none !important }" unless @user and @user.administrator?
-    css << ".hide_unless_moderator { display: none !important }" unless @user and @user.moderator?
+    css << ".hide_unless_administrator { display: none !important }" unless @user && @user.administrator?
+    css << ".hide_unless_moderator { display: none !important }" unless @user && @user.moderator?

 
 

-    return content_tag(:style, css, :type => "text/css")
+    content_tag(:style, css, :type => "text/css")

   end
 
   def if_logged_in(tag = :div, &block)
   end
 
   def if_logged_in(tag = :div, &block)


@@ -58,7 +58,7 @@ module ApplicationHelper
   end
 
   def richtext_area(object_name, method, options = {})
   end
 
   def richtext_area(object_name, method, options = {})

-    id = "#{object_name.to_s}_#{method.to_s}"
+    id = "#{object_name}_#{method}"

     format = options.delete(:format) || "markdown"
 
     content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
     format = options.delete(:format) || "markdown"
 
     content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do