Presentation work

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b91710b9c6f3dfa86df5cfc82532b00294adf1f7..5d61e8c6306caca559fe6c95c4eef180dbf826e3 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -57,16 +57,6 @@ module ApplicationHelper
     content_tag(tag, capture(&block), :class => "hide_unless_administrator")
   end
 
     content_tag(tag, capture(&block), :class => "hide_unless_administrator")
   end
 

-  def preferred_editor
-    if params[:editor]
-      params[:editor]
-    elsif @user and @user.preferred_editor
-      @user.preferred_editor
-    else
-      DEFAULT_EDITOR
-    end
-  end
-

   def scale_to_zoom(scale)
     Math.log(360.0 / (scale.to_f * 512.0)) / Math.log(2.0)
   end
   def scale_to_zoom(scale)
     Math.log(360.0 / (scale.to_f * 512.0)) / Math.log(2.0)
   end


@@ -83,8 +73,10 @@ module ApplicationHelper
 
       output_buffer << content_tag(:div, :id => "#{id}_help", :class => "richtext_help") do
         output_buffer << render("site/#{format}_help")
 
       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


@@ -100,4 +92,16 @@ 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 body_class
+    if content_for? :body_class
+      content_for :body_class
+    else
+      "#{params[:controller]} #{params[:controller]}-#{params[:action]}"
+    end
+  end
+
+  def current_page_class(path)
+    :current if current_page?(path)
+  end

 end
 end