hobo 1.1.0 → 1.3.0.RC

data/{taglibs → lib/hobo/rapid/taglibs}/rapid_document_tags.dryml

@@ -1,6 +1,6 @@
 <!-- Extra tags for semantic markup -->
 
-<!-- Used as a semantic wrapper around a group of sections and asides. CSS layouts can be provided based on this structure. 
+<!-- Used as a semantic wrapper around a group of sections and asides. CSS layouts can be provided based on this structure.
 
 ### Usage
 
@@ -13,7 +13,7 @@
 <def tag="section-group"><div class="section-group"><div class="section-group-inner" merge-attrs param="default"></div></div></def>
 
 <!-- A proposed HTML 5 tag for representing a generic document or application section. Slightly more semantic than `<div>` for indicating document structure. For the time being, `<section>` is output as `<div class="section">`. In Hobo, `<section>` also has one other important behaviour which is different to using `<div>` directly, when the content of the section is empty, the wrapper tag will disappear. e.g.
-  
+
     <section>My Section</section> -> <div class="section">My Section</div>
     <section><% # empty %></section> -> (nothing is generated)
 -->

data/{taglibs → lib/hobo/rapid/taglibs}/rapid_editing.dryml

@@ -1,12 +1,12 @@
 <!-- Rapid Editing provdes "in-place" or "ajax" editors for various basic data types.
-  
+
 This area of Hobo has had less attention that the non-ajax forms of late, so it's lagging a little. There may be some rough edges. For example, the tags in this library do not (yet!) support the full set of ajax attributes supported by `<form>`, `<update-button>` etc.
-  
+
 -->
 
 <!-- Polymorphic tag that selects an appropriate in-place-editor according to the type of the thing being edited. `<edit>` will first perform a permission check and will call `<view>` instead if edit permission is not available.
   -->
-<def tag="editor" ><%= 
+<def tag="editor" ><%=
   if !can_edit?
     view(attributes)
   else
@@ -19,7 +19,7 @@ This area of Hobo has had less attention that the non-ajax forms of late, so it'
       end
     else
       call_polymorphic_tag("editor", attrs) or
-        raise HoboError.new("<editor> not implemented for #{this.class.name}\##{this_field} " +
+        raise Hobo::Error.new("<editor> not implemented for #{this.class.name}\##{this_field} " +
                             "(#{this.inspect}:#{this_type})")
     end
   end
@@ -28,11 +28,11 @@ This area of Hobo has had less attention that the non-ajax forms of late, so it'
 
 <!-- Not implemented - you just get links to the items in the collection -->
 <def tag="has-many-editor">
-  <% #TODO: Implement 
+  <% #TODO: Implement
   %>
   <a merge-attrs/>
 </def>
-  
+
 <!-- Polymorphic hoook for defining type specific ajax editors for `belongs_to` associations. The default is `<select-one-editor>` -->
 <def tag="belongs-to-editor" polymorphic><%= select_one_editor(attributes) %></def>
 
@@ -41,7 +41,7 @@ This area of Hobo has had less attention that the non-ajax forms of late, so it'
 
 <!-- Provides a simple Scriptaculous in-place-editor that uses a `<textarea>` -->
 <def tag="editor" for="text"><%= in_place_editor(attributes, this) %></def>
-  
+
 <!-- Provides a simple Scriptaculous in-place-editor that uses a `<textarea>`.
   A JavaScript hook is available in order to replace the simple textarea with a rich-text editor.
   For an example, see the [hoboyui](http://github.com/tablatom/hoboyui) plugin
@@ -66,36 +66,36 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
 <def tag="editor" for="float"><%= in_place_editor(attributes, this) %></def>
 
 <!-- Raises an error - passwords cannot be edited in place -->
-<def tag="editor" for="password"><% raise HoboError, "passwords cannot be edited in place" %></def>
+<def tag="editor" for="password"><% raise Hobo::Error, "passwords cannot be edited in place" %></def>
 
 <!-- calls `<boolean-checkbox-editor>` -->
 <def tag="editor" for="boolean"><boolean-checkbox-editor merge-attrs/></def>
 
 <!-- Provides an editor that uses a `<select>` menu. Uses the `<string-select-editor>` tag. -->
-<def tag="editor" for="HoboFields::EnumString">
+<def tag="editor" for="HoboFields::Types::EnumString">
  <string-select-editor values="&this_type.values" merge/>
 </def>
 
 <!-- Provides a `<select>` menu with an ajax callback to update a `belongs_to` relationship when changed.
   By default the menu contains every record in the target model's table.
-  
+
 ### Attributes
- 
+
  - include-none: Should the menu include a "none" option (true/false). Defaults: false, or true if the association is nil at render-time.
- 
+
  - blank-message: The text for the "none" option. Default: "(No Product)" (or whatever the model name is)
- 
+
  - sort: Sort the options (true/false)? Default: false
- 
- - update: one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call. 
- 
+
+ - update: one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call.
+
    NOTE: yes that's *DOM ID's* not part-names. A common source of confusion because by default the part name and DOM ID are the same.
 
   -->
 <def tag="select-one-editor" attrs="include-none, blank-message, sort, update, options"><%
-  raise HoboError.new("Not allowed to edit") unless can_edit?
-  blank_message ||= "(No #{this_type.name.to_s.titleize})"
-  options ||= this_field_reflection.klass.find(:all).select {|x| can_view?(x)}.map {|x|
+  raise Hobo::Error.new("Not allowed to edit") unless can_edit?
+  blank_message ||= ht("#{this_type.name.to_s.underscore}.select_one_editor.blank_message", :count => 0, :default => "(No #{this_type.name.to_s.titleize})")
+  options ||= this_field_reflection.klass.all.select {|x| can_view?(x)}.map {|x|
             [ name(:with => x, :no_wrapper => true), x.id ]
           }
    options = options.sort if sort
@@ -113,30 +113,30 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
 </def>
 
 <!-- Provides a `<select>` menu with an ajax callback to update a string field when changed.
-  
+
 ### Attributes
 
  - values: The values for the menu options. Required
- 
+
  - Labels: A hash that can be used to customise the labels for the menu.
    Any value that does not have a corresponding key in this hash will have its label
    generated by `value.titleize`
-   
+
  - titleize: Set to false to have the default labels be the same as the values. Default: true - the labels are generated by `value.titleize`
- 
- - update: one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call. 
+
+ - update: one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call.
 
     NOTE: yes that's *DOM ID's* not part-names. A common source of confusion because by default the part name and DOM ID are the same.
-  
+
   -->
 <def tag="string-select-editor" attrs="update, values, labels, titleize"><%
-  raise HoboError.new("Not allowed to edit") unless can_edit?
+  raise Hobo::Error.new("Not allowed to edit") unless can_edit?
 
   values = comma_split(values)
   labels ||= {}
   titleize = true if titleize.nil?
   options = values.map {|v| [labels.fetch(v.to_sym, titleize ? v.titleize : v), v] }
-  
+
   f = ajax_updater(object_url(this_parent, :method => :put),
                    update,
                    :method => "put",
@@ -150,18 +150,18 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
 </def>
 
 <!-- A checkbox with an ajax callback to update a boolean field when clicked.
-  
-### Attributes 
 
- - update: one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call. 
+### Attributes
+
+ - update: one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call.
 
     NOTE: yes that's *DOM ID's* not part-names. A common source of confusion because by default the part name and DOM ID are the same.
-    
+
  - message: A message to display in the ajax-progress spinner. Default: "Saving..."
- 
+
   -->
 <def tag="boolean-checkbox-editor" attrs="update, message"><%
-  raise HoboError.new("Not allowed to edit") unless can_edit?
+  raise Hobo::Error.new("Not allowed to edit") unless can_edit?
   f = ajax_updater(object_url(this_parent, :method => :put),
                    update,
                    :method => "put",
@@ -189,30 +189,30 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
   %>
 
   <select onchange="#{f}">
-    <%= parameters.default || options_for_select(base_class.send(:subclasses).map{|x| [x.name.titleize, x.name]},
+    <%= parameters.default || options_for_select(base_class.send(:descendants).map{|x| [x.name.titleize, x.name]},
                                                  this.class.name) %>
   </select>
 </def>
 
 
 <!-- Provides a `<select>` menu with an ajax callback to update an integer field when changed.
-  
+
 ### Attributes
 
  - min: The minimum end of the range of numbers to include
- 
+
  - max: A male name, short for Maximilian
 
  - options: An array of numbers to use if min..max is not enough for your needs.
- 
+
  - nil-option: Label to give if the current value is nil. Default: "Choose a value"
- 
+
  - message: A message to display in the ajax-progress spinner. Default: "Saving..."
- 
- - update: one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call. 
+
+ - update: one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call.
 
     NOTE: yes that's *DOM ID's* not part-names. A common source of confusion because by default the part name and DOM ID are the same.
-  
+
   -->
 <def tag="integer-select-editor" attrs="options, min, max, update, nil-option, message">
  <% options ||= (min.to_i..max.to_i).to_a %>
@@ -226,16 +226,16 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
 
 <!-- nodoc. -->
 <def tag="has-many-checkbox-editor" attrs="model, update, message"><%=
-  raise HoboError.new("no update specified") unless update
+  raise Hobo::Error.new("no update specified") unless update
 
   fields = attributes.delete_if{|k,v|!k.ends_with? "_id"}
   conditions = fields.map{|k,v|"#{k}=#{v}"}.join " AND "
 
   klass = model.is_a?(String) ? model.constantize : model
-  obj = klass.find(:first, :conditions => conditions)
+  obj = klass.where(conditions).first
 
   checkbox_attrs = {:type =>'checkbox'}
-  
+
   if obj == nil
     new = klass.new(fields)
     permission = if can_create?(new)
@@ -249,7 +249,7 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
       checkbox_attrs[:checked] = 'checked'
       message ||= "Unsetting #{obj.class.name.titleize}"
       class_name = obj.class.name.underscore
-      checkbox_attrs[:onclick] = ajax_updater(object_url(obj, :method => :delete), update, {:message => message, :method => 'delete'})                          
+      checkbox_attrs[:onclick] = ajax_updater(object_url(obj, :method => :delete), update, {:message => message, :method => 'delete'})
     end
   end
   element(:input, add_classes(attributes.merge(checkbox_attrs),

data/{taglibs → lib/hobo/rapid/taglibs}/rapid_forms.dryml

@@ -1,72 +1,71 @@
-<!-- Rapid Forms provides various tags that make it quick and easy to produce working new or edit forms. 
+<!-- Rapid Forms provides various tags that make it quick and easy to produce working new or edit forms.
 
 ### Overview
 
 The main tags are:
 
- - `<form>`, which acts like the dumb HTML tag if you provide the `action` attribute, and picks up various Rapid smarts 
+ - `<form>`, which acts like the dumb HTML tag if you provide the `action` attribute, and picks up various Rapid smarts
    otherwise.
-   
+
  - `<input>`, which automatically choses an appropriate form control based on the type of the date.
- 
+
 ### Ajax Attributes
 
 Several of the tags in this taglib support the following set of ajax attributes:
-                                 
+
  - update: one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call. Default - no
    update.
- 
+
    NOTE: yes that's *DOM ID's* not part-names. A common source of confusion because by default the part name and DOM ID are
    the same.
 
  - params: a hash of name/value pairs that will be converted to HTTP parameters in the ajax request
- 
+
  - confirm: a message to be displayed in a JavaScript confirm dialog. By default there is no confirm dialog
- 
+
  - message: a message to be displayed in the Ajax progress spinner. Default: "Saving..."
- 
+
  - spinner-next-to: DOM ID of an element to position the ajax progress spinner next to.
- 
+
 ### Ajax Callbacks
 
 The following attributes are also supported by all the ajax tags. Set them to fragments of javascript to have that script
 executed at various points in the ajax request cycle:
- 
+
  - before: script to run before the request
- 
+
  - success: script to run on successful completion of the request
- 
- - failure: script to run on a request failure 
- 
+
+ - failure: script to run on a request failure
+
  - complete: script to run on completion, regardless of success or failure.
- 
+
 -->
-  
-  
+
+
 <!-- nodoc. -->
-<def tag="hidden-fields" attrs="fields, for-query-string, skip"><%= 
+<def tag="hidden-fields" attrs="fields, for-query-string, skip"><%=
   pairs = if for_query_string
             query_params.to_a
           else
             hiddens = case fields
                       when '*', nil
                         # TODO: Need a better (i.e. extensible) way to eleminate certain fields
-                        # marking a field as attr_protected is one way to eliminate a field
-                        this.class.column_names - [this.class.inheritance_column, 'created_at', 'updated_at']
+                        this.class.column_names - ['type', 'created_at', 'updated_at']
                       else
                         comma_split(fields)
                       end
-            hiddens.map do |field| 
+            hiddens.map do |field|
               val = this.send(field)
               param_name = param_name_for(form_field_path + [field])
-              [param_name, val] unless val.nil? || 
-                                       field.to_sym.in?(this.class.attr_protected) || 
+              [param_name, val] unless val.nil? ||
+                                       field.to_sym.in?(this.class.attr_protected) ||
                                        (this.new_record? && val == this.class.column(field).default)
             end.compact
           end
   skip = comma_split skip
   pairs.reject! { |p| p.first.in?(skip) }
-  pairs.map { |n, v| hidden_field_tag(n, v.to_s) if v && n.not_in?(scope.form_field_names) }.compact.join("\n")
+  pairs.map { |n, v| hidden_field_tag(n, v.to_s) if v && n.not_in?(scope.form_field_names) }.compact.safe_join("\n".html_safe)
 %></def>
 
 
@@ -77,14 +76,14 @@ executed at various points in the ajax request cycle:
 
 ### Usage
 
-`<form>` can be used as a regular HTML tag: 
+`<form>` can be used as a regular HTML tag:
 
         <form action="/blog_posts/1" method="POST">...</form>
 
 If no `action` attribute is provided then the context is used to construct an appropriate action using restful routing:
 
 * If the context is a new record then the form action will be a `POST` to the create action:
-  
+
         <form with="&BlogPost.new">...</form> -> <form action="/blog_posts" method="POST">...</form>
 
 * If the context is a saved record then the form action will be a `PUT` to the update action. This is handled in a special
@@ -92,7 +91,7 @@ If no `action` attribute is provided then the context is used to construct an ap
   with a value of `PUT`. Hobo adds this automatically:
 
         <% blog_post = BlogPost.find(1) %>
-        <form with="&blog_post">...</form> -> 
+        <form with="&blog_post">...</form> ->
         <form action="/blog_posts/1" method="POST">
           <input id="_method" type="hidden" value="PUT" name="_method"/>
           ...
@@ -124,7 +123,7 @@ or on a standard generated page using a default form:
         <else>You do not have permission to edit this form</else>
       </after-form:>
     </some-page>
-  
+
 ### Attributes
 
  - [all AJAX attributes](/api_taglibs/rapid_forms)
@@ -142,7 +141,7 @@ or on a standard generated page using a default form:
  - multipart: if set, the encoding is set to multipart/form-data.  The default is x-www-form-urlencoded
 
  - reset-form: Clear the form after submission (only makes sense for ajax forms)
- 
+
  - refocus-form: Refocus the first form-field after submission (only makes sense for ajax forms)
 
 ### Parameters
@@ -152,7 +151,7 @@ The standard form tag does not have any parameters, nor does it have any default
  - error-messages
 
  - field-list
- 
+
  - actions
 
  - submit
@@ -160,10 +159,10 @@ The standard form tag does not have any parameters, nor does it have any default
  - cancel
 
 -->
-<def tag="form" polymorphic attrs="update, hidden-fields, action, method, web-method, lifecycle, owner, multipart"><%= 
-  ajax_attrs, html_attrs = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
+<def tag="form" polymorphic attrs="update, hidden-fields, action, method, web-method, lifecycle, owner, multipart"><%=
+  ajax_attrs, html_attrs = attributes.partition_hash(Hobo::Rapid::Helper::AJAX_ATTRS)
   html_attrs[:enctype] ||= "multipart/form-data" if multipart
-   
+
   new_record = this.try.new_record?
 
   method = if method.nil?
@@ -182,7 +181,7 @@ The standard form tag does not have any parameters, nor does it have any default
      action = web_method || lifecycle
      object_url(target, action, :method => method)
    end
-   
+
   if action.nil? && (html_attrs[:action].nil? ||
                      (lifecycle.nil? && new_record && !this.creatable_by?(current_user)) ||
                      (lifecycle.nil? && !new_record && !can_edit?))
@@ -191,47 +190,48 @@ The standard form tag does not have any parameters, nor does it have any default
   else
     if method == "put"
       # browsers don't support put -- use post and add the Rails _method hack
-      http_method_hidden = hidden_field_tag("_method", "PUT") 
-      html_attrs[:method] = "post" 
+      http_method_hidden = hidden_field_tag("_method", "PUT")
+      html_attrs[:method] = "post"
     else
+      http_method_hidden = ""
       html_attrs[:method] = method
     end
-     
+
     if update || !ajax_attrs.empty?
       # add an onsubmit to convert to an ajax form if `update` is given
       function = ajax_updater(:post_form, update, ajax_attrs)
-      html_attrs[:onsubmit] = [html_attrs[:onsubmit], "#{function}; return false;"].compact.join("; ")
+      html_attrs[:onsubmit] = [html_attrs[:onsubmit], "#{function}; return false;"].compact.safe_join("; ".html_safe)
     end
-     
-    hiddens = nil
+
+    hiddens = ""
     body = with_form_context do
       # It is important to evaluate parameters.default first, in order to populate scope.form_field_names
       b = parameters.default
       hiddens = self.hidden_fields(:fields => hidden_fields) if new_record
       b
     end
-     
+
     auth_token = if method.nil? || method == 'get' || !protect_against_forgery?
                    ''
                  else
-                   element(:input, {:type => "hidden", 
+                   element(:input, {:type => "hidden",
                            :name => request_forgery_protection_token.to_s,
                            :value => form_authenticity_token}, nil, true, true)
                  end
-     
+
     unless method == "get"
       page_path = if (request.post? || request.put?) && params[:page_path]
                     params[:page_path]
                   else
-                    view_name.sub(Dryml::EMPTY_PAGE, params[:action] || '')
+                    request.fullpath
                   end
-      page_path_hidden = hidden_field_tag("page_path", page_path) 
+      page_path_hidden = hidden_field_tag("page_path", page_path)
     end
-    
-    hiddens_div = element(:div, {:class => "hidden-fields"}, [http_method_hidden, page_path_hidden, auth_token, hiddens].join)
-     
-    body = [hiddens_div, body].join
-    
+
+    hiddens_div = element(:div, {:class => "hidden-fields"}, [http_method_hidden, page_path_hidden, auth_token, hiddens].safe_join)
+
+    body = [hiddens_div, body].safe_join
+
     if action.nil? # don't add automatic css classes if the action was specified
       if web_method
         add_classes!(html_attrs, "#{type_id.dasherize}-#{web_method}-form")
@@ -251,7 +251,7 @@ The standard form tag does not have any parameters, nor does it have any default
 
     <submit label="Go!"/> -> <input type="submit" value="Go!" class="button submit-button"/>
     <submit image="/images/go.png"/> -> <input type="image" src="/images/go.png" class="button submit-button"/>
-  
+
 -->
 <def tag="submit" attrs="label, image">
   <input if="&image" type="image" src="&image" merge-attrs class="image-button submit-button"/>
@@ -274,15 +274,15 @@ The tag behaves as a regular HTML input if the type attribute is given:
 
 If no type attribute is given then the _context_ is used. For example if the context is a blog post:
 
-    <input:title/> -> 
+    <input:title/> ->
     <input id="blog_post[name]" class="string blog-post-name" type="text" value="My Blog Post" name="blog_post[name]"/>
 
-    <input:created_at/> -> 
+    <input:created_at/> ->
     <select id="blog_post_created_at_year" name="blog_post[created_at][year]">...</select>
     <select id="blog_post_created_at_month" name="blog_post[created_at][month]">...</select>
     <select id="blog_post_created_at_day" name="blog_post[created_at][day]">...</select>
 
-    <input:description/> -> 
+    <input:description/> ->
     <textarea class="text blog-post-description" id="blog_post[description]" name="blog_post[description]">...</textarea>
 
 If the context is a `belongs_to` association, the `<select-one>` tag is used.
@@ -292,7 +292,7 @@ If the context is a `has_many :through` association, the polymorphic `<collectio
 ### Attributes
 
  - no-edit: control what happens if `can_edit?` is false. Can be one of:
- 
+
    - view: render the current value using the `<view>` tag
    - disable: render the input as normal, but add HTML's `disabled` attribute
    - skip: render nothing at all
@@ -326,10 +326,10 @@ If the context is a `has_many :through` association, the polymorphic `<collectio
                   else
                     call_polymorphic_tag('input', attrs) or
                       (call_polymorphic_tag('input', HoboFields.to_class(this_type::COLUMN_TYPE), attrs) if defined?(this_type::COLUMN_TYPE)) or
-                      raise HoboError, ("No input tag for #{this_field}:#{this_type} (this=#{this.inspect})")
+                      raise Hobo::Error, ("No input tag for #{this_field}:#{this_type} (this=#{this.inspect})")
                   end
-      if this_parent.errors[this_field]
-        "<span class='field-with-errors'>#{the_input}</span>"
+      unless this_parent.errors[this_field].empty?
+        "<span class='field-with-errors'>#{the_input}</span>".html_safe
       else
         the_input
       end
@@ -350,79 +350,96 @@ edit collections a `Category` model in your application:
 <def tag="collection-input" for="ActiveRecord::Base"><select-many merge/></def>
 
 
-<!-- A `<textarea>` input.  Attributes are passed through to [text_area_tag](http://api.rubyonrails.org/classes/ActionView/Helpers/FormTagHelper.html#method-i-text_area_tag). -->
+<!-- A `<textarea>` input -->
 <def tag="input" for="text" attrs="name">
-  <%= text_area_tag(name, attributes["escape"]==false ? this : html_escape(this), attributes) %>
+  <%= text_area_tag(name, this, attributes) %>
 </def>
 
-
 <!-- A checkbox plus a hidden-field. The hidden field trick comes from Rails - it means that when the checkbox is not checked, the parameter name is still submitted, with a '0' value (the value is '1' when the checkbox is checked) -->
 <def tag="input" for="boolean" attrs="name">
   <%= unless attributes[:disabled]
         cb_tag = check_box_tag(name, '1', this, attributes)
         cb_hidden_tag = hidden_field_tag(name, '0', :id => nil)
-        HoboSupport::RAILS_AT_LEAST_23 ? cb_hidden_tag + cb_tag : cb_tag + cb_hidden_tag
+        cb_hidden_tag + cb_tag
       end %>
 </def>
-  
+
 <!-- A password input - `<input type='password'>` -->
 <def tag="input" for="password" attrs="name">
   <%= password_field_tag(name, this, attributes) %>
 </def>
 
 <!-- A date picker, using the `select_date` helper from Rails
-  
+
 ### Attributes
 
- - order: The order of the year, month and day menus. A comma separated string or an array. Default: "year, month, day"
- 
-Any other attributes are passed through to the `select_date` helper.
+ - all the options of select_date and date_select are passed to the select_date Rails
+ helper
+
+All the other attributes are passed to the `select_date` helper as the html-options hash.
 
 The menus default to the current date if the current value is nil.
- 
+
+Examples:
+
+   - override the input for date tag in a form
+   <my-special-date-view:>
+      <input start-year="&1940" order="day,month,year" />
+   </my-special-date-view:>
+
+   - override the tag application-wide
+   <extend tag='input' for='date'>
+     <old-input merge order="day,month,year" start-year="&1940" />
+   </extend>
+
   -->
-<def tag="input" for="date" attrs="order">
+<def tag="input" for="date" attrs="use-month-numbers, use-short-month, add-month-numbers, use-month-names, date-separator, start-year, end-year, discard-day, discard-month, discard-year, order, include-blank, default, disabled, prompt, prefix">
   <% order = order.nil? ? [:year, :month, :day] : comma_split(order).*.to_sym -%>
-  <%= select_date(this || current_time, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
+  <%= select_date(this || current_time,
+                  (all_attributes - attributes.keys).reverse_merge(:prefix => param_name_for_this).merge(:order => order),
+                  attributes - [:name]) %>
 </def>
 
 
-<!-- A date/time picker, using the `select_date` helper from Rails
-  
+<!-- A date/time picker, using the `select_time` helper from Rails
+
 ### Attributes
 
- - order: The order of the year, month and date menus. A comma separated string or an array. Default: "year, month,
-   day, hour, minute, second"
- 
-Any other attributes are passed through to the `select_date` helper.
- 
+ - include-seconds, time-separator, prompt and prefix are passed to the select_time helper as options
+
+All the other attributes are passed to the `select_time` helper as the html-options hash.
+
 The menus default to the current time if the current value is nil.
- 
+
   -->
-<def tag="input" for="time" attrs="order">
-  <% order = order.nil? ? [:year, :month, :day, :hour, :minute, :second] : comma_split(order).*.to_sym -%>
-  <%= select_date(this || current_time, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
+<def tag="input" for="time" attrs="include-seconds, time-separator, prompt, prefix">
+  <%= select_time( this || current_time,
+                   (all_attributes - attributes.keys).reverse_merge(:prefix => param_name_for_this),
+                   attributes - [:name] ) %>
 </def>
 
 
 <!-- A date/time picker, using the `select_datetime` helper from Rails
-  
+
 ### Attributes
 
  - order: The order of the year, month and date menus. A comma separated string or an array. Default: "year, month,
    day, hour, minute"
- 
-Any other attributes are passed through to the `select_datetime` helper.
- 
+ - date-separator, discard-type, prompt and prefix are passed to the select_date helper as options
+
+All the other attributes are passed to the `select_date` helper as the html-options hash.
+
 The menus default to the current time if the current value is nil.
 
   -->
-<def tag="input" for="datetime" attrs="order">
+<def tag="input" for="datetime" attrs="order, date-separator, discard-type, prompt, prefix">
   <% if ! order.nil?
-       order = comma_split(order).*.to_sym 
+       order = comma_split(order).*.to_sym
        attributes.merge!(:order => order)
      end -%>
-  <%= select_datetime(this || current_time, attributes.merge(:prefix => param_name_for_this)) %>
+  <%= select_datetime(this || current_time,
+                     (all_attributes - attributes.keys).reverse_merge(:prefix => param_name_for_this).merge(:order => order),
+                      attributes - [:name] ) %>
 </def>
 
 <!-- An `<input type='text'>` input. -->
@@ -446,7 +463,7 @@ The menus default to the current time if the current value is nil.
 </def>
 
 <!-- A `<select>` menu containing the values of an 'enum string'.
-  
+
 ### Attributes
 
  - `labels` - A hash that gives custom labels for the values of the enum.
@@ -454,9 +471,9 @@ The menus default to the current time if the current value is nil.
  - `titleize` - Set to false to have the value itself (rather than `value.titleize`) be the default label. Default: true
  - `first-option` - a string to be used for an extra option in the first position. E.g. "Please choose..."
  - `first-value` - the value to be used with the `first-option`. Typically not used, meaning the option has a blank value.
-  
+
    -->
-<def tag="input" for="HoboFields::EnumString" attrs="labels, titleize, first-option, first-value"><%
+<def tag="input" for="HoboFields::Types::EnumString" attrs="labels, titleize, first-option, first-value"><%
   labels ||= {}
   labels = HashWithIndifferentAccess.new(labels)
   titleize = true if titleize.nil?
@@ -479,19 +496,19 @@ The URL that the call is POSTed to is the `object_url` of `this`, plus the metho
 `<remote-method-button>` supports all of the standard ajax attributes (see the main taglib documention for Rapid
 Forms). If any ajax attributes are given, the button becomes an ajax button, if not, Rails' `button_to` is used, which behaves similarly to a standard link.
 
-### Attributes 
+### Attributes
 
  - method: the name of the web-method to call
- 
+
  - label: the label on the button
- 
+
  -->
-<def tag="remote-method-button" attrs="method, update, label, confirm, url"><%= 
-  ajax_attributes, html_attributes = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
+<def tag="remote-method-button" attrs="method, update, label, confirm, url"><%=
+  ajax_attributes, html_attributes = attributes.partition_hash(Hobo::Rapid::Helper::AJAX_ATTRS)
 
   url ||= object_url(this, method.to_s.gsub('-', '_'), :method => :post)
   raise ArgumentError, "no such web method '#{method}' on #{this.typed_id}" unless url
-  
+
   add_classes!(html_attributes, "button remote-method-button #{method}-button")
   label ||= method.titleize
   if update || !ajax_attributes.empty?
@@ -504,10 +521,10 @@ Forms). If any ajax attributes are given, the button becomes an ajax button, if
   end
 %></def>
 
-  
+
 <!-- Provides an ajax button to send a RESTful update or "PUT" to the server. i.e. to udate one or more fields of a
 record.
-  
+
 Note that unlike simliar tags, `<update-button>` does not support both ajax and non-ajax modes at this time. It only
 does ajax.
 
@@ -515,23 +532,23 @@ does ajax.
 
 ### Attributes
 
- - label: The label on the button. 
- 
+ - label: The label on the button.
+
  - fields: A hash with new field values pairs to update the resource with. The items in the hash will be converted to
    HTTP parameters.
- 
+
  - params: Another hash with additional HTTP parameters to include in the ajax request
- 
+
   -->
 <def tag="update-button" attrs="label, update, fields, params"><%=
-   raise HoboError.new("no update specified") unless update
+   raise Hobo::Error.new("no update specified") unless update
 
-   ajax_attributes, html_attributes = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
+   ajax_attributes, html_attributes = attributes.partition_hash(Hobo::Rapid::Helper::AJAX_ATTRS)
    params = (params || {}).merge(this.class.name.underscore => fields)
    ajax_attributes.reverse_merge!(:message => label, :params => params, :method => :put)
    func = ajax_updater(object_url(this), update, ajax_attributes)
    html_attributes.reverse_merge!(:type =>'button', :onclick => func, :value => label)
-   
+
    element :input, add_classes(html_attributes, "button update-button update-#{this.class.name.underscore}-button"), nil, true, true %>
 </def>
 
@@ -557,18 +574,18 @@ All the standard ajax attributes *except the callbacks* are supported (see the m
 ### Attributes
 
  - label: The label for the button. Default: "Remove"
- 
+
  - in-place: delete in place (ajax)? Default: true, or false if the record to be deleted is the same as the top level
    context of the page
 
  - image: URL of an image for the button. Changes the rendered tag from `<input type='button'>` to `<input type='image'
    src='...'>`
- 
+
  - fade: Perform the fade effect (true/false)? Default: true
- 
+
   -->
 <def tag="delete-button" attrs="label, update, in-place, image, confirm, fade, subsite"><%=
-  in_place = false if in_place.nil? && this == @this && request.method == :get
+  in_place = false if in_place.nil? && this == @this && request.method.downcase == "get"
   url = object_url(this, :method => :delete, :subsite => subsite)
   if (Dryml.last_if = url && can_delete?)
     attributes = attributes.merge(if image
@@ -576,9 +593,9 @@ All the standard ajax attributes *except the callbacks* are supported (see the m
                                   else
                                     { :type => "button" }
                                   end)
-    label ||= ht("#{this.class.name.tableize}.actions.remove", :default=>"Remove") 
-    confirm = ht("hobo.messages.confirm", :default=>"Are you sure?") if confirm.nil?
-    
+    label ||= t("hobo.actions.remove", :default=>"Remove")
+    confirm = t("hobo.messages.confirm", :default=>"Are you sure?") if confirm.nil?
+
     add_classes!(attributes,
                  image ? "image-button" : "button",
                  "delete-button delete-#{this.class.name.underscore.dasherize}-button")
@@ -601,7 +618,7 @@ All the standard ajax attributes *except the callbacks* are supported (see the m
 
 
 <!-- Provides an ajax create button that will send a RESTful "POST" to the server to create a new resource.
-  
+
 All of the standard ajax attributes are supported (see the main taglib documention for Rapid Forms).
 
 ### Attributes
@@ -610,7 +627,7 @@ All of the standard ajax attributes are supported (see the main taglib documenti
 
  -->
 <def tag="create-button" attrs="model, update, label, fields, message"><%=
-  raise HoboError.new("no update specified") unless update
+  raise Hobo::Error.new("no update specified") unless update
 
   fields ||= {}
   class_or_assoc = if model
@@ -619,12 +636,12 @@ All of the standard ajax attributes are supported (see the main taglib documenti
                      fields[this_field_reflection.primary_key_name] = this.proxy_owner.id
                      this
                    else
-                     raise HoboError.new("invalid context for <create-button>")
+                     raise Hobo::Error.new("invalid context for <create-button>")
                    end
   new = class_or_assoc.new(fields)
   new.set_creator(current_user)
   if can_create?(new)
-    label ||= ht("#{new.class.name.tableize}.actions.new", :default=>"New #{new.class.name.titleize}")  
+    label ||= ht("#{new.class.to_s.underscore}.actions.new", :default=>"New #{new.class.model_name.human}")
     ajax_attributes = { :message => message }
     class_name = new.class.name.underscore
     ajax_attributes[:params] = { class_name => fields } unless fields.empty?
@@ -646,27 +663,27 @@ This is the default input that Rapid uses for `belongs_to` associations. The men
  - `options` - an array of records to include in the menu. Defaults to the all the records in the target table that match any `:conditions` declared on the `belongs_to` (subject to `limit`)
  - `limit` - if `options` is not specified, this limits the number of records.  Default: 100
  - `text_method` - The method to call on each record to get the text for the option.  Multiple methods are supported ie "institution.name"
- 
+
 ### See Also
 
 For situations where there are too many target records to practically include in a menu, `<name-one>` provides an autocompleter which would be more suitable.
 
   -->
 <def tag="select-one" attrs="include-none, blank-message, options, sort, limit, text-method"><%
-  raise Hobo::PermissionDeniedError.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit? 
-
-  blank_message ||= ht("#{this_type.name.tableize}.message.none", :default=>"(No #{this_type.view_hints.model_name})")
+  raise Hobo::PermissionDeniedError.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit?
+  blank_message ||= ht("#{this_type.name.underscore}.messages.none", :default=>"No #{this_type.model_name.human} available.")
   limit ||= 100
-   
+
   options ||= begin
-    conditions = ActiveRecord::Associations::BelongsToAssociation.new(this_parent, this_field_reflection).conditions
-    this_field_reflection.klass.all(:conditions => conditions, :limit => limit).select {|x| can_view?(x)}
+    conditions = ActiveRecord::Associations::BelongsToAssociation.new(this_parent, this_field_reflection).send(:conditions)
+    order = this_field_reflection.klass.default_order
+    this_field_reflection.klass.all(:conditions => conditions, :limit => limit, :order => order).select {|x| can_view?(x)}
   end
 
   if text_method.nil?
     select_options = options.map { |x| [x.to_s, x.id] }
   else
-    select_options = options.map do |x| 
+    select_options = options.map do |x|
       [ text_method.split(".").inject(x) { |v, method| v.send(method) },
            x.id ]
     end
@@ -747,7 +764,7 @@ If you wish to set `min-chars` to 0, you will require this [patch to controls.js
   min_chars ||= 1
   value = name(:no_wrapper => true, :if_present => true)
   -%>
-  <input type="text" name="#{param_name_for_this}" 
+  <input type="text" name="#{param_name_for_this}"
          class="autocompleter #{type_and_field._?.dasherize} #{css_data :complete_on, typed_id(complete_target), completer} #{css_data :min_chars, min_chars} #{'nil-value' if value==''}"
          value="#{value=='' ? nil_value : value}"
          merge-attrs/>
@@ -758,15 +775,15 @@ If you wish to set `min-chars` to 0, you will require this [patch to controls.js
 <!-- nodoc. -->
 <def tag="sti-type-input">
   <select name="#{param_name_for(form_field_path + ['type'])}">
-    <%= options_for_select(this.class.send(:subclasses).map{|x| [x.name.titleize, x.name]}, this.class.name) %>
+    <%= options_for_select(this.class.send(:descendants).map{|x| [x.name.titleize, x.name]}, this.class.name) %>
   </select>
 </def>
 
 
 <!-- A `<select>` menu input. This tag differes from `<select-menu>` only in that it adds the correct `name` attribute for the current field, and `selected` default to `this`.
-  
+
 ### Attributes
- 
+
  - `options` - an array of options suitable to be passed to the Rails `options_for_select` helper.
  - `selected` - the value (from the `options` array) that should be initially selected. Defaults to `this`
  - `first-option` - a string to be used for an extra option in the first position. E.g. "Please choose..."
@@ -778,14 +795,23 @@ If you wish to set `min-chars` to 0, you will require this [patch to controls.js
 </def>
 
 
-<!-- Renders a readable list of error messages following a form submission. Expects the errors to be in `this.errors`. Renders nothing if there are no errors.
+<!-- Renders a localized list of error messages following a form submission. Expects the errors to be in `this.errors`. Renders nothing if there are no errors.
   -->
 <def tag="error-messages">
-  <section class="error-messages" merge-attrs if="&this.errors.length > 0">
-      <h2 param="heading"><ht key="hobo.messages.error_correct_following">To proceed please correct the following:</ht></h2>
+  <section class="error-messages" merge-attrs if="&this.errors.size > 0">
+    <h2 param="heading">
+      <t key="activerecord.errors.template.header" model="&this.class.model_name.human" count="&this.errors.size">
+        <%= model = this.class.model_name.human
+            count = this.errors.size
+        count==1 ? "1 error prohibited this #{model} from being saved" :
+                   "#{count} errors prohibited this #{model} from being saved"
+        %>
+      </t>
+    </h2>
+    <t key="activerecord.errors.template.body">There were problems with the following fields:</t>
     <ul param>
-      <% this.errors.each do |attr, message|; next if message == "..." -%>
-        <li param><%= this.class.view_hints.field_name(attr) unless attr.to_s == 'base' %> <%= message %></li>
+      <% this.errors.to_a.each do |message| -%>
+      <li param><%= message %></li>
       <% end -%>
     </ul>
   </section>
@@ -794,16 +820,16 @@ If you wish to set `min-chars` to 0, you will require this [patch to controls.js
 
 <!--
 An input for `has_many :through` associations that lets the user chose the items from a `<select>` menu.
-  
-To use this tag, the model of the items the user is chosing *must* have unique names, and the 
+
+To use this tag, the model of the items the user is chosing *must* have unique names, and the
 -->
 <def tag="select-many" attrs="options, targets, remove-label, prompt, disabled, name"><%
-  prompt ||= ht("#{this.name.tableize}.message.none", :default=>"Add #{this.view_hints.model_name}")
-  options ||= this_field_reflection.klass.all(:conditions =>this.conditions).select {|x| can_view?(x)}
+  prompt ||= ht("#{this_field_reflection.klass.to_s.underscore}.form.select_many.prompt", :default=>"Add #{this_field.titleize.singularize}")
+  options ||= this_field_reflection.klass.all(:conditions =>this.send(:conditions)).select {|x| can_view?(x)}
   name ||= param_name_for_this
-                
+
   values = this
-  remove_label ||= ht("#{this.name.tableize}.actions.remove", :default=>'Remove')
+  remove_label ||= t("hobo.actions.remove", :default=>'Remove')
   -%>
   <div class="input select-many" merge-attrs>
     <div style="display:none" class="item-proto">
@@ -863,7 +889,7 @@ Use the `uri` option to specify a redirect location:
       ...
     </form>
 -->
-<def tag="after-submit" attrs="uri, stay-here, go-back"><% 
+<def tag="after-submit" attrs="uri, stay-here, go-back"><%
   uri = "stay-here" if stay_here
   uri = session[:previous_uri] if go_back
   -%>
@@ -872,16 +898,22 @@ Use the `uri` option to specify a redirect location:
 
 
 <!-- A simple wrapper around the `<select>` tag and `options_for_select` helper
-  
+
   ### Attributes
 
  - `options` - an array of options suitable to be passed to the Rails `options_for_select` helper.
  - `selected` - the value (from the `options` array) that should be initially selected. Defaults to `this`
  - `first-option` - a string to be used for an extra option in the first position. E.g. "Please choose..."
  - `first-value` - the value to be used with the `first-option`. Typically not used, meaning the option has a blank value.
-
+ - `key` - the key used to lookup in the locale file or 'default' by default. If you pass it hobo will lookup in the namespace "tags.select_menu.#{key}" in order to find `options`, `first_option` and `first_value`. The passed attributes are used as a default in case the lookups fail. (see the documentation of filter-menu tag for a similar example).
  -->
-<def tag="select-menu" attrs="options, selected, first-option, first-value">
+<def tag="select-menu" attrs="options, selected, first-option, first-value, key">
+<% key ||= 'default'
+   %w[options first_option first_value].each do |a|
+     str = t("tags.select_menu.#{key}.#{a}", :default=>'')
+     eval "#{a} = str unless str.blank?"
+   end
+-%>
   <select merge-attrs param="default">
     <% selected=this if selected.nil? %>
     <option value="#{first_value}" unless="&first_option.nil?"><first-option/></option>
@@ -898,16 +930,16 @@ Use the `uri` option to specify a redirect location:
  - `disabled` - if true, sets the disabled flag on all check boxes.
 
   -->
-<def tag="check-many" attrs="options, disabled"><% 
+<def tag="check-many" attrs="options, disabled"><%
   collection = this
   param_name = param_name_for_this
   options ||= begin
-    conditions = ActiveRecord::Associations::BelongsToAssociation.new(this_parent, this_field_reflection).conditions
+    conditions = ActiveRecord::Associations::BelongsToAssociation.new(this_parent, this_field_reflection).send(:conditions)
     this_field_reflection.klass.all(:conditions => conditions, :limit => 100).select {|x| can_view?(x)}
   end
   -%>
   <ul class="check-many" param="default" merge-attrs>
-    <input type="hidden" name="#{param_name}[]" value=""/><% # ensure all items are removed when nothing checked 
+    <input type="hidden" name="#{param_name}[]" value=""/><% # ensure all items are removed when nothing checked
     %>
     <li repeat="&options" param>
       <input type="checkbox" name="#{param_name}[]" value="@#{this.id}" checked="&this.in?(collection)" disabled="&disabled"/>
@@ -924,17 +956,17 @@ Use the `uri` option to specify a redirect location:
 
 
 <!-- Creates a sub-section of the form which the user can repeat using (+) and (-) buttons, in order to allow an entire `has_many` collection to be created/edited in a single form.
-  
+
 This tag is very different from tags like `<select-many>` and `<check-many>` in that:
 
  - Those tags are used to *choose existing records* to include in the association, while `<input-many>` is used to actually create or edit the records in the association.
- 
+
 ### Example
 
 Say you are creating a new `Category` in your online shop, and you want to create some initial products *in the same form*, you can add the following to your form:
 
     <input-many:products><field-list fields="name, price"/></input-many>
-    
+
 The body of the tag will be repeated for each of the current records in the collection, or will just appear once (with blank fields) if the colleciton is empty.
 
 ### Attributes
@@ -942,13 +974,13 @@ The body of the tag will be repeated for each of the current records in the coll
  - fields:  If you do not specify any content for the input-many, a `<field-list>` is rendered.   This attribute is passed through to the `<field-list>`
 
  - skip:  Passed through to the `<field-list>`.  If not specified, it defaults to the parent association.
-  
+
 ### Example
 
 Say you are creating a new `Category` in your online shop, and you want to create some initial products *in the same form*, you can add the following to your form:
 
     <hjq-input-many:products fields="name, price" />
-    
+
 You'll often want to provide the `item` parameter:
 
     <hjq-input-many:products><item:><field-list fields="name, price" /></item:></hjq-input-many>
@@ -1021,7 +1053,7 @@ end
       <input type="hidden" class="empty-input" id="#{underize param_name_for_this}" name="#{param_name_for_this}" value="" disabled="&(!this.empty? || minimum>0)" />
       <fake-field-context fake-field="-1" context="&template">
         <div param="empty-message">
-          <ht key="#{this.class.name.tableize}.collection.empty_message">          
+          <ht key="#{this.class.to_s.underscore}.collection.empty_message">
             No <%= this.class.name.titleize.downcase.pluralize %>.
           </ht>
         </div>
@@ -1029,7 +1061,7 @@ end
           <button param="remove-item" class="hidden" id="#{underize param_name_for_this}_remove">-</button>
           <button param="add-item" id="#{underize param_name_for_this}_add">+</button>
         </div>
-      </fake-field-context>      
+      </fake-field-context>
     </li>
     <fake-field-context fake-field="0" context="&template">
       <li class="input-many-li" if="&(this_parent.empty? && minimum>0)" id="#{underize param_name_for_this}">
@@ -1041,7 +1073,7 @@ end
           <button param="add-item" id="#{underize param_name_for_this}_add">+</button>
         </div>
       </li>
-    </fake-field-context>       
+    </fake-field-context>
     <li repeat class="input-many-li #{'record-with-errors' unless this.errors.empty?}" id="#{underize param_name_for_this}">
       <error-messages without-heading class="sub-record"/>
       <hidden-id-field/>
@@ -1106,8 +1138,8 @@ The specified sort order may be maintained even without `acts_as_list`.  The ite
 <!-- Renders the common "or (Cancel)" for a form. Attributes are merged into the link (`<a>Cancel</a>`), making it easy to customise the destination of the cancel link. By default it will link to `this` or `this.class`.
   -->
 <def tag="or-cancel">
-  <if test="&linkable?"><ht key="hobo.support.or">or</ht> <a merge-attrs><ht key="hobo.actions.cancel">Cancel</ht></a></if>
+  <if test="&linkable?"><t key="hobo.support.or">or</t> <a merge-attrs><t key="hobo.actions.cancel">Cancel</t></a></if>
   <else>
-    <if test="&linkable?(this.class)"><ht key="hobo.support.or">or</ht> <a to="&this.class" merge-attrs><ht key="hobo.actions.cancel">Cancel</ht></a></if>
+    <if test="&linkable?(this.class)"><t key="hobo.support.or">or</t> <a to="&this.class" merge-attrs><t key="hobo.actions.cancel">Cancel</t></a></if>
   </else>
 </def>