hobo 0.6.2 → 0.6.3

data/hobo_files/plugin/tags/rapid_document_tags.dryml

@@ -1,4 +1,4 @@
-<def tag="field_list"><table class="field_list"><tagbody/></table></def>
+<def tag="field_list"><table class="field_list" merge_attrs><tagbody/></table></def>
 
 <def tag="field_list_item"><tr merge_attrs><tagbody/></tr></def>
 
@@ -11,36 +11,40 @@
   <%= content_tag "h#{scope.heading_level || '1'}", tagbody.call, attributes %>
 </def>
 
+<def tag="sub_heading">
+  <%= content_tag "h#{scope.heading_level.to_i + 1|| '2'}", tagbody.call, attributes.merge(:class => "subheading") %>
+</def>
+
 <def tag="nav">
   <div class="nav" merge_attrs><tagbody/></div>
 </def>  
 
 <!-- section represents a generic document or application section. -->
-<def tag="section">
+<def tag="section" attrs="empty">
   <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="section" merge_attrs if="&body"><%= body %></div>
+  <div class="section" merge_attrs if="&!body.blank? || empty"><%= body %></div>
 </def>
 
-<def tag="aside">
+<def tag="aside" attrs="empty">
   <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="aside" merge_attrs if="&body"><%= body %></div>
+  <div class="aside" merge_attrs if="&!body.blank? || empty"><%= body %></div>
 </def>
 
-<def tag="header">
+<def tag="header" attrs="empty">
   <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="header" merge_attrs if="&body"><%= body %></div>
+  <div class="header" merge_attrs if="&!body.blank? || empty"><%= body %></div>
 </def>
 
-<def tag="footer">
+<def tag="footer" attrs="empty">
   <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="footer" merge_attrs if="&body"><%= body %></div>
+  <div class="footer" merge_attrs if="&!body.blank? || empty"><%= body %></div>
 </def>
 
 <!-- article represents an independent piece of content of a --> 
 <!-- document, such as a blog entry or newspaper article.    -->
-<def tag="article">
+<def tag="article" attrs="empty">
   <set body="&tagbody ? tagbody.call : ''"/>
-  <div class="article" merge_attrs if="&body"><%= body %></div>
+  <div class="article" merge_attrs if="&!body.blank? || empty"><%= body %></div>
 </def>
 
 <!-- temporary tag -->

data/hobo_files/plugin/tags/rapid_editing.dryml

@@ -41,13 +41,7 @@
 
 <def tag="editor" for="boolean"><boolean_checkbox_editor merge_attrs/></def>
 
-
-<def tag="submit" attrs="label, image">
-  <input if="&image" type="image" src="&image" merge_attrs class="image_input submit_button"/>
-  <else>
-    <input type="submit" value="#{label}" merge_attrs class="button_input submit_button"/>
-  </else>
-</def>
+<def tag="editor" for="big_integer"><%= in_place_editor "in_place_textfield_bhv", attributes %></def>
 
 
 <def tag="autocompleter" attrs="completer_model, completer_attr, id, filter, name, value">
@@ -60,8 +54,7 @@
      end
      id ||= this_field_dom_id + "_completer"
      url = object_url(completer_model, "completions",
-                      { :for => completer_attr },
-                      attributes.select_hash {|k,v| k.to_s.starts_with? "where_"})
+                      { :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}"
@@ -188,3 +181,42 @@
 </def>
 
 
+<def tag="has_many_checkbox_editor" attrs="model, update, message"><%=
+  raise HoboError.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)
+
+  checkbox_attrs = {:type =>'checkbox'}
+  
+  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?))
+    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'})                          
+    end
+  end
+  tag :input, add_classes(attributes.merge(checkbox_attrs),
+                          "checkbox_input has_many_checkbox has_many_#{class_name}_checkbox") if permission
+%></def>
+
+<def tag="HasManyCheckboxEditors">
+  <Table>
+    <tr>
+      <td><has_many_checkbox_editor param="editor" merge_attrs/></td>
+      <td><name param/></td>
+    </tr>
+  </Table>
+</def>

data/hobo_files/plugin/tags/rapid_forms.dryml

@@ -9,9 +9,14 @@
                         comma_split(fields)
                       end
             pname = this.class.name.underscore
-            hiddens.map { |h| [ "#{pname}[#{h}]", this.send(h) ] }
+            hiddens.map do |field| 
+              val = this.send(field)
+              ["#{pname}[#{field}]", val] unless val.nil? || 
+                                                   field.to_sym.in?(this.class.attr_protected) || 
+                                                   (this.new_record? && val == this.class.column(field).default)
+            end.compact
           end
-  pairs.map {|n, v| hidden_field_tag(n, v.to_s) if v && n.not_in?(skip)}.compact.join("\n")
+  pairs.map { |n, v| hidden_field_tag(n, v.to_s) if v && n.not_in?(skip) }.compact.join("\n")
 %></def>
 
 
@@ -35,6 +40,7 @@
   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("; ")
@@ -46,8 +52,18 @@
   end
 
   hiddens = hidden_fields(:fields => hidden_fields, :skip => field_names) if new_record
-     
-  body = [http_method_hidden, hiddens, body].join
+  
+  auth_token = if request_forgery_protection_token.nil?
+                 ''
+               else
+                 tag(: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
    
   if web_method
     add_classes!(html_attrs, "#{type_id}_#{web_method}_form")
@@ -59,32 +75,46 @@
 %></def>
 
 
+<def tag="submit" attrs="label, image">
+  <input if="&image" type="image" src="&image" merge_attrs class="image_button submit_button"/>
+  <else>
+    <input type="submit" value="#{label}" merge_attrs class="button submit_button"/>
+  </else>
+</def>
+
+
 <def tag="input"><%=     
   if attributes[:type]
     tag :input, attributes
   elsif !can_edit?
     view
   else
-    if this_type.respond_to?(:macro)
-      if this_type.macro == :belongs_to
-        belongs_to_input(attributes)
-      elsif this_type.macro == :has_many
-        has_many_input(attributes)
-      end
+    attrs = add_classes(attributes, type_and_field)
+    the_input = if this_type.respond_to?(:macro)
+                  if this_type.macro == :belongs_to
+                    belongs_to_input(attrs)
+                  elsif this_type.macro == :has_many
+                    if this_type.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})")
+                end
+    if this_parent.errors[this_field]
+      "<div class='field_with_errors'>#{the_input}</div>"
     else
-      attrs = add_classes(attributes, type_and_field, 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})")
-      if this_parent.errors[this_field]
-        "<div class='field_with_errors'>#{the_input}</div>"
-      else
-        the_input
-      end
+      the_input
     end
   end
 %></def>
 
+     
 <def tag="input" for="text" attrs="name">
   <%= text_area_tag(name, this, attributes) %>
 </def>
@@ -94,7 +124,7 @@
 </def>
   
 <def tag="input" for="password" attrs="name">
-  <%= password_field_tag(name, this) %>
+  <%= password_field_tag(name, this, attributes) %>
 </def>
 
 <def tag="input" for="html" attrs="name">
@@ -123,6 +153,26 @@
   <%= text_field_tag(name, this, attributes) %>
 </def>
 
+<def tag="input" for="big_integer" attrs="name">
+  <%= text_field_tag(name, this, attributes) %>
+</def>
+
+
+
+
+<def tag="input" for="Hobo::EnumString" attrs="labels,titleize">
+  <% labels ||= {} %>
+  <% titleize = true if titleize.nil? %>
+  <select name="#{param_name_for_this}" merge_attrs>
+    <%= options_for_select(this_type.values.map {|v| [labels.fetch(v.to_sym, titleize ? v.titleize : v), v] }, this) %>
+  </select>
+</def>
+
+<def tag="input" for="percentage" attrs="name">
+  <%= text_field_tag(name, this, attributes.merge(:size => '3', :maxlength => '3')) %>%
+</def>
+
+
 <def tag="belongs_to_input">
   <%= belongs_to_menu_input(attributes) %>
 </def>
@@ -132,11 +182,17 @@
 <def tag="remote_method_button" attrs="method, update, result_update, params, label, message"><%= 
   ajax_attributes, html_attributes = attributes.partition_hash(Hobo::RapidHelper::AJAX_ATTRS)
 
-  message ||= method.titleize
-  func = ajax_updater(object_url(this) + "/#{method}", message, update,
-                      ajax_attributes.merge(:params => params, :result_update => result_update))
-  html_attributes.update(:type =>'button', :onclick => "var e = this; " + func, :value => label)
-  tag(:input, add_classes(html_attributes, "button_input remote_method_button #{method}_button"))
+  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))
+    html_attributes.update(:onclick => "var e = this; " + func, :type =>'button', :value => label)
+    tag(:input, html_attributes)
+  else
+    button_to(label, url, html_attributes)
+  end
 %></def>
   
 
@@ -147,7 +203,7 @@
                       :params => { this.class.name.underscore => fields }.merge(params || {}),
                       :method => :put)
   tag :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
-                          "button_input update_button update_#{this.class.name.underscore}_button") %>
+                          "button update_button update_#{this.class.name.underscore}_button") %>
 </def>
 
 
@@ -159,19 +215,19 @@
                                     { :type => "button" }
                                   end)
     label ||= "Remove"
-    confirm ||= "Are you sure?"
+    confirm = "Are you sure?" if confirm.nil?
     
     add_classes!(attributes,
-                 image ? "image_button_input" : "button_input",
+                 image ? "image_button" : "button",
                  "delete_button delete_#{this.class.name.underscore}_button")
     url = object_url(this, "destroy")
     if in_place == false
-      attributes[:confirm] = confirm
+      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 ? 'true' : 'false'})"
+      attributes[:onclick] = "Hobo.removeButton(this, '#{url}', #{js_updates(update)}, {fade:#{fade}, confirm: #{confirm.inspect}})"
       tag(:input, attributes)
     end
   end
@@ -199,22 +255,22 @@
     func = ajax_updater(object_url(new.class), message, update,
                         ({:params => { class_name => fields }} unless fields.empty?))
     tag :input, add_classes(attributes.merge(:type =>'button', :onclick => func, :value => label),
-                            "button_input create_button create_#{class_name}_button")
+                            "button create_button create_#{class_name}_button")
   end
 %></def>
 
 
-<def tag="belongs_to_menu_input" attrs="include_none, none_message, options"><%
+<def tag="belongs_to_menu_input" attrs="include_none, blank_message, options"><%
   raise HoboError.new("Not allowed to edit") unless can_edit?
    
-  none_message ||= "(No #{this_type.name.to_s.titleize})"
-  options ||= this_type.klass.find(:all).select {|x| can_view?(x)}
+  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
   select_options = options.map { |x|
             [ name(:with => x, :no_wrapper => true), x.id ]
           }.sort
-  select_options.insert(0, [none_message, ""]) if this.nil? || include_none
-  attributes = add_classes(attributes, "input", type_and_field)
+  select_options.insert(0, [blank_message, ""]) if include_none || (this.nil? && include_none != false)
+  attributes = add_classes(attributes, "input", "belongs_to", type_and_field)
   %>
   <select name="#{param_name_for_this(true)}" merge_attrs>
     <%= options_for_select(select_options, this ? this.id : "") %>
@@ -249,3 +305,47 @@
     <tagbody/>
   </select>
 </def>
+
+      
+<def tag="ErrorMessages">
+  <section class="error_messages" merge_attrs if="&this.errors.length > 0">
+    <h2 param="heading">In order to proceed please correct the following:</h2>
+    <UL:errors.full_messages param>
+      <li param><%= this %></li>
+    </UL>
+  </section>
+</def>
+
+
+<def tag="name_array_input" attrs="targets, remove_label">
+  <%
+  all ||= this.member_class.find(:all)
+  values = this
+  %>
+  <div class="input has_many_through" merge_attrs>
+    <div style="display:none" class="item_proto">
+      <div class="item">
+        <span></span>
+        <input type="hidden" name="#{param_name_for_this}[]" />
+        <input type="button" class="remove_item" value="#{remove_label || 'Remove'}"/>
+      </div>
+    </div>
+    <div class="items">
+      <div class="item" repeat>
+        <span><%= this %></span>
+        <input type="hidden" name="#{param_name_for_this}[]" value="#{this}"/>
+        <input type="button" class="remove_item" value="#{remove_label || 'Remove'}"/>
+      </div>
+    </div>
+    <select>
+      <option value="">Add a <%= this_field.titleize.singularize %></option>
+      <option repeat="&all.sort_by {|x| name(:no_wrapper => true, :with => x).downcase}" 
+              merge_attrs="&{:style => 'display:none'} if this.in?(values)"><name/></option>
+    </select>
+  </div>
+</def>
+
+
+<def tag="after_submit" attrs="uri">
+  <input type="hidden" value="&params[:after_submit] || uri" name="after_submit"/>
+</def>

data/hobo_files/plugin/tags/rapid_navigation.dryml

@@ -14,7 +14,7 @@
 
 <def tag="nav_item">
   <set body="&tagbody.call"/>
-  <li class="#{'current' if (c = scope.current_navigation) && c.downcase == body.downcase.strip}"
+  <li class="#{'current' if (c = scope.current_navigation) && c.downcase == body.downcase.gsub(/<.*?>/, '').strip}"
       merge_attrs="&attributes - attrs_for(:a)">
     <a merge_attrs="&attributes & attrs_for(:a)"><%= body %></a>
   </li>
@@ -41,7 +41,7 @@
 <!--- Pagination Navigation -->
 
 <def tag="page_nav" attrs="params">
-  <if test="&@pages.length > 1">
+  <if test="&@pages && @pages.length > 1">
     <page_n_of_count/> - 
     <first_page_link params="&params">|&lt;</first_page_link>
     <previous_page_link params="&params">Previous</previous_page_link>

data/hobo_files/plugin/tags/rapid_pages.dryml

@@ -9,7 +9,7 @@
         <stylesheet name="application"/>
       </do>
       <do param="scripts">
-        <%= javascript_include_tag :defaults %>
+        <javascript name="prototype,effects,dragdrop,controls,application"/>
       </do>
     </head>
     <body onload="Hobo.applyEvents();" param>
@@ -17,35 +17,54 @@
   </html>
 </def>
 
+
 <def tag="Page">
   <BasePage merge>
-    <stylesheets>
+    <stylesheets param>
       <stylesheet name="hobo_base"/>
       <stylesheet name="hobo_rapid"/>
       <stylesheet name="application"/>
     </stylesheets>
-    <scripts>
-      <default_tagbody/>
+
+    <scripts param>
+      <javascript name="prototype, effects, dragdrop, controls, lowpro, hobo_rapid, application"/>
       <hobo_rapid_javascripts param/>
     </scripts>
 
     <body param>
       <div class="page_wrapper" param="wrapper">
         <ajax_progress/>
-        <header id="page_header" param>
+        <header class="page_header" param>
           <nav param>
-            <magic_nav class="main_nav" param="main_mav"/>
+            <magic_nav class="main_nav" param="main_nav"/>
             <account_nav if="&Hobo::UserController.user_models.first" param/>
           </nav>
         </header>
-        <flash_message param/>
-        <div id="page_main" param="main"></div>
-        <footer id="page_footer" param/>
+        <section class="page_content" param="content">
+          <header class="content_header" param="content_header"/>
+          <flash_message param/>
+          <section class="content_body" param="content_body"/>
+          <footer class="content_footer" param="content_footer"/>
+        </section>
+        <footer class="page_footer" param/>
       </div>
     </body>
   </BasePage>
 </def>
 
+<def tag="PageWithoutAside" alias_of="Page"/>
+<def tag="PageWithAside">
+  <PageWithoutAside merge>
+    <content>
+      <section class="main_content" param="main_content">
+        <default_tagbody for="content"/>
+      </section>
+      <aside class="aside_content" param/>
+    </content>
+  </PageWithoutAside>
+</def>
+      
+
 <def tag="PageForIndex"><Page merge/></def>
 <def tag="PageForNew"><Page merge/></def>
 <def tag="PageForShow"><Page merge/></def>
@@ -53,56 +72,48 @@
 <def tag="PageForNewInCollection"><Page merge/></def>
 <def tag="PageForShowCollection"><Page merge/></def>
 
+
 <def tag="IndexPage">
   <% model_name = @model.name.titleize %>
   <PageForIndex title="All #{model_name.pluralize}" merge>
-    <body class="rapid_generic_page"/>
-    <main>
-      <header>
-        <heading><%= model_name.pluralize %></heading>
-      </header>
-
-      <nav param="top_page_nav"><page_nav/></nav>
-
-      <panel param="main" class="main">
-        <header param="main_header" with="&@model">
-          <h2><count part="item_count"/></h2>
-        </header>
-        <section param="main_section">
-          <Table param>
-            <tr><td><a/></td><td><delete_button update="item_count"/></td></tr>
-          </Table>
-        </section>
-        
-        <nav param="bottom_page_nav"><page_nav/></nav>
-
-        <section param="new_link"><a to="&@model" action="new"/></section>
-      </panel>
-    </main>
+    <body class="index_page #{@model.name.underscore.pluralize}" param/>
+    <content_header param>
+      <heading param><%= model_name.pluralize %></heading>
+      <p class="note" param>There <count part="item_count" prefix="are" with="&@model"/></p>
+    </content_header>
+
+    <content_body param>
+      <nav param="top_pagination_nav"><page_nav/></nav>
+      
+      <Table param>
+        <tr><td><a/></td><td><delete_button update="item_count"/></td></tr>
+      </Table>
+      
+      <nav param="bottom_pagination_nav"><page_nav/></nav>
+    </content_body>
+    
+    <content_footer param>
+      <a to="&@model" action="new" param="new_link"/>
+    </content_footer>
   </PageForIndex>
 </def>
 
 
 <def tag="NewPage">
   <PageForNew title="New #{type_name}" merge>
-    <body class="rapid_generic_page new_page new_#{type_name.underscore}"/>
-    <main>
-      <header param>
-        <heading>New <type_name title/></heading>
-      </header>
-
-      <panel param="main" class="main">
-        <header param="main_header"><h2>Details</h2></header>
-        <section>
-          <error_messages param="error_messages"/>
-
-          <form>
-            <FieldList skip_associations="has_many" param/>
-            <submit label="Create" param/>
-          </form>
-        </section>
-      </panel>
-    </main>
+    <body class="new_page #{type_name.underscore}" param/>
+    <content_header param>
+      <heading param>New <type_name title/></heading>
+    </content_header>
+
+    <content_body param>
+      <ErrorMessages param/>
+
+      <form param>
+        <FieldList skip_associations="has_many" param/>
+        <submit label="Create" param/>
+      </form>
+    </content_body>
   </PageForNew>
 </def>
 
@@ -113,87 +124,61 @@
      end.compact
   %>
   <PageForShow merge>    
-    <body class="rapid_generic_page show_page show_#{type_name.underscore}"/>
-    <main>
-      <header>
-        <heading><type_name/><if test="&this.respond_to? :name">: <editor:name/></if></heading>
-        <delete_button in_place="&false"/>
-      </header>
-
-      <panel param="main_panel">
-        <header param="main_header"><h2>Details</h2></header>
-        <section>
-          <FieldList skip="name" tag="editor" param/>
-        </section>
-
-        <nav param="new_links">
-          <UL with="&has_many_assocs">
-            <li><a action="new"/></li>
-          </UL>
-        </nav>
-      </panel>
-    </main>
+    <body class="show_page #{type_name.underscore}" param/>
+    <content_header param>
+      <heading param><type_name/><if test="&this.respond_to? :name">: <editor:name/></if></heading>
+      <delete_button in_place="&false" param/>
+    </content_header>
+    
+    <content_body param>
+      <FieldList skip="name" tag="editor" param/>
+
+      <nav param="new_links">
+        <UL with="&has_many_assocs">
+          <li><a action="new"/></li>
+        </UL>
+      </nav>
+    </content_body>
   </PageForShow>
 </def>
 
 
 <def tag="EditPage">
-  <% has_many_assocs = this.class.reflections.values.map do |refl|
-       this.send(refl.name) if Hobo.simple_has_many_association?(refl)
-     end.compact
-  %>
   <PageForEdit merge>    
-    <body class="rapid_generic_page edit_page edit_#{type_name.underscore}"/>
-    <main>
-      <header>
-        <heading><type_name/><if test="&this.respond_to? :name">: <name/></if></heading>
-        <delete_button in_place="&false" param/>
-      </header>
-
-      <panel param="main_panel">
-        <header param="main_header"><h2>Details</h2></header>
-        <section>
-          <error_messages param="error_messages"/>
-          <form>
-            <FieldList skip="name" param/>
-            <submit label="Save"/>
-          </form>
-        </section>
+    <body class="edit_page #{this.class.name.underscore}" param/>
+    <content_header param>
+      <heading><type_name/><if test="&this.respond_to? :name">: <name/></if></heading>
+      <delete_button in_place="&false" param/>
+    </content_header>
+
+    <content_body param>
+      <ErrorMessages param/>
+      <form param>
+        <FieldList skip_associations="has_many" param/>
+        <submit label="Save"/>
+      </form>
           
-        <section param="new_links">
-          <UL with="&has_many_assocs">
-            <li><a action="new"/></li>
-          </UL>
-        </section>
-      </panel>
-    </main>
+    </content_body>
   </PageForEdit>
 </def>
 
 
 <def tag="NewInCollectionPage">
   <PageForNewInCollection title="New #{type_name}" merge>
-    <body class="rapid_generic_page"/>
-    <main>
-      <header param>
-        <h1 param>New <type_name/></h1>
-        <h2 param>For: <a with="&@owner" /></h2>
-      </header>
-
-      <panel param="main">
-        <header param="main_header">
-          <h2>Details</h2>
-        </header>
-        <section>
-          <error_messages param="error_messages"/>
-
-          <form>
-            <FieldList skip_associations="has_many"/>
-            <submit label='Add to #{name(:with => @owner, :no_wrapper => true)}' param/>
-          </form>
-        </section>
-      </panel>
-    </main>
+    <body class="new_in_collection_page #{type_name(:with => @owner)} #{type_name}" param/>
+    <content_header param>
+      <heading param>New <type_name/></heading>
+      <sub_heading param>For: <a with="&@owner" /></sub_heading>
+    </content_header>
+
+    <content_body param>
+      <ErrorMessages/>
+
+      <form param>
+        <FieldList skip_associations="has_many" param/>
+        <submit label='Add to #{name(:with => @owner, :no_wrapper => true)}' param/>
+      </form>
+    </content_body>
   </PageForNewInCollection>
 </def>
 
@@ -201,76 +186,64 @@
 <def tag="ShowCollectionPage">
   <% title = "#{@reflection.name.to_s.titleize} for #{name(:with => @owner)}" %>
   <PageForShowCollection title="&title" merge>
-    <body class="rapid_generic_page"/>
-    <main>
-      <header>
-        <h1><%= title %></h1>
-        <h2>Back to <a with="&@owner"/></h2>
-      </header>
-
-      <panel param="main">
-        <header param="main_header">
-          <count with="&@pages.item_count" label="&@reflection.klass.name.titleize"/>
-        </header>
-
-        <nav param="top_page_nav"><page_nav/></nav>
-
-        <section>
-          <Table param="Table">
-            <tr>
-              <if test="can_view?">
-                <td><a/></td><td><delete_button/></td>
-              </if>
-            </tr>
-          </Table>
-        </section>
-
-        <nav param="bottom_page_nav"><page_nav param/></nav>
-
-        <if test="&Hobo.simple_has_many_association?(@association)">
-          <section param="new_link">
-            <a to="&@association" action="new"/>
-          </section>
-        </if>
-      </panel>
-    </main>
+    <body class="show_collection_page #{type_name(:with => @owner)} #{type_name(:pluralize => true)}"
+          param/>
+    <content_header param>
+      <nav>Back to <a with="&@owner"/></nav>
+      <heading><%= title %></heading>
+      <sub_heading><count with="&@pages.item_count" label="&@reflection.klass.name.titleize"/></sub_heading>
+    </content_header>
+
+    <content_body param>
+      <nav param="top_pagination_nav"><page_nav/></nav>
+
+      <Table param="Table">
+        <tr>
+          <if test="can_view?">
+            <td><a/></td><td><delete_button/></td>
+          </if>
+        </tr>
+      </Table>
+      
+      <nav param="bottom_pagination_nav"><page_nav param/></nav>
+      
+      <nav if="&Hobo.simple_has_many_association?(@association)" param="new_link">
+        <a to="&@association" action="new"/>
+      </nav>
+    </content_body>
   </PageForShowCollection>
 </def>
 
 
 <def tag="LoginPage" attrs="remember_me">
-  <Page title="Login" merge>
+  <Page title="Log In" merge>
     <body class="login_page" param/>
-    <main>
-      <h1 param="login_title">Log In</h1>
-
-      <panel>
-        <section param>
-          <form action="&request.request_uri" param>
-            <table class="login_table">
-              <tr>
-                <td class="field_label">
-                  <label param="login_label" for="login"><%= @user_model.login_attr.to_s.titleize %></label>
-                </td>
-                <td><input param="login_input" type="text" name="login" id="login"/></td>
-              </tr>
-
-              <tr>
-                <td class="field_label"><label param="password_label" for="password">Password</label></td>
-                <td><input param="password_input" type="password" name="password" id="password"/></td>
-              </tr>
-
-              <tr if="&remember_me">
-                <td class="field_label"><label param="remember_me_label" for="remember_me">Remember me:</label></td>
-                <td><input param="remember_me_input" type="checkbox" name="remember_me" id="remember_me"/></td>
-              </tr>
-            </table>
-
-            <p><submit param label='Log in'/></p>
-          </form>
-        </section>
-      </panel>
-    </main>
+    <nav replace/>
+    <content_header param>
+      <heading param>Log In</heading>
+    </content_header>
+
+    <content_body param>
+      <form action="&request.request_uri" param>
+        <field_list>
+          <field_list_item>
+            <item_label param="login_label"><%= model.login_attr.to_s.titleize %></item_label>
+            <item_value><input type="text" name="login" id="login" param="login_input" /></item_value>
+          </field_list_item>
+
+          <field_list_item>
+            <item_label param="password_label">Password</item_label>
+            <item_value><input type="password" name="password" id="password" param="password_input"/></item_value>
+          </field_list_item>
+
+          <field_list_item if="&remember_me">
+            <item_label class="field_label" param="remember_me_label">Remember me:</item_label>
+            <item_value><input type="checkbox" name="remember_me" id="remember_me" param="remember_me_input"/></item_value>
+          </field_list_item>
+        </field_list>
+        <submit label='Log in' param/>
+      </form>
+    </content_body>
   </Page>
 </def>
 
@@ -278,40 +251,41 @@
 <def tag="SignupPage">
   <Page title="Sign Up" merge>
     <body class="signup_page" param/>
+    <nav replace/>
+    <content_header param>
+      <heading param>Sign Up</heading>
+    </content_header>
+    
+    <content_body param>
+      <ErrorMessages/>
+      <form action="&request.request_uri" param>
+        <FieldList fields="login, password, password_confirmation" param>
+          <password_confirmation_label>Confirm Password</password_confirmation_label>
+        </FieldList>
+
+        <submit label='Sign Up'/>
+      </form>
+    </content_body>
 
-    <main>
-      <h1>Sign Up</h1>
-
-      <panel>
-        <section>
-          <error_messages/>
-          <form action="&request.request_uri">
-            <table class="signup_table">
-              <tr>
-                <td class="field_label"><label for="login">Login</label></td>
-                <td><input type="text" name="user[login]"/></td>
-              </tr>
-
-              <tr>
-                <td class="field_label"><label for="password">Password</label></td>
-                <td><input type="password" name="user[password]"/></td>
-              </tr>
-
-              <tr>
-                <td class="field_label"><label for="password">Confirm Password</label></td>
-                <td><input type="password" name="user[password_confirmation]"/></td>
-              </tr>
-            </table>
-
-            <p><submit label='Sign Up'/></p>
-          </form>
-        </section>
-      </panel>
-    </main>
+  </Page>
+</def>
 
+
+<def tag="PermissionDeniedPage">
+  <Page merge>
+    <content_header param>
+      <heading param>That operation is not allowed</heading>
+    </content_header>
   </Page>
 </def>
 
+<def tag="NotFoundPage">
+  <Page merge>
+    <content_header param>
+      <heading param>The page you were looking for could not be found</heading>
+    </content_header>
+  </Page>
+</def>
 
 <def tag="doctype" attrs="version"><%=
   case version.upcase
@@ -333,26 +307,35 @@
   end
 %></def>
 
-<def tag="stylesheet" attrs="name,media">
-  <link href="#{base_url}/stylesheets/#{name}.css" media="#{ media || 'all' }" rel="stylesheet" type="text/css" />
+<def tag="stylesheet" attrs="name, media">
+  <repeat with="&comma_split(name)">
+    <link href="#{base_url}/stylesheets/#{this}.css" media="#{ media || 'all' }"
+          rel="stylesheet" type="text/css" />
+  </repeat>
+</def>
+
+<def tag="javascript" attrs="name">
+  <if test="&name.is_a?(Symbol)">
+    <%= javascript_include_tag name %>
+  </if>
+  <else>
+    <repeat with="&comma_split(name)">
+      <%= javascript_include_tag this %>
+    </repeat>
+  </else>
 </def>
 
-<def tag="flash_message" attr="type">
+<def tag="flash_message" attrs="type">
   <% type = type ? type.to_sym : :notice %>
-  <div class="flash" if="&flash[type]"><%= flash[type] %></div>
+  <div class="flash #{type}" if="&flash[type]" merge_attrs><%= flash[type] %></div>
 </def>
 
 <def tag="ajax_progress">
-  <div id='ajax_progress'>
+  <div id="ajax_progress">
     <div>
       <span id="ajax_progress_text"></span>
     </div>
   </div>
 </def>
 
-<def tag="error_messages">
-  <div class="error_messages">
-    <%= error_messages_for 'this' %>
-  </div>
-</def>