Add/remove active class on map UI buttons

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e32d1bb6ead572bace0b7d64a7c86f1776b9f087..3a0ad084b5f15ac30808d7aeb14f5154e19442a6 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -10,22 +10,23 @@ module ApplicationHelper
   end
 
   def rss_link_to(*args)
   end
 
   def rss_link_to(*args)

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

   end
 
   def style_rules
     css = ""
 
   end
 
   def style_rules
     css = ""
 

-    css << ".hidden { display: none }";
-    css << ".hide_unless_logged_in { display: none }" unless @user;
-    css << ".hide_if_logged_in { display: none }" if @user;
-    css << ".hide_if_user_#{@user.id} { display: none }" if @user;
-    css << ".show_if_user_#{@user.id} { display: inline }" if @user;
-    css << ".hide_unless_administrator { display: none }" unless @user and @user.administrator?;
+    css << ".hidden { display: none !important }";
+    css << ".hide_unless_logged_in { display: none !important }" unless @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?;

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


@@ -77,13 +78,15 @@ module ApplicationHelper
     content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
       output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do
         output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format)))
     content_tag(:div, :id => "#{id}_container", :class => "richtext_container") do
       output_buffer << content_tag(:div, :id => "#{id}_content", :class => "richtext_content") do
         output_buffer << text_area(object_name, method, options.merge("data-preview-url" => preview_url(:format => format)))

-        output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview")
+        output_buffer << content_tag(:div, "", :id => "#{id}_preview", :class => "richtext_preview richtext")

       end
 
       output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do
         output_buffer << render("site/#{format}_help")
       end
 
       output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do
         output_buffer << render("site/#{format}_help")

-        output_buffer << submit_tag(I18n.t("site.richtext_area.edit"), :id => "#{id}_doedit", :class => "richtext_doedit", :disabled => true)
-        output_buffer << submit_tag(I18n.t("site.richtext_area.preview"), :id => "#{id}_dopreview", :class => "richtext_dopreview")
+        output_buffer << content_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
   end
       end
     end
   end


@@ -99,12 +102,4 @@ module ApplicationHelper
   def friendly_date(date)
     content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
   end
   def friendly_date(date)
     content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
   end

-
-  def note_author(object, link_options = {})
-    if object.author.nil?
-      ""
-    else
-      link_to h(object.author.display_name), link_options.merge({:controller => "user", :action => "view", :display_name => object.author.display_name})
-    end
-  end

 end
 end