<input> should behave correctly as an empty tag.

hobo/lib/action_view_extensions/helpers/tag_helper.rb

@@ -0,0 +1,7 @@
+module ActionView::Helpers::TagHelper
+  alias_method :tag_without_doctype, :tag
+  def tag(name, options = nil, open = false, escape = true)
+    open = !scope.xmldoctype
+    tag_without_doctype(name, options, open, escape)
+  end
+end

hobo/lib/hobo.rb

@@ -391,6 +391,7 @@ def enable
       require 'active_record/has_many_through_association'
       require 'active_record/association_proxy'
       require 'active_record/association_reflection'
+      require 'action_view_extensions/helpers/tag_helper'
 
       ActionView::Template.register_template_handler("dryml", Hobo::Dryml::TemplateHandler)
 

hobo/lib/hobo/dryml/template_environment.rb

@@ -461,7 +461,7 @@ def render_tag(tag_name, attributes)
     end
 
 
-    def element(name, attributes, content=nil, escape = true, &block)
+    def element(name, attributes, content=nil, escape = true, empty = false, &block)
       unless attributes.blank?
         attrs = []
         if escape
@@ -488,10 +488,10 @@ def element(name, attributes, content=nil, escape = true, &block)
       end
 
       content = new_context(&block) if block_given?
-      res = if content
-              "<#{name}#{attr_string}>#{content}</#{name}>"
+      res = if empty
+            "<#{name}#{attr_string}#{scope.xmldoctype ? ' /' : ''}>"
             else
-              "<#{name}#{attr_string} />"
+              "<#{name}#{attr_string}>#{content}</#{name}>"
             end
       if block && eval("defined? _erbout", block.binding) # in erb context
         _output(res)

hobo/taglibs/rapid_forms.dryml

@@ -61,9 +61,9 @@
     auth_token = if method.nil? || method == 'get' || request_forgery_protection_token.nil?
                    ''
                  else
-                   element(:input, :type => "hidden", 
+                   element(:input, {:type => "hidden", 
                            :name => request_forgery_protection_token.to_s,
-                           :value => form_authenticity_token)
+                           :value => form_authenticity_token}, nil, true, true)
                  end
 
     page_path = if request.post? || request.put? && params[:page_path]
@@ -100,7 +100,7 @@
 
 <def tag="input"><%=     
   if attributes[:type]
-    element :input, attributes
+    element :input, attributes, nil, true, true
   elsif !can_edit?
     view
   else
@@ -189,7 +189,7 @@
     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)
+    element(:input, html_attributes, nil, true, true)
   else
     button_to(label, url, html_attributes)
   end
@@ -205,7 +205,7 @@
    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") %>
+   element :input, add_classes(html_attributes, "button update-button update-#{this.class.name.underscore}-button"), nil, true, true %>
 </def>
 
 
@@ -234,7 +234,7 @@
         scope.collection_contains_delete_button = true if fade
         attributes[:value] = label
         attributes[:onclick] = "Hobo.removeButton(this, '#{url}', #{js_updates(update)}, {fade:#{fade}, confirm: #{confirm.inspect}})"
-        element(:input, attributes)
+        element(:input, attributes, nil, true, true)
       end
     end
   else
@@ -264,7 +264,7 @@
     ajax_attributes[:params] = { class_name => fields } unless fields.empty?
     func = ajax_updater(object_url(new.class), 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"), nil, true, true
   end
 %></def>
 

hobo/taglibs/rapid_pages.dryml

@@ -300,7 +300,7 @@
 %></def>
 
 <def tag="html" attrs="doctype">
-  <% doctype ||= 'HTML 4.01 STRICT' -%>
+  <% doctype ||= 'XHTML 1.0 TRANSITIONAL' -%>
   <doctype version="&doctype"/>
   <% attributes.reverse_merge!(:xmlns => "http://www.w3.org/1999/xhtml") if doctype =~ /^XHTML/ -%>
   <%= "<html#{tag_options(attributes)}>" %>
@@ -309,7 +309,7 @@
 </def>
 
 <!-- empty tags should be written as <br> in HTML and <br /> in XHTML -->
-<def tag="empty-tag" attrs="tag-name"><%= "<#{tag_name}#{tag_options(attributes.inject({}) {|options, (key,value)| options[key.to_s.dasherize] = value; options})}#{scope.xmldoctype  ? ' /' : ''}>" %></def>
+<def tag="empty-tag" attrs="tag-name"><%= element(tag_name, attributes, nil, true, true) %></def>
 <def tag="base"><empty-tag tag-name="base" merge/></def>
 <def tag="meta"><empty-tag tag-name="meta" merge/></def>
 <def tag="link"><empty-tag tag-name="link" merge/></def>

hobo/taglibs/rapid_plus.dryml

@@ -30,7 +30,7 @@
             </if>
           </th>
         </with-field-names>
-        <th if="&all_parameters[:controls]" class="controls"/>
+        <th if="&all_parameters[:controls]" class="controls"></th>
       </field-heading-row>
     </table>    
     <do param="empty-message" if="empty?">No <name-for-collection lowercase/> to display</do>