jsrouting: clear search boxes on page unload

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

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 37dcf90e09de1c97e4ae4d62dfa96fb79f0b3860..5266bf633ecfa3c72d94b07c78846d13eee330db 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -9,42 +9,24 @@ module ApplicationHelper
     end
   end
 
     end
   end
 

-  def html_escape_unicode(text)
-    chars = ActiveSupport::Multibyte::Unicode.u_unpack(text).map do |c|
-      c < 127 ? c.chr : "&##{c.to_s};"
-    end
-
-    return chars.join("")
-  end
-

   def rss_link_to(*args)
   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" });
-  end
-
-  def javascript_strings
-    js = ""
-
-    js << "<script type='text/javascript'>\n"
-    js << "i18n_strings = new Array();\n"
-    js << javascript_strings_for_key("javascripts")
-    js << "</script>\n"
-
-    return raw(js)
+    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


@@ -75,52 +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 describe_location(lat, lon, zoom = nil, language = nil)
-    zoom = zoom || 14
-    language = language || request.user_preferred_languages.join(',')
-    url = "http://nominatim.openstreetmap.org/reverse?lat=#{lat}&lon=#{lon}&zoom=#{zoom}&accept-language=#{language}"
-
-    begin
-      response = OSM::Timer.timeout(4) do
-        REXML::Document.new(Net::HTTP.get(URI.parse(url)))
-      end
-    rescue Exception
-      response = nil
-    end
-
-    if response and result = response.get_text("reversegeocode/result")
-      result.to_s
-    else
-      "#{number_with_precision(lat, :precision => 3)}, #{number_with_precision(lon, :precision => 3)}"
-    end
-  end
-
-  def user_image(user, options = {})
-    options[:class] ||= "user_image"
-
-    image_tag user.image.url(:large), options
-  end
-
-  def user_thumbnail(user, options = {})
-    options[:class] ||= "user_thumbnail"
-
-    image_tag user.image.url(:small), options
-  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 richtext_area(object_name, method, options = {})
     id = "#{object_name.to_s}_#{method.to_s}"
     format = options.delete(:format) || "markdown"
   def richtext_area(object_name, method, options = {})
     id = "#{object_name.to_s}_#{method.to_s}"
     format = options.delete(:format) || "markdown"


@@ -128,31 +64,40 @@ 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
 

-private
+  def dir
+    if dir = params[:dir]
+      dir == "rtl" ? "rtl" : "ltr"
+    else
+      I18n.t("html.dir")
+    end
+  end

 
 

-  def javascript_strings_for_key(key)
-    js = ""
-    value = I18n.t(key, :locale => "en")
+  def friendly_date(date)
+    content_tag(:span, time_ago_in_words(date), :title => l(date, :format => :friendly))
+  end

 
 

-    if value.is_a?(String)
-      js << "i18n_strings['#{key}'] = '" << escape_javascript(t(key)) << "';\n"
+  def body_class
+    if content_for? :body_class
+      content_for :body_class

     else
     else

-      value.each_key do |k|
-        js << javascript_strings_for_key("#{key}.#{k}")
-      end
+      "#{params[:controller]} #{params[:controller]}-#{params[:action]}"

     end
     end

+  end

 
 

-    return js
+  def current_page_class(path)
+    :current if current_page?(path)

   end
 end
   end
 end