hobo 0.7.2 → 0.7.3

data/hobo_files/plugin/taglibs/rapid.dryml

@@ -7,6 +7,8 @@
 <include src="rapid_forms"/>
 <include src="rapid_navigation"/>
 <include src="rapid_plus"/>
+<include src="rapid_generics"/>
+
 
 <def tag="field-list" attrs="tag">
   <% tag ||= scope.in_form ? "input" : "view" %>
@@ -73,7 +75,7 @@
                 <td param="#{this_field.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">Edit</a>
+                <a param="edit-link" action="edit">Edit</a>
                 <delete-button param/>
               </td>
             </if>
@@ -97,39 +99,9 @@
 </def>
 
 
-<def tag="theme-image" attrs="src">
-  <img src="#{theme_asset('images/' + src)}" merge-attrs/>
-</def>
-
-
-<def tag="card">
-  <if test="&can_view?">
-    <%= poly = call_polymorphic_tag('card', attributes, parameters) %>
-    <div class="card #{linkable? ? 'linkable' : 'content'} #{type_name :dasherize => true}" unless="&poly">
-      <a if="&linkable?"/>
-      <div class="content" param="content">
-        <primary-content if="&!linkable?"/>
-      </div>
-      <creation-details/>
-      <span class="dependents"><count-dependents /></span>
-    </div>
-  </if>
-</def>
-  
-
-<def tag="collection">
-  <%= poly = call_polymorphic_tag('collection', attributes, parameters) %>
-  <ul class="collection" merge-attrs unless="&poly">
-    <li:><card param/></li:>
-  </ul>
-  <p class="empty-collection-message" if="&this.empty?" param="empty-message">
-    There are no <type-name plural/>
-  </p>
-</def>
-
-
 <def tag="hobo-rapid-javascripts" attrs="tiny-mce"><%=
    res = '<script type="text/javascript">var hoboParts = {};'
+   # FIXME: This should interrogate the model-router - not the models
    unless Hobo.all_models.empty?
      # Tell JS code how to pluralize names, unless they follow the simple rule
      names = Hobo.all_models.map do |m|
@@ -147,7 +119,7 @@
    if tiny_mce
      res += javascript_include_tag("tiny_mce/tiny_mce_src") + %{
                <script type="text/javascript">
-                 tinyMCE.init({ mode: "textareas", editor_selector: "tiny_mce",
+                 tinyMCE.init({ mode: "textareas", editor_selector: "tiny-mce",
                        plugins: 'save',
                        theme_advanced_buttons1 : "bold, italic, separator, " +
                                                  "bullist, outdent, indent, separator, " +
@@ -183,13 +155,8 @@
 %></def>
 
 <def tag="type-name" attrs="type, plural, lowercase, dasherize"><%=
-  type ||= if this.is_a?(Class)
-             this
-           elsif this.respond_to? :proxy_reflection
-             this.proxy_reflection.klass
-           else
-             this.class
-           end
+  type ||= (this if this.is_a?(Class)) || this.try.member_class || this.class
+
   name = dasherize ? type.name.underscore.dasherize : type.name.titleize
   name = name.pluralize if plural
   name = name.downcase if lowercase
@@ -216,15 +183,15 @@
       # Link to a new object form
       new_record = target.new
       new_record.set_creator(current_user)
-      if can_create?(new_record)
-        
+      href = object_url(target, "new", params._?.merge(:subsite => subsite))
+      
+      if href && can_create?(new_record)
         new_class_name = if target.respond_to?(:proxy_reflection)
                            target.proxy_reflection.klass.name
                          else
                            target.name
                          end
 
-        href = object_url(target, "new", params._?.merge(:subsite => subsite))
         add_classes!(attributes, "new-#{new_class_name.underscore}-link")
         content = "New #{new_class_name.titleize}" if content.blank?
         element(:a, attributes.update(:href => href), content)
@@ -235,17 +202,9 @@
     else
       # Link to an existing object
 
-      if target.is_a?(Array) && !target.respond_to?(:proxy_reflection) && target.respond_to?(:member_class)
-        # Not much to go on here - last guess is that this is an index page
-        target = target.member_class
-      end
-      
       content = name if content.blank?
       
-      # Do we want automatic disabling of links to thinks that are not
-      # linkable?
-      only_if_linkable = format.blank?
-      href = object_url(target, action, (params || {}).merge(:subsite => subsite, :if_available => only_if_linkable))
+      href = object_url(target, action, (params || {}).merge(:subsite => subsite))
       if href.nil?
         # This target is registered with ModelRouter as not linkable
         content
@@ -268,21 +227,23 @@
    
   res = if this.nil? && if_blank.nil?
           this_type.is_a?(Class) && this_type <= String ? "" : nil_view
-        elsif this_type.respond_to?(:macro)
-          if this_type.macro == :belongs_to
+        elsif refl = this_field_reflection
+          if refl.macro == :belongs_to
             belongs_to_view(attributes)
-          elsif this_type.macro == :has_many
+          elsif refl.macro == :has_many
             has_many_view(attributes)
           end
         else
-          attrs = add_classes(attributes, "view", type_id, type_and_field)
-          attrs['hobo-model-id'] = this_field_dom_id if this_parent && this_parent.respond_to?(:typed_id)
          
           view_tag = find_polymorphic_tag("view")
           
           if view_tag == "view" # i.e. it didn't find a type specific tag
             raise HoboError, "Cannot view: #{this.inspect} (field is #{this_field}, type is #{this.class})"
           else
+            attrs = add_classes(attributes, "view", type_and_field)
+            id = dom_id
+            attrs['hobo-model-id'] = id unless id == "nil"
+
             view_attrs = attrs_for(view_tag)
             the_view = send(view_tag, attrs & view_attrs)
             
@@ -325,32 +286,29 @@
 
 <def tag="view" for="html"><%= this %></def>
 
-<def tag="view" for="Hobo::MarkdownString"><%= this.to_html %></def>
+<def tag="view" for="markdown"><%= this.to_html %></def>
+
+<def tag="view" for="textile"><%= this.to_html %></def>
 
-<def tag="view" for="Hobo::TextileString"><%= this.to_html %></def>
+<def tag="view" for="password">[password withheld]</def>
 
-<def tag="view" for="Hobo::PasswordString">[password withheld]</def>
+<def tag="view" for="string"><%= h(this).gsub("\n", "<br/>") %></def>
 
-<def tag="view" for="String"><%= h(this).gsub("\n", "<br/>") %></def>
+<def tag="view" for="boolean"><%= this ? 'Yes' : 'No' %></def>
 
-<def tag="view" for="TrueClass"><%= this ? 'Yes' : 'No' %></def>
 
-<def tag="count" attrs="label, prefix, if-any"><%=
+<def tag="count" attrs="label, prefix, if-any, lowercase"><%=
   raise Exception.new("asked for count of a string") if this.is_a?(String)
    
-  if this.is_a?(Class) and this < ActiveRecord::Base
-    c = this.count
-    label ||= this.name.titleize
-  else
-    label ||= this.respond_to?(:proxy_reflection) && this.proxy_reflection.name.to_s.singularize.titleize
-    c = if this.is_a?(Fixnum)
-          this
-        elsif this.respond_to?(:count)
-          this.count
-        else
-          this.length
-        end
-  end
+  c = this.try.to_int || this.try.total_entries || this.try.count || this.try.length
+
+  label ||= if this.is_a?(Class)
+              this.name
+            else
+              (this.try.association_name || this.try.member_class._?.name)
+            end.to_s.singularize.titleize
+
+  label = label.downcase if lowercase
    
   Hobo::Dryml.last_if = c > 0 if if_any
   if if_any && c == 0
@@ -360,7 +318,7 @@
    
     if prefix.in? %w(are is)
       p = c == 1 ? "is" : "are"
-      p + ' ' + main
+      p + ' ' + main.to_s
     else
       main
     end
@@ -370,14 +328,11 @@
 
 <def tag="theme-stylesheet" attrs="name">
   <% name ||= 'application' -%>
-  <link href="<%= base_url %>/hobothemes/<%= Hobo.current_theme %>/stylesheets/<%= name %>.css"
+  <link href="#{base_url}/hobothemes/#{Hobo.current_theme}/stylesheets/#{name}.css"
         media="screen" rel="Stylesheet" type="text/css" />
 </def>
 
 
-<def tag="clearer"><div class='clearer'>&nbsp;</div></def>
-
-
 <!-- The Tags defined below here are a bit rough and will be improved
 in the future - use at your own risk. -->
 
@@ -386,12 +341,12 @@ in the future - use at your own risk. -->
 
     <do param="default"/>
 
-    <if test="&delete_buttons != false and can_delete?(this)">
+    <if test="&delete_buttons != false && can_delete?(this)">
       <td><delete-button/></td>
     </if>
   </table-for>
   <else>
-    <p>There are no <%= this_type.klass.name.titleize.pluralize.downcase %></p>
+    <p>There are no <%= this.member_class.name.titleize.pluralize.downcase %></p>
   </else>
   <div>
     <create-button update="&id || part_id"/>
@@ -423,16 +378,9 @@ in the future - use at your own risk. -->
 </def>
 
 
-<def tag="you" attrs="have, are">
-  <if test="&this == current_user">you <%= if have then 'have' elsif are then 'are' end %></if>
-  <else><do param="default"><name/> <%= if have then 'has' elsif are then 'is' end %></do></else>
-</def>
+<def tag="you" attrs="have, are, do, titleize"><if test="&this == current_user"><%= "#{titleize ? 'Y' : 'y'}ou #{'have' if have}#{'are' if are}#{'do' if do_}" %></if><else><do param="default"><name/> <%= "#{'has' if have}#{'is' if are}#{'does' if do_}" %></do></else></def>
 
-
-<def tag="You" attrs="have, are">
-  <if test="&this == current_user">You <%= if have then 'have' elsif are then 'are' end %></if>
-  <else><do param="default"><name/> <%= if have then 'has' elsif are then 'is' end %></do></else>
-</def>
+<def tag="You"><you merge titleize/></def>
 
 <def tag="your">
   <if test="&this == current_user">your</if>
@@ -446,17 +394,6 @@ in the future - use at your own risk. -->
 </def>
 
 
-<def tag="creation-details">
-  <span class="creation-details">
-    <view with="&this.send(this.class.creator_attribute)" class="creator" if="&this.class.creator_attribute" />
-    <view:created_at class="created-at" if="&this.respond_to?(:created_at)"/>
-  </span>
-</def>
-
-<def tag="primary-content">
-  <view class="primary-content" field="&this.class.primary_content_attribute" if="&this.class.primary_content_attribute"/>
-</def>
-
 <def tag="live-search">
   <div class="search">
     <label for="search-field">Search</label><input type="search" id="search-field" name="search-field" class="search-bhv search"/>
@@ -468,11 +405,6 @@ in the future - use at your own risk. -->
   </section>
 </def>
 
-<def tag="count-dependents">
-  <% assoc = this.class.dependent_collections.first if this.class.dependent_collections.length == 1 %>
-  <count field="&assoc" if="&assoc"/>
-</def>
-
 
 <def tag="a-or-an" attrs="word"><%=
   (word =~ /^[aeiouh]/i ? "an " : "a ") + word
@@ -482,3 +414,14 @@ in the future - use at your own risk. -->
 <def tag="A-or-An" attrs="word"><%=
   (word =~ /^[aeiouh]/i ? "An " : "A ") + word
 %></def>
+
+
+<def tag="filter-menu" attrs="param-name, options, no-filter">
+  <form action="&request.request_uri" method="get" class="filter-menu">
+    <hidden-field name="filter-parameter" value="&param_name"/>
+    <select-menu name="&param_name" options="&options" selected="&params[param_name.gsub('-', '_')]" first-option="&no_filter" merge-params/>
+  </form>
+</def>
+
+
+<def tag="comma-list" attrs="separator"><%= this.join(separator || ", ") %></def>

data/hobo_files/plugin/taglibs/rapid_editing.dryml

@@ -1,14 +1,14 @@
 <def tag="editor" ><%= 
   if !can_edit?
     view(attributes)
-  elsif this_type.respond_to?(:macro)
-    if this_type.macro == :belongs_to
+  elsif (refl = this_field_reflection)
+    if refl.macro == :belongs_to
       belongs_to_editor(attributes)
     else
       has_many_editor(attributes)
     end
   else
-    attrs = add_classes(attributes, "#{type_and_field}", "#{type_id}", "editor")
+    attrs = add_classes(attributes, type_id, type_and_field, "editor")
     call_polymorphic_tag("editor", attrs) or
       raise HoboError.new("<editor> not implemented for #{this.class.name}\##{this_field} " +
                           "(#{this.inspect}:#{this_type})")
@@ -44,7 +44,7 @@
 <def tag="editor" for="big_integer"><%= in_place_editor "in_place_textfield_bhv", attributes %></def>
 
 <def tag="editor" for="Hobo::EnumString">
- <string-select-editor values="&this_type.values"/>
+ <string-select-editor values="&this_type.values" merge/>
 </def>
 
 
@@ -56,31 +56,31 @@
      else
        completer_model = completer_model.constantize if completer_model.is_a? String
      end
-     id ||= this_field_dom_id + "_completer"
+     id ||= dom_id + "_completer"
      url = object_url(completer_model, "completions",
                       { :for => completer_attr }.update(attributes.select_hash {|k,v| k.to_s.starts_with? "where_"}))
   %>
   <input type="text" name="#{name}" id="#{id}" class="autocomplete-bhv"
          autocomplete-url="#{url}" value="#{value}"
          merge-attrs/>
-  <div id="<%= id %>-completions" class="completions-popup" style="display:none"></div>
+    <div id="#{id}-completions" class="completions-popup" style="display:none"></div>
 </def>
 
 
 <def tag="belongs-to-menu-editor"><%
   raise HoboError.new("Not allowed to edit") unless can_edit?
-  link_id = "#{this_field_dom_id}_editor" %>
+  link_id = "#{dom_id}_editor" %>
   <span id="#{link_id}" part="rapid-belongs-to-edit">
-    <% select_options = this_type.klass.find(:all).select {|x| can_view?(x)}.map {|x|
+    <% select_options = this_field_reflection.klass.find(:all).select {|x| can_view?(x)}.map {|x|
             [ name(:with => x, :no_wrapper => true), x.id ]
           }
        select_options.insert(0, ["(No #{this_type.name.to_s.titleize})", ""]) if this.nil?
-       link_id = "#{this_field_dom_id}_editor"
+       link_id = "#{dom_id}_editor"
        f = ajax_updater(object_url(this_parent),
-                        "Change #{this_field.to_s.titleize}", [link_id],
+                        [link_id],
                         :method => "put",
                         :params => { this_parent.class.name.underscore => {
-                            this_type.primary_key_name => Hobo.raw_js('this.value')
+                            this_field_reflection.primary_key_name => Hobo.raw_js('this.value')
                           } })
     %>
     <select onchange="#{f}">
@@ -94,9 +94,9 @@
   <if-can-edit><%
   return object_link unless can_edit?
 
-  id ||= this_field_dom_id + "_completer"
+  id ||= dom_id + "_completer"
   f = ajax_updater(object_url(this_parent),
-                   "Change #{this_field.to_s.titleize}", update,
+                   update,
                    :method => "put",
                    :params => { this_parent.class.name.underscore => {
                        this_field => Hobo.raw_js("$('#{id}').value")
@@ -125,7 +125,7 @@
 
   values = comma_split(values)
   f = ajax_updater(object_url(this_parent),
-                   "Change #{this_field.to_s.titleize}", update,
+                   update,
                    :method => "put",
                    :params => { this_parent.class.name.underscore => {
                        this_field => Hobo.raw_js('this.value')
@@ -141,9 +141,9 @@
 <def tag="boolean-checkbox-editor" attrs="update, message"><%
   raise HoboError.new("Not allowed to edit") unless can_edit?
   f = ajax_updater(object_url(this_parent),
-                   message || "Change #{this_field.to_s.titleize}",
                    update,
                    :method => "put",
+                   :message => message,
                    :spinner_next_to => Hobo.raw_js("this"),
                    :params => { this_parent.class.name.underscore => {
                        this_field => Hobo.raw_js('this.checked')
@@ -159,11 +159,11 @@
   <% base_class = this.class
      base_class = base_class.superclass while base_class.superclass != ActiveRecord::Base
    f = ajax_updater("#{base_url}/#{controller_for base_class}/#{this.id}",
-                      "Change #{this_field.to_s.titleize}", update,
-                      :method => "put",
-                      :params => { base_class.name.underscore => {
-                          "type" => Hobo.raw_js('this.value')
-                       } })
+                    update,
+                    :method => "put",
+                    :params => { base_class.name.underscore => {
+                        "type" => Hobo.raw_js('this.value')
+                    } })
   %>
 
   <select onchange="#{f}">
@@ -175,7 +175,7 @@
       
 <def tag="integer-select-editor" attrs="min, max, update, nil-option, message">
  <select class="number-editor-bhv" hobo-update="#{update}"
-          hobo-model-id="#{this_field_dom_id}"
+          hobo-model-id="#{dom_id}"
           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((min.to_i..max.to_i).to_a, this) %>
@@ -197,17 +197,17 @@
   if obj == nil
     new = klass.new(fields)
     permission = if can_create?(new)
-      message ||= "Setting #{new.class.name.titleize}"
       class_name = new.class.name.underscore
-      checkbox_attrs[:onclick] = ajax_updater(object_url(new.class), message, update,
-                          ({:params => { class_name => fields }} unless fields.empty?))
+      ajax_options = { :message => message }
+      ajax_options[:params] = { class_name => fields } unless fields.empty?
+      checkbox_attrs[:onclick] = ajax_updater(object_url(new.class), update, ajax_options)
     end
   else
     permission = if can_delete?(obj)
       checkbox_attrs[:checked] = 'checked'
       message ||= "Unsetting #{obj.class.name.titleize}"
       class_name = obj.class.name.underscore
-      checkbox_attrs[:onclick] = ajax_updater(object_url(obj, "destroy"), message, update, {:method => 'delete'})                          
+      checkbox_attrs[:onclick] = ajax_updater(object_url(obj, "destroy"), update, {:message => message, :method => 'delete'})                          
     end
   end
   element(:input, add_classes(attributes.merge(checkbox_attrs),

data/hobo_files/plugin/taglibs/rapid_forms.dryml

@@ -20,58 +20,73 @@
 %></def>
 
 
-<def tag="form" attrs="message, update, hidden-fields, action, method, web-method"><%= 
+<def tag="form" attrs="update, hidden-fields, action, method, web-method"><%= 
   ajax_attrs, html_attrs = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
    
-  html_attrs[:action] = action || object_url(this, web_method)
+  new_record = this.try.new_record?
 
-  new_record = this.respond_to?(:new_record?) && this.new_record?
-   
   method = if method.nil?
              (action || web_method || new_record) ? "post" : "put"
            else
              method.downcase
            end
-  if method == "put"
-    http_method_hidden = hidden_field_tag("_method", "PUT") 
-    html_attrs[:method] = "post"
-  else
-    html_attrs[:method] = method
-  end
-   
-  if update || !ajax_attrs.empty?
-    message ||= "Creating #{this.class.name.titleize}" if new_record
-    # add an onsubmit to convert to an ajax form if `update` is given
-    function = ajax_updater(:post_form, message, update, ajax_attrs)
-    html_attrs[:onsubmit] = [html_attrs[:onsubmit], "#{function}; return false;"].compact.join("; ")
-  end
 
-  body, field_names = scope.new_scope do
-    scope[:in_form] = true
-    with_form_context { parameters.default }
-  end
-
-  hiddens = hidden_fields(:fields => hidden_fields, :skip => field_names) if new_record
-  
-  auth_token = if request_forgery_protection_token.nil?
-                 ''
-               else
-                 element(:input, :type => "hidden", 
-                         :name => request_forgery_protection_token.to_s,
-                         :value => form_authenticity_token)
-               end
-
-  page_path_hidden = hidden_field_tag("page_path", view_name) 
-   
-  body = [http_method_hidden, page_path_hidden, auth_token, hiddens, body].join
+  html_attrs[:action] = action || object_url(this, web_method, :method => method)
    
-  if web_method
-    add_classes!(html_attrs, "#{type_id}_#{web_method}_form")
+  if html_attrs[:action].nil? || (new_record && !this.user_can_create?(current_user))
+    Hobo::Dryml.last_if = false
+    ""
   else
-    add_classes!(html_attrs, "#{'new_' if new_record}#{type_id}")
+    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" 
+    else
+      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("; ")
+    end
+     
+    body, field_names = scope.new_scope do
+      scope[:in_form] = true
+      with_form_context { parameters.default }
+    end
+     
+    hiddens = hidden_fields(:fields => hidden_fields, :skip => field_names) if new_record
+     
+    auth_token = if request_forgery_protection_token.nil?
+                   ''
+                 else
+                   element(:input, :type => "hidden", 
+                           :name => request_forgery_protection_token.to_s,
+                           :value => form_authenticity_token)
+                 end
+     
+    page_path = if request.post? || request.put? && params[:page_path]
+                  params[:page_path]
+                else
+                  view_name.sub(Hobo::Dryml::EMPTY_PAGE, params[:action])
+                end
+    page_path_hidden = hidden_field_tag("page_path", page_path) unless method == "get"
+     
+    body = [http_method_hidden, page_path_hidden, auth_token, hiddens, body].join
+     
+    
+    if action.nil? # don't add automatic css classes if the action was specified
+      if web_method
+        add_classes!(html_attrs, "#{type_id}_#{web_method}_form")
+      else
+        add_classes!(html_attrs, "#{'new_' if new_record}#{type_id}")
+      end
+    end
+     
+    Hobo::Dryml.last_if = true
+    element("form", html_attrs, body)
   end
-   
-  element("form", html_attrs, body)
 %></def>
 
 
@@ -89,19 +104,18 @@
   elsif !can_edit?
     view
   else
-    attrs = add_classes(attributes, type_and_field)
-    the_input = if this_type.respond_to?(:macro)
-                  if this_type.macro == :belongs_to
+    attrs = add_classes(attributes, type_id, type_and_field)
+    the_input = if (refl = this_field_reflection)
+                  if refl.macro == :belongs_to
                     belongs_to_input(attrs)
-                  elsif this_type.macro == :has_many
-                    if this_type.options[:through]
+                  elsif refl.macro == :has_many
+                    if refl.options[:through]
                       has_many_through_input(attrs)
                     else
                       has_many_input(attrs)
                     end
                   end
                 else
-                  add_classes!(attrs, type_id)
                   attrs[:name] ||= param_name_for_this
                   the_input = call_polymorphic_tag('input', attrs) or
                     raise HoboError, ("No input tag for #{this_field}:#{this_type} (this=#{this.inspect})")
@@ -132,12 +146,12 @@
 </def>
 
 <def tag="input" for="date" attrs="order">
-  <% order = order.nil? ? [:year, :month, :day] : comma_split(order).every(:to_sym) -%>
+  <% order = order.nil? ? [:year, :month, :day] : comma_split(order).*.to_sym -%>
   <%= select_date(this || Time.now, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
 </def>
 
 <def tag="input" for="datetime" attrs="order">
-  <% order = order.nil? ? [:year, :month, :day, :hour, :minute] : comma_split(order).every(:to_sym) -%>
+  <% order = order.nil? ? [:year, :month, :day, :hour, :minute] : comma_split(order).*.to_sym -%>
   <%= select_datetime(this || Time.now, attributes.merge(:prefix => param_name_for_this, :order => order)) %>
 </def>
 
@@ -157,7 +171,7 @@
   <%= text_field_tag(name, this, attributes) %>
 </def>
 
-<def tag="input" for="Hobo::EnumString" attrs="labels,titleize">
+<def tag="input" for="HoboFields::EnumString" attrs="labels,titleize">
   <% labels ||= {} %>
   <% titleize = true if titleize.nil? %>
   <select name="#{param_name_for_this}" merge-attrs>
@@ -176,15 +190,15 @@
 
 <!--- Buttons --->
 
-<def tag="remote-method-button" attrs="method, update, result-update, params, label, message"><%= 
+<def tag="remote-method-button" attrs="method, update, label"><%= 
   ajax_attributes, html_attributes = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
 
   url = object_url(this, method)
   add_classes!(html_attributes, "button remote-method-button #{method}-button")
-  if update || result_update
-    message ||= method.titleize
-    func = ajax_updater(url, message, update,
-                        ajax_attributes.merge(:params => params, :result_update => result_update))
+  if update || result_update || !ajax_attrs.empty?
+    label ||= method.titleize
+    ajax_attributes[:message] ||= label
+    func = ajax_updater(url, update, ajax_attributes)
     html_attributes.update(:onclick => "var e = this; " + func, :type =>'button', :value => label)
     element(:input, html_attributes)
   else
@@ -193,10 +207,10 @@
 %></def>
   
 
-<def tag="update-button" attrs="label, message, update, fields, params"><%=
+<def tag="update-button" attrs="label, update, fields, params"><%=
   raise HoboError.new("no update specified") unless update
-  message ||= label
-  func = ajax_updater(object_url(this), message, update,
+  ajax_attributes[:message] ||= label
+  func = ajax_updater(object_url(this), update,
                       :params => { this.class.name.underscore => fields }.merge(params || {}),
                       :method => :put)
   element :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
@@ -204,8 +218,10 @@
 </def>
 
 
-<def tag="delete-button" attrs="label, message, update, in-place, image, confirm, fade, subsite"><%=
-  if (Hobo::Dryml.last_if = can_delete?)
+<def tag="delete-button" attrs="label, update, in-place, image, confirm, fade, subsite"><%=
+  in_place = false if in_place.nil? && this == @this
+  url = object_url(this, :method => :delete, :subsite => subsite)
+  if (Hobo::Dryml.last_if = url && can_delete?)
     attributes = attributes.merge(if image
                                     { :type => "image", :src => "#{base_url}/images/#{image}" }
                                   else
@@ -217,15 +233,17 @@
     add_classes!(attributes,
                  image ? "image-button" : "button",
                  "delete-button delete-#{this.class.name.underscore.dasherize}-button")
-    url = object_url(this, "destroy", :subsite => subsite)
-    if in_place == false
-      attributes[:confirm] = confirm if confirm
-      button_to(label, url, attributes)
-    else
-      fade = true if fade.nil?
-      attributes[:value] = label
-      attributes[:onclick] = "Hobo.removeButton(this, '#{url}', #{js_updates(update)}, {fade:#{fade}, confirm: #{confirm.inspect}})"
-      element(:input, attributes)
+    if url
+      if in_place == false
+        attributes[:confirm] = confirm if confirm
+        attributes[:method] = :delete
+        button_to(label, url, attributes)
+      else
+        fade = true if fade.nil?
+        attributes[:value] = label
+        attributes[:onclick] = "Hobo.removeButton(this, '#{url}', #{js_updates(update)}, {fade:#{fade}, confirm: #{confirm.inspect}})"
+        element(:input, attributes)
+      end
     end
   else
     ""
@@ -233,14 +251,14 @@
 %></def>
 
 
-<def tag="create-button" attrs="model, update, label, message, fields"><%=
+<def tag="create-button" attrs="model, update, label, fields, message"><%=
   raise HoboError.new("no update specified") unless update
 
   fields ||= {}
   class_or_assoc = if model
                      model.is_a?(String) ? model.constantize : model
                    elsif Hobo.simple_has_many_association?(this)
-                     fields[this.proxy_reflection.primary_key_name] = this.proxy_owner.id
+                     fields[this_field_reflection.primary_key_name] = this.proxy_owner.id
                      this
                    else
                      raise HoboError.new("invalid context for <create-button>")
@@ -249,12 +267,12 @@
   new.set_creator(current_user)
   if can_create?(new)
     label ||= "New #{new.class.name.titleize}"
-    message ||= label
+    ajax_attributes = { :message => message }
+    ajax_attributes[:params] = { class_name => fields } unless fields.empty?
     class_name = new.class.name.underscore
-    func = ajax_updater(object_url(new.class), message, update,
-                        ({:params => { class_name => fields }} unless fields.empty?))
+    func = ajax_updater(object_url(new.class), message, update, ajax_attributes)
     element :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
-                            "button create-button create-#{class_name}-button")
+                                "button create-button create-#{class_name}-button")
   end
 %></def>
 
@@ -263,8 +281,9 @@
   raise HoboError.new("Not allowed to edit") unless can_edit?
    
   blank_message ||= "(No #{this_type.name.to_s.titleize})"
-  options ||= this_type.klass.find(:all, :conditions => this_type.options[:conditions]).select {|x| can_view?(x)}
-  #Todo: switch to autocompleter for id_name when too many records, and id_name supported
+  conditions = ActiveRecord::Associations::BelongsToAssociation.new(this, this_field_reflection).conditions
+  options ||= this_field_reflection.klass.find(:all, :conditions => conditions).select {|x| can_view?(x)}
+    #Todo: switch to autocompleter for id_name when too many records, and id_name supported
   select_options = options.map { |x|
             [ name(:with => x, :no_wrapper => true), x.id ]
           }.sort
@@ -281,7 +300,7 @@
 <% refl = this_type
    completer_model ||= refl.klass
    completer_attr ||= refl.klass.id_name_column
-   id ||= this_field_dom_id + "_completer"
+   id ||= dom_id + "_completer"
    where_attributes = attributes.select_hash {|k,v| k.to_s.starts_with? "where_"}
    url = object_url(completer_model, :completions, { :for => completer_attr }.update(where_attributes))
   %>
@@ -345,6 +364,19 @@
 </def>
 
 
-<def tag="after-submit" attrs="uri">
-  <input type="hidden" value="&params[:after_submit] || uri" name="after_submit"/>
+<def tag="after-submit" attrs="uri, stay-here, go-back">
+  <% uri = request.request_uri if stay_here %>
+  <% uri = session[:previous_uri] if go_back %>
+  <input type="hidden" value="&params[:after_submit] || uri" name="after_submit" if="&uri"/>
+</def>
+
+
+<def tag="hidden-field" attrs="name, value"><input type="hidden" name="&name" value="&value" merge-attrs/></def>
+
+
+<def tag="select-menu" attrs="options, selected, first-option, first-value">
+  <select merge-attrs param="default">
+    <option value="#{first_value}" unless="&first_option.nil?"><first-option/></option>
+    <do param="options"><%= options_for_select(options, selected) %></do>
+  </select>
 </def>