hobo 1.3.0.RC4 → 1.3.0.pre10

data/lib/hobo/rapid/helper.rb

@@ -102,15 +102,11 @@ module Hobo
         s.gsub(' ', ' ')
       end
 
-      # returns the number of items in the collection.  See LH #889
-      def collection_count
-        this.try.to_int || this.try.total_entries || (this.try.loaded? && this.try.length) || this.try.count || this.try.length
-      end
+
 
 
       def in_place_editor(attributes, this=nil)
-        blank_message = attributes.delete(:blank_message) ||
-                        t('hobo.in_place_editor.click_to_edit', :default => '(click to edit)')
+        blank_message = attributes.delete(:blank_message) || "(click to edit)"
 
         attributes = add_classes(attributes, "in-place-edit", model_id_class(this_parent, this_field))
         attributes.update(:hobo_blank_message => blank_message,
@@ -120,16 +116,15 @@ module Hobo
         edit_text = this._?.to_s
         attributes.update(:hobo_edit_text => edit_text) unless edit_text.nil?
 
-        if update = attributes.delete(:update)
-          attributes = add_classes(attributes, update_elements_class(update))
-        end
+        update = attributes.delete(:update)
+        attributes[:hobo_update] = update if update
 
         view(attributes)
       end
 
 
 
-      AJAX_CALLBACKS = [ :success, :failure, :complete ]
+      AJAX_CALLBACKS = [ :before, :success, :failure, :complete ]
 
       AJAX_ATTRS = AJAX_CALLBACKS + [ :update, :type, :method,
                                       :script, :form, :params, :confirm, :message,

data/lib/hobo/rapid/taglibs/rapid.dryml

@@ -1,6 +1,6 @@
 <!--
 
-The Rapid tag library makes web development go fast. The Rapid tag library is your friend.
+The Rapid tag library makes web development go fast. The Rapid tag library is your friend.  
 
 (This taglib defines no tags - it just includes all the other taglibs. Move along. Nothing to see here.)
 

data/lib/hobo/rapid/taglibs/rapid_core.dryml

@@ -93,15 +93,7 @@ This will use `<input/>` as the tag in each table cell instead of `<view/>`
         <table fields="name, created_at, description">
           <controls:/>
         </table>
-
-    The controls can be further customised using the "edit-link" and "delete-button" parameters:
-
-        <table fields="name, created_at, description">
-          <controls:/>
-          <delete-button: label="Nuke Me"/>
-        </table>
-
-    or by providing completely new content for the control column:
+    The controls can be further customised using the "edit-link" and "delete-button" parameters or by providing completely new content for the control column, e.g.
 
         <table fields="name, created_at, description">
           <controls:>my controls!</controls:>
@@ -132,9 +124,7 @@ This will use `<input/>` as the tag in each table cell instead of `<view/>`
                 <td param="#{scope.field_name.to_s.sub('?', '').gsub('.', '-')}-view"><call-tag tag="&field_tag"/></td>
               </with-fields>
               <td class="controls" param="controls" if="&all_parameters[:controls]">
-                <a param="edit-link" action="edit" if="&can_edit?">
-                  <t key="hobo.actions.edit_control">Edit</t>
-                </a>
+                <a param="edit-link" action="edit" if="&can_edit?"><t key="hobo.action.edit">Edit</t></a>
                 <delete-button param/>
               </td>
             </if>
@@ -167,35 +157,24 @@ Provides a short hand way of displaying images in public/images
 
 
 <!-- Renders some standard JavaScript code that various features of the Rapid library rely on. This tag would typicallu be called from your `<page>` tag. The default Rapid pages include this already. -->
-<def tag="hobo-rapid-javascripts">
-  <script type="text/javascript" param="default"><%=
-     res = 'var hoboParts = {};'
-     # FIXME: This should interrogate the model-router - not the models
-     unless Hobo::Model.all_models.empty?
-       # Tell JS code how to pluralize names, unless they follow the simple rule
-       names = Hobo::Model.all_models.map do |m|
-                 m = m.name.underscore
-                 "#{m}: '#{m.pluralize}'" unless m.pluralize == m + 's'
-               end.compact
-       res << "var pluralisations = {#{names * ', '}}; "
-     end
-     base = [base_url, subsite].compact.join("/")
-     res << "urlBase = '#{base}'; hoboPagePath = '#{request.fullpath}'"
-     if protect_against_forgery?
-       res << "; formAuthToken = { name: '#{request_forgery_protection_token}', value: '#{form_authenticity_token}' }"
-     end
-     res
-  %></script>
-</def>
-
-
-<def tag="part-contexts-javascripts">
-  <% unless (storage = part_contexts_storage).blank? %>
-    <script type="text/javascript"><%=
-      storage
-    %></script>
-  <% end %>
-</def>
+<def tag="hobo-rapid-javascripts"><%=
+   res = 'var hoboParts = {};'
+   # FIXME: This should interrogate the model-router - not the models
+   unless Hobo::Model.all_models.empty?
+     # Tell JS code how to pluralize names, unless they follow the simple rule
+     names = Hobo::Model.all_models.map do |m|
+                                          m = m.name.underscore
+                                          "#{m}: '#{m.pluralize}'" unless m.pluralize == m + 's'
+                                        end.compact
+     res << "var pluralisations = {#{names * ', '}}; "
+   end
+   base = [base_url, subsite].compact.join("/")
+   res << "urlBase = '#{base}'; hoboPagePath = '#{view_name}'"
+   if protect_against_forgery?
+     res << "; formAuthToken = { name: '#{request_forgery_protection_token}', value: '#{form_authenticity_token}' }"
+   end
+   res
+%></def>
 
 <!-- Renders the name of the current context using a variety of methods.
 
@@ -257,8 +236,6 @@ Provides a short hand way of displaying images in public/images
 
 <!-- Renders a human readable name of a collection
 
-Use this tag for en locale only. Use human-collection-name for i18n.
-
 ### Details
 
  - Uses `this.origin_attribute` as the name.
@@ -389,7 +366,7 @@ Or a new page if the context is a class:
 
       content = name if content.blank?
 
-      href = object_url(target, action, (params || {}).merge(:subsite => subsite)) unless (action.nil? && target.try.new_record?)
+      href = object_url(target, action, (params || {}).merge(:subsite => subsite))
       if href.nil?
         # This target is registered with Hobo::Routes as not linkable
         content
@@ -440,7 +417,7 @@ Assuming the context is a blog post...
         <view:created_at no-wrapper/> -> June 09, 2008 15:36
 -->
 <def tag="view" attrs="inline, block, if-blank, no-wrapper, truncate"><%=
-  raise Hobo::PermissionDeniedError, "view of non-viewable field '#{this_field}' of #{this_parent.typed_id rescue this_parent}" unless
+  raise Hobo::Error, "view of non-viewable field '#{this_field}' of #{this_parent.typed_id rescue this_parent}" unless
     can_view?
 
   res = if this.nil? && if_blank.nil?
@@ -466,7 +443,7 @@ Assuming the context is a blog post...
 
             truncate = 30 if truncate == true
             the_view = self.truncate(the_view, :length => truncate.to_i) if truncate
-            the_view = the_view.html_safe? ? the_view.strip.html_safe : the_view.strip
+            the_view = the_view.strip
 
             if no_wrapper
               the_view
@@ -493,30 +470,28 @@ Assuming the context is a blog post...
 <def tag="links-for-collection"><%= this.empty? ? "(none)" : context_map { a }.safe_join(", ") %></def>
 
 <!-- Renders `this` in localized :default format. `format` can be a symbol representing a locale key or a standard format string (see strftime) -->
-<def tag="view" for="date" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>
+<def tag="view" for="Date" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>
 
-<!-- Renders `this` in localized :default format. `format` can be a symbol representing a Time::DATE_FORMATS or a standard format string (see strftime) -->
-  <def tag="view" for="time" attrs="format"><%= this && (format||= :time) && (format.is_a?(Symbol) ? this.to_s(format) : this.strftime(format) ) %></def>
+<!-- Renders `this` in localized :default format. `format` can be a symbol representing a locale key or a standard format string (see strftime) -->
+  <def tag="view" for="Time" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>
 
 <!-- Renders `this` in localized :default format. `format` can be a symbol representing a locale key or a standard format string (see strftime) -->
-<def tag="view" for="datetime" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>
+<def tag="view" for="ActiveSupport::TimeWithZone" attrs="format"><%= this && (format||= :default) && I18n.backend.localize(I18n.locale, this, format) %></def>
 
 <!-- Renders localized `number_with_delimiter this`, or `format % this` if the `format` attribute is given -->
 <def tag="view" for="Numeric" attrs="format"><%= format ? format % this : number_with_delimiter(this) %></def>
 
-<!-- If `this.html_safe?`, returns this unchanged.  Otherwise renders `this` with HTML escaping and newlines replaced with `<br>` tags -->
+<!-- Renders `this` with HTML escaping and newlines replaced with `<br>` tags -->
 <def tag="view" for="string"><%=
-  if this.html_safe?
-    this
-  elsif !(this.class == String) && this.respond_to?(:to_html) # workaround for Maruku which adds String#to_html : (
+  if !(this.class == String) && this.respond_to?(:to_html) # workaround for Maruku which adds String#to_html : (
     this.to_html(scope.xmldoctype)
   else
-    h(this).gsub("\n", "<br#{scope.xmldoctype ? ' /' : ''}>").html_safe
+    h(this).gsub("\n", "<br#{scope.xmldoctype ? ' /' : ''}>")
   end
 %></def>
 
 <!-- Renders 'Yes' for true and 'No' for false -->
-<def tag="view" for="boolean"><%= this ? t('hobo.boolean_yes', :default => 'Yes') : t('hobo.boolean_no', :default => 'No') %></def>
+<def tag="view" for="boolean"><%= this ? I18n.t('hobo.boolean_yes', :default => 'Yes') : I18n.t('hobo.boolean_no', :default => 'No') %></def>
 
 <!-- Renders a link (`<a>`) to `this` -->
 <def tag="view" for="ActiveRecord::Base"><a merge-attrs/></def>
@@ -587,7 +562,7 @@ You can pass a summary attribute, which will generate a complete localized sente
   raise Exception.new("asked for count of a string") if this.is_a?(String)
   Rails.logger.warn('The "prefix" attribute is deprecated: please, use a locale string') unless prefix.blank?
 
-  c = collection_count
+  c = this.try.to_int || this.try.total_entries || (this.try.loaded? && this.try.length) || this.try.count || this.try.length
 
   # generated label will be pluralized
   label ||= case
@@ -614,7 +589,7 @@ You can pass a summary attribute, which will generate a complete localized sente
     else
       key = summary.kind_of?(String) ? summary : "default"
       default = c == 1 ? "There is 1 #{label}" : "There are #{c} #{label}"
-      t "tags.count.#{key}", {:count=>c, :label=>label, :default=>default}.merge(attributes)
+      I18n.t "tags.count.#{key}", {:count=>c, :label=>label, :default=>default}.merge(attributes)
     end
   end
 %></span></def>
@@ -669,11 +644,6 @@ that you add the keys in the correct namespaces.
 
  - capitalize: the first letter of the resulting sentence will be capitalized
 
-
-### Additional Notes
-
-The "titleize" attribute is deprecated: use "capitalize" instead.
-
 -->
 <def tag="you" attrs="titleize, capitalize">
   <% Rails.logger.warn "'titleize' is a deprecated attribute of the 'you' tag. Please, use 'capitalize' instead." -%>
@@ -684,13 +654,13 @@ The "titleize" attribute is deprecated: use "capitalize" instead.
          when attributes[:do] then 'do'
          end -%>
   <if test="&this == current_user">
-    <%= s = t("tags.you.current_user.#{k || attributes.keys.first || 'default'}",:default=>"you #{k}")
+    <%= s = I18n.t("tags.you.current_user.#{k || attributes.keys.first || 'default'}",:default=>"you #{k}")
        (titleize||capitalize) ? s.sub(/^./){|c| c.upcase} : s %>
   </if>
   <else>
     <do param="default">
-      <%= s = t("tags.you.other_user.#{k || attributes.keys.first || 'default'}", :name=>name(:no_wrapper => true),
-          :default=>"#{name(:no_wrapper => true)} #{'has' if attributes[:have]}#{'is' if attributes[:are]}#{'does' if attributes[:do]}")
+      <%= s = I18n.t("tags.you.other_user.#{k || attributes.keys.first || 'default'}", :name=>this.name,
+          :default=>"#{this.name} #{'has' if attributes[:have]}#{'is' if attributes[:are]}#{'does' if attributes[:do]}")
           (titleize||capitalize) ? s.sub(/^./){|c| c.upcase} : s %>
     </do>
   </else>
@@ -758,17 +728,17 @@ Notes
    attrs = {}
    attributes.each_pair{|k,v| attrs[k.to_sym] = v}
    d = "#{your_default} #{all_parameters.default}"
-   options = {:default=>[d], :count=>(attrs[:count]||1), :name=>name(:no_wrapper => true)}
+   options = {:default=>[d], :count=>(attrs[:count]||1), :name=>this.name}
    your_key = key.split('.').last
    unless key.eql?(your_key) || attrs.has_key?(your_key.to_sym)
-     options[your_key.to_sym] = t(key, :count=>options[:count], :default=>your_key.titleize)
+     options[your_key.to_sym] = I18n.t(key, :count=>options[:count], :default=>your_key.titleize)
    end
    s = if this == current_user
          options[:default].unshift :"tags.your.default.current_user"
-         t("tags.your.#{your_key}.current_user", options.merge(attrs))
+         I18n.t("tags.your.#{your_key}.current_user", options.merge(attrs))
        else
          options[:default].unshift :"tags.your.default.other_user"
-         t("tags.your.#{your_key}.other_user", options.merge(attrs))
+         I18n.t("tags.your.#{your_key}.other_user", options.merge(attrs))
        end
    capitalize ? s.sub(/^./){|c| c.upcase} : s
 %></def>
@@ -795,9 +765,9 @@ Notes
 
 <!-- Development mode only - a menu to change the `current_user` -->
 <def tag="dev-user-changer">
-  <set user="&Hobo::Model::UserBase.default_user_model"/>
+  <set user="&Hobo::Model::User.default_user_model"/>
   <select-menu if="&user && Rails.env.development?"
-               first-option="#{t('hobo.dev_user_changer.guest', {:default=>'Guest'})}" options="&user.all(:limit => 30).*.login"
+               first-option="#{I18n.t('hobo.dev_user_changer.guest', {:default=>'Guest'})}" options="&user.all(:limit => 30).*.login"
                onchange="location.href = '#{dev_support_path :action=>:set_current_user}?login=' + encodeURIComponent(this.options[this.selectedIndex].value)"
                selected="#{current_user.login}"
                class="dev-user-changer"

data/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/lib/hobo/rapid/taglibs/rapid_editing.dryml

@@ -81,45 +81,25 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
 
 ### Attributes
 
-  - `include-none` - whether to include a 'none' option (i.e. set the foreign key to null).   If this value is not supplied, the default is "true" if the current value is nil; otherwise the default is "false".  One implication of this is that the default may change when the form is re-rendered due to a validation failure.  Setting this value explicitly is recommended.
-  - `blank-message` - the message for the 'none' option. Defaults to "(No `<model-name>`)", e.g. "(No Product)"
-  - `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`)
-  - `sort` - whether to sort the array of options. Defaults to no sorting.
-  - `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"
-  - `update` - one or more DOM ID's (comma separated string or an array) to be updated as part of the ajax call.
+ - 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.
 
    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, options, sort, limit, text-method, update"><%
+<def tag="select-one-editor" attrs="include-none, blank-message, sort, update, options"><%
   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})")
-  limit ||= 100
-
-  if options.blank? || !options.first.respond_to?(:first)
-    options ||= begin
-      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
-
-    id_method = this_field_reflection.options[:primary_key] || this_field_reflection.klass.primary_key
-    if text_method.nil?
-      select_options = options.map { |x| [name(:with => x, :no_wrapper => true), x.send(id_method)] }
-    else
-      select_options = options.map do |x|
-        [ text_method.split(".").inject(x) { |v, method| v.send(method) },
-             x.send(id_method) ]
-      end
-    end
-  else
-    # handle the old style, where options could be passed an options_for_select style array
-    select_options = options
-  end
-  select_options = select_options.sort if sort
-  select_options.insert(0, [blank_message, ""]) if include_none || (this.nil? && include_none != false)
-
+  blank_message ||= "(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
+   options.insert(0, [blank_message, ""]) if this.nil? || include_none
    f = ajax_updater(object_url(this_parent, :method => :put),
                     update,
                     :method => "put",
@@ -128,7 +108,7 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
                       } })
     %>
   <select onchange="#{f}" merge-attrs>
-     <%= options_for_select(select_options, this ? this.send(id_method) : "") %>
+     <%= options_for_select(options, this ? this.id : "") %>
   </select>
 </def>
 
@@ -236,7 +216,7 @@ This tag does not sanitize HTML; this is provided by HtmlString before saving to
   -->
 <def tag="integer-select-editor" attrs="options, min, max, update, nil-option, message">
  <% options ||= (min.to_i..max.to_i).to_a %>
- <select class="integer editor #{update_elements_class(update)} #{model_id_class(this_parent, this_field)}"
+ <select class="integer editor #{'update:' + comma_split(update).join(':') unless update.blank?} #{model_id_class(this_parent, this_field)}"
           merge-attrs="&message ? attributes.merge(:hobo_message => message) : attributes">
    <if test="&this.nil?"><option value=""><%= nil_option || "Choose a value" %></option></if>
    <%= options_for_select(options.*.to_s, this.to_s) %>

data/lib/hobo/rapid/taglibs/rapid_forms.dryml

@@ -32,6 +32,8 @@ Several of the tags in this taglib support the following set of ajax attributes:
 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
@@ -221,7 +223,7 @@ The standard form tag does not have any parameters, nor does it have any default
       page_path = if (request.post? || request.put?) && params[:page_path]
                     params[:page_path]
                   else
-                    request.fullpath
+                    view_name.sub(Dryml::EMPTY_PAGE, params[:action] || '')
                   end
       page_path_hidden = hidden_field_tag("page_path", page_path)
     end
@@ -371,51 +373,34 @@ edit collections a `Category` model in your application:
 
 ### Attributes
 
- - all the options of select_date and date_select are passed to the select_date Rails
- helper
+ - order: The order of the year, month and day menus. A comma separated string or an array. Default: "year, month, day"
 
-All the other attributes are passed to the `select_date` helper as the html-options hash.
+Any other attributes are passed through to the `select_date` helper.
 
 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="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">
+<def tag="input" for="date" attrs="order">
   <% order = order.nil? ? [:year, :month, :day] : comma_split(order).*.to_sym -%>
-  <%= select_date(this || current_time,
-                  (all_attributes - attributes.keys).reverse_merge(:prefix => param_name_for_this).merge(:order => order),
-                  attributes - [:name]) %>
+  <%= select_date(this || current_time, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
 </def>
 
 
-<!-- A date/time picker, using the `select_time` helper from Rails
+<!-- A date/time picker, using the `select_date` helper from Rails
 
 ### Attributes
 
- - include-seconds, time-separator, prompt and prefix are passed to the select_time helper as options
+ - order: The order of the year, month and date menus. A comma separated string or an array. Default: "year, month,
+   day, hour, minute, second"
 
-All the other attributes are passed to the `select_time` helper as the html-options hash.
+Any other attributes are passed through to the `select_date` helper.
 
 The menus default to the current time if the current value is nil.
 
   -->
-<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 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>
 
 
@@ -425,21 +410,18 @@ The menus default to the current time if the current value is nil.
 
  - order: The order of the year, month and date menus. A comma separated string or an array. Default: "year, month,
    day, hour, minute"
- - 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.
+Any other attributes are passed through to the `select_datetime` helper.
 
 The menus default to the current time if the current value is nil.
 
   -->
-<def tag="input" for="datetime" attrs="order, date-separator, discard-type, prompt, prefix">
+<def tag="input" for="datetime" attrs="order">
   <% if ! order.nil?
        order = comma_split(order).*.to_sym
        attributes.merge!(:order => order)
      end -%>
-  <%= select_datetime(this || current_time,
-                     (all_attributes - attributes.keys).reverse_merge(:prefix => param_name_for_this).merge(:order => order),
-                      attributes - [:name] ) %>
+  <%= select_datetime(this || current_time, attributes.merge(:prefix => param_name_for_this)) %>
 </def>
 
 <!-- An `<input type='text'>` input. -->
@@ -585,7 +567,7 @@ All the standard ajax attributes *except the callbacks* are supported (see the m
 
   -->
 <def tag="delete-button" attrs="label, update, in-place, image, confirm, fade, subsite"><%=
-  in_place = false if in_place.nil? && this == @this && request.method.downcase == "get"
+  in_place = false if in_place.nil? && this == @this && request.method == :get
   url = object_url(this, :method => :delete, :subsite => subsite)
   if (Dryml.last_if = url && can_delete?)
     attributes = attributes.merge(if image
@@ -593,8 +575,8 @@ All the standard ajax attributes *except the callbacks* are supported (see the m
                                   else
                                     { :type => "button" }
                                   end)
-    label ||= t("hobo.actions.remove", :default=>"Remove")
-    confirm = t("hobo.messages.confirm", :default=>"Are you sure?") if confirm.nil?
+    label ||= I18n.t("hobo.actions.remove", :default=>"Remove")
+    confirm = I18n.t("hobo.messages.confirm", :default=>"Are you sure?") if confirm.nil?
 
     add_classes!(attributes,
                  image ? "image-button" : "button",
@@ -607,7 +589,7 @@ All the standard ajax attributes *except the callbacks* are supported (see the m
       else
         fade = true if fade.nil?
         attributes[:value] = label
-        attributes[:onclick] = "Hobo.removeButton(this, '#{url}', #{js_updates(update)}, {fade:#{fade}, confirm: '#{confirm}'})"
+        attributes[:onclick] = "Hobo.removeButton(this, '#{url}', #{js_updates(update)}, {fade:#{fade}, confirm: #{confirm.inspect}})"
         element(:input, attributes, nil, true, true)
       end
     end
@@ -633,8 +615,7 @@ All of the standard ajax attributes are supported (see the main taglib documenti
   class_or_assoc = if model
                      model.is_a?(String) ? model.constantize : model
                    elsif Hobo.simple_has_many_association?(this)
-                     id_method = this_field_reflection.options[:primary_key] || this_field_reflection.klass.primary_key
-                     fields[this_field_reflection.primary_key_name] = this.proxy_owner.send(id_method)
+                     fields[this_field_reflection.primary_key_name] = this.proxy_owner.id
                      this
                    else
                      raise Hobo::Error.new("invalid context for <create-button>")
@@ -642,18 +623,12 @@ All of the standard ajax attributes are supported (see the main taglib documenti
   new = class_or_assoc.new(fields)
   new.set_creator(current_user)
   if can_create?(new)
-    label ||= ht("#{new.class.to_s.underscore}.actions.new", :default=>"New #{new.class.model_name.human}")
+    label ||= ht("#{new.class.name.tableize}.actions.new", :default=>"New #{new.class.model_name.human}")
+    ajax_attributes = { :message => message }
     class_name = new.class.name.underscore
-    params ||= params || {}
-    params = params.merge(class_name => fields) unless fields.blank?
-
-    ajax_attributes, html_attributes = attributes.partition_hash(Hobo::Rapid::Helper::AJAX_ATTRS)
-
-    ajax_attributes.reverse_merge!(:message => message, :params => params)
+    ajax_attributes[:params] = { class_name => fields } unless fields.empty?
     func = ajax_updater(object_url(new.class, :method => :post), update, ajax_attributes)
-    html_attributes.reverse_merge!(:type =>'button', :onclick => func, :value => label)
-
-    element :input, add_classes(html_attributes,
+    element :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
                                 "button create-button create-#{class_name}-button"), nil, true, true
   end
 %></def>
@@ -668,7 +643,6 @@ This is the default input that Rapid uses for `belongs_to` associations. The men
  - `include-none` - whether to include a 'none' option (i.e. set the foreign key to null).   If this value is not supplied, the default is "true" if the current value is nil; otherwise the default is "false".  One implication of this is that the default may change when the form is re-rendered due to a validation failure.  Setting this value explicitly is recommended.
  - `blank-message` - the message for the 'none' option. Defaults to "(No `<model-name>`)", e.g. "(No Product)"
  - `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`)
- - `sort` - whether to sort the array of options. Defaults to no sorting.
  - `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"
 
@@ -678,23 +652,21 @@ For situations where there are too many target records to practically include in
 
   -->
 <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.underscore}.messages.none", :default=>"No #{this_type.model_name.human} available.")
+  raise Hobo::Error.new("Not allowed to edit #{this_field}") if !attributes[:disabled] && !can_edit?
+  blank_message ||= ht("#{this_type.name.tableize}.message.no", :default=>"(No #{this_type.model_name.human})")
   limit ||= 100
 
   options ||= begin
     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)}
+    this_field_reflection.klass.all(:conditions => conditions, :limit => limit).select {|x| can_view?(x)}
   end
 
-  id_method = this_field_reflection.options[:primary_key] || this_field_reflection.klass.primary_key
   if text_method.nil?
-    select_options = options.map { |x| [name(:with => x, :no_wrapper => true), x.send(id_method)] }
+    select_options = options.map { |x| [x.to_s, x.id] }
   else
     select_options = options.map do |x|
       [ text_method.split(".").inject(x) { |v, method| v.send(method) },
-           x.send(id_method) ]
+           x.id ]
     end
   end
   select_options = select_options.sort if sort
@@ -702,7 +674,7 @@ For situations where there are too many target records to practically include in
   attributes = add_classes(attributes, "input", "belongs_to", type_and_field)
   -%>
   <select name="#{param_name_for_this(true)}" merge-attrs="&attributes.except :name">
-    <%= options_for_select(select_options, this ? this.send(id_method) : "") %>
+    <%= options_for_select(select_options, this ? this.id : "") %>
   </select>
 </def>
 
@@ -773,13 +745,11 @@ 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)
   -%>
-  <wrap tag="span" class="field-with-errors" when="&!this_parent.errors[this_field].empty?">
-    <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/>
-    <div class="completions-popup" style="display:none"></div>
-  </wrap>
+  <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/>
+  <div class="completions-popup" style="display:none"></div>
 </def>
 
 
@@ -809,19 +779,11 @@ If you wish to set `min-chars` to 0, you will require this [patch to controls.js
 <!-- 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.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>
+  <section class="error-messages" merge-attrs if="&this.errors.length > 0">
+    <h2 param="heading"><t key="activerecord.errors.template.header" model="&this.class.model_name.human" count="&this.errors.size"/></h2>
+    <t key="activerecord.errors.template.body"></t>
     <ul param>
-      <% this.errors.to_a.each do |message| -%>
+      <% this.errors.each_full do |message| -%>
       <li param><%= message %></li>
       <% end -%>
     </ul>
@@ -835,12 +797,12 @@ An input for `has_many :through` associations that lets the user chose the items
 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_field_reflection.klass.to_s.underscore}.form.select_many.prompt", :default=>"Add #{this_field.titleize.singularize}")
+  prompt ||= ht("#{this_field.tableize}.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 ||= t("hobo.actions.remove", :default=>'Remove')
+  remove_label ||= I18n.t("hobo.actions.remove", :default=>'Remove')
   -%>
   <div class="input select-many" merge-attrs>
     <div style="display:none" class="item-proto">
@@ -886,7 +848,7 @@ Use the `stay-here` attribute to remain on the current page:
       ...
     </form>
 
-Use the `go-back` option to return to the page in `session[:previous_uri]`:
+Use the `go-back` option to return to the previous page:
 
     <form>
       <after-submit go-back/>
@@ -921,14 +883,14 @@ Use the `uri` option to specify a redirect location:
 <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=>'')
+     str = I18n.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>
-    <do param="options"><%= options_for_select(options, selected) %></do>
+    <do param="options"><% options_for_select(options, selected) %></do>
   </select>
 </def>
 
@@ -953,8 +915,8 @@ Use the `uri` option to specify a redirect location:
     <input type="hidden" name="#{param_name}[]" value=""/><% # ensure all items are removed when nothing checked
     %>
     <li repeat="&options" param>
-      <input id="#{dom_id(this, :check_many)}" type="checkbox" name="#{param_name}[]" value="@#{this.id}" checked="&this.in?(collection)" disabled="&disabled"/>
-      <label for="#{dom_id(this, :check_many)}"><name param/></label>
+      <input type="checkbox" name="#{param_name}[]" value="@#{this.id}" checked="&this.in?(collection)" disabled="&disabled"/>
+      <name param/>
     </li>
   </ul>
 </def>
@@ -1064,7 +1026,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.to_s.underscore}.collection.empty_message">
+          <ht key="#{this.class.name.tableize}.collection.empty_message">
             No <%= this.class.name.titleize.downcase.pluralize %>.
           </ht>
         </div>