hobo 2.0.0.pre5 → 2.0.0.pre6

data/CHANGES-1.4.txt

@@ -595,7 +595,7 @@ Examples:
 
      <form ajax hide="drop" show="&['slide', nil, 1000, 'alert(done);']"/>
 
-These two options have global defaults which are TBD.  They may be overridden by passing options to the page-script parameter of `<page>`:
+These default effect is "no effect".  They may be overridden by passing options to the page-script parameter of `<page>`:
 
      <extend tag="page">
        <old-page merge>
@@ -603,7 +603,11 @@ These two options have global defaults which are TBD.  They may be overridden by
        </old-page>
      </extend>
 
-To disable effects entirely:  FIXME.
+If, after changing the default you wish to disable effects on one specific ajax element, pass false:
+
+     <form ajax hide="&false" show="&false" ...
+
+Note that these effects require jQuery-UI.  You will get Javascript errors if you attempt to use effects and do not have jQuery-UI installed.
 
 ### spinner options
 {.todo}
@@ -721,6 +725,11 @@ to press 'return' to initiate the search.  This should be easy to fix
 in hjq-live-search.js -- the hard part will probably be in doing it in
 a way that works in all possible browsers.
 
+`live-search` requires an implementation of
+`<search-results-container>`.  Both hobo-jquery-ui and
+hobo-bootstrap-ui provide implementations of
+`<search-results-container>`.
+
 ### hot-input
 {.done}
 

data/CHANGES-2.0.markdown

@@ -595,7 +595,7 @@ Examples:
 
      <form ajax hide="drop" show="&['slide', nil, 1000, 'alert(done);']"/>
 
-These two options have global defaults which are TBD.  They may be overridden by passing options to the page-script parameter of `<page>`:
+These default effect is "no effect".  They may be overridden by passing options to the page-script parameter of `<page>`:
 
      <extend tag="page">
        <old-page merge>
@@ -603,7 +603,11 @@ These two options have global defaults which are TBD.  They may be overridden by
        </old-page>
      </extend>
 
-To disable effects entirely:  FIXME.
+If, after changing the default you wish to disable effects on one specific ajax element, pass false:
+
+     <form ajax hide="&false" show="&false" ...
+
+Note that these effects require jQuery-UI.  You will get Javascript errors if you attempt to use effects and do not have jQuery-UI installed.
 
 ### spinner options
 {.todo}
@@ -721,6 +725,11 @@ to press 'return' to initiate the search.  This should be easy to fix
 in hjq-live-search.js -- the hard part will probably be in doing it in
 a way that works in all possible browsers.
 
+`live-search` requires an implementation of
+`<search-results-container>`.  Both hobo-jquery-ui and
+hobo-bootstrap-ui provide implementations of
+`<search-results-container>`.
+
 ### hot-input
 {.done}
 

data/VERSION

@@ -1 +1 @@
-2.0.0.pre5
+2.0.0.pre6

data/app/helpers/hobo_route_helper.rb

@@ -95,6 +95,15 @@ module HoboRouteHelper
       options, params = options.partition_hash([:subsite, :method, :format])
       options[:subsite] ||= self.subsite
 
+      action ||= case options[:method].to_s
+                 when 'put';    :update
+                 when 'post';   :create
+                 when 'delete'; :destroy
+                 else; obj.is_a?(Class) || obj.respond_to?(:length) ? :index : :show
+                 end
+
+      params[:action] = action unless action.in?(IMPLICIT_ACTIONS)
+
       if obj.respond_to?(:member_class)
         if obj.respond_to?(:origin) && obj.origin
           # Asking for URL of a collection, e.g. category/1/adverts or category/1/adverts/new
@@ -103,6 +112,7 @@ module HoboRouteHelper
           owner_name = owner_name.singularize if refl.macro == :has_many
           poly = [owner_name, obj.member_class]
           params[:"#{owner_name}_id"] = obj.origin
+          action = "#{action}_for_#{owner_name}"
         else
           poly = [obj.member_class]
         end
@@ -112,21 +122,20 @@ module HoboRouteHelper
 
       poly = [options[:subsite]] + poly if options[:subsite]
 
-      action ||= case options[:method].to_s
-                 when 'put';    :update
-                 when 'post';   :create
-                 when 'delete'; :destroy
-                 else; obj.is_a?(Class) ? :index : :show
-                 end
-
-      params[:action] = action unless action.in?(IMPLICIT_ACTIONS)
-
       begin
         url = polymorphic_path(poly, params)
         # validate URL, since polymorphic URL may return a URL for a
         # different method
-        Rails.application.routes.recognize_path(url, {:method => options[:method]})
-        url
+        # use starts_with because recognize path may return new_for_owner, for example
+        recognized_params = Rails.application.routes.recognize_path(url, {:method => options[:method]})
+        if recognized_params[:action] == action.to_s
+          url
+        else
+          # we get here if the action name is modified: do_signup, etc.
+          recognized_params[:action] = action
+          url2 = url_for(recognized_params)
+          url==url2 ? url : nil
+        end
       rescue NoMethodError => e  # raised if polymorphic_url fails
         nil
       rescue ArgumentError => e  # raised from polymorphic_url

data/lib/generators/hobo/i18n/templates/hobo.es.yml

@@ -13,7 +13,7 @@ es:
       # if you uncomment the following you will loose the automatic selection of dinamically pluralized nav-tabs
       # if you need a different title you should implement a different way to select the tab on your own
       #title: "Indice %{model}"
-      heading: "Indice %{model}"
+      heading: "Índice %{model}"
 
     new:
       title: "Nuevo Registro de %{model}"
@@ -52,7 +52,7 @@ es:
       name: "Nombre"
       password: "Contraseña"
       remember_me: "Recuerda mis datos"
-      login: "Identifición"
+      login: "Identificación"
       signup: "Inscripción"
       forgot_password: &forgot_password "¿Contraseña olvidada?"
 
@@ -71,7 +71,7 @@ es:
     forgot_password_sent:
       title: "Contraseña olvidada - Correo Eléctronico enviado"
       heading: "Contraseña olvidada - Correo Eléctronico enviado"
-      text: "El mensaje con las instruciones para generar una nueva contraseña ha sido enviado a %{email_address}
+      text: "El mensaje con las instrucciones para generar una nueva contraseña ha sido enviado a %{email_address}
              Si no lo recibe, por favor verifique el filtro anti-spam."
 
     account_disabled_page:
@@ -117,13 +117,13 @@ es:
       creator:
         error: "El creator %{name} no se pudo executar.\n%{errors}"
       transition:
-        error: "La transición %{name} no se pudo executar.\n%{errors}"
+        error: "La transición %{name} no se pudo ejecutar.\n%{errors}"
       update:
         no_attribute_error: "Ninguna actualización esta especificada en los parámetros"
         success: "Los cambios a %{model} han sido guardados"
         error: "Ha habido un problema con ese cambio.\n%{errors}"
       destroy:
-        success: "La borradura de %{model} ha sido exitosa."
+        success: "La borradura de %{model} ha sido tenido éxito."
       signup:
         success: "¡Gracias por inscribirse!"
         must_activate: "Tiene que activar la cuenta antes de iniciar la sesión. Por favor verifique su correo eléctronico."
@@ -135,7 +135,7 @@ es:
       permission_denied: "¡Permiso denegado!"
       not_found: "La página solicitada no se encuentra."
       unauthenticated: "No se pudo autenticar."
-      validate_password: "debe contener tansiquiera 6 caracteres, letras mayúsculas y minúsculas"
+      validate_password: "debe contener al menos 6 caracteres, letras mayúsculas y minúsculas"
       current_password_is_not_correct: "no está correcta"
       you_are_site_admin: "Ahora usted es el administrador del sitio."
       you_signed_up: "Usted se inscribió."
@@ -154,7 +154,7 @@ es:
       # you better define the heading.* in the specific collection namespace
       #heading:
       add_form_heading: "Añadir %{model}"
-      empty_message: "Ningun registros"
+      empty_message: "Ningún registro"
 
     # default hobo form translation
     form:
@@ -178,7 +178,7 @@ es:
     live_search:
       label: "Buscar"
       results_label: "Buscar Resultados"
-      close_button: "cierrar"
+      close_button: "cerrar"
       no_results: "No se encuentran resultados."
 
     dev_user_changer:

data/lib/generators/hobo/install_default_plugins/install_default_plugins_generator.rb

@@ -18,7 +18,7 @@ module Hobo
       say "Installing hobo_jquery plugin..."
       install_plugin_helper('hobo_jquery', nil, opts.merge(:skip_gem => true))
       say "Installing hobo_jquery_ui plugin..."
-      install_plugin_helper('hobo_jquery_ui', nil, opts.merge(:skip_gem => true))
+      install_plugin_helper('hobo_jquery_ui', nil, opts)
 
       say "Installing #{opts[:theme]} theme..."
       inject_css_require("jquery-ui/#{opts[:ui_theme]}", opts[:subsite], nil)

data/lib/hobo/controller/model.rb

@@ -591,7 +591,7 @@ module Hobo
     end
 
 
-    def create_response(new_action, options={})
+    def create_response(new_action=:new, options={})
       valid = valid?  # valid? can be expensive
       if params[:render]
         if (params[:render_options] && params[:render_options][:errors_ok]) || valid

data/lib/hobo/rapid/generators/rapid/pages.dryml.erb

@@ -32,54 +32,52 @@ model_key = model.to_s.underscore
   <page merge title="#{ht '<%= model_key %>.index.title', :default=>[model.model_name.human(:count=>100)] }">
     <body: class="index-page <%= model_class %>" param/>
 
-    <content: param>
-      <header param="content-header">
-        <h2 param="heading">
-          <ht key="<%= model_key %>.index.heading">
-            <model-name-human model="&model"/>
-          </ht>
-        </h2>
-
-        <p param="count" if>
-          <ht key="<%= model_key %>.collection.count" count="&collection_count">
-            <count summary/>
-          </ht>
-        </p>
-      </header>
-
-      <section param="content-body">
+    <content-header: param>
+      <h2 param="heading">
+        <ht key="<%= model_key %>.index.heading">
+          <model-name-human model="&model"/>
+        </ht>
+      </h2>
+
+      <p param="count" if>
+        <ht key="<%= model_key %>.collection.count" count="&collection_count">
+          <count summary/>
+        </ht>
+      </p>
+    </content-header:>
+
+    <content-body: param>
 <% if new_link -%>
-        <a action="new" to="&model" param="new-link">
-          <ht key="<%= model_key %>.actions.new">New <%=model_name %></ht>
-        </a>
+      <a action="new" to="&model" param="new-link">
+        <ht key="<%= model_key %>.actions.new">New <%=model_name %></ht>
+      </a>
 <% end -%>
 
 <% if view_hints.paginate? -%>
-        <page-nav param="top-page-nav"/>
+      <page-nav param="top-page-nav"/>
 
 <% end -%>
 <% if view_hints.sortable? -%>
-        <sortable-collection param="collection"/>
+      <sortable-collection param="collection"/>
 <% else -%>
-        <collection param/>
+      <collection param/>
 <% end -%>
 
 <% if view_hints.paginate? -%>
-        <page-nav param="bottom-page-nav"/>
+      <page-nav param="bottom-page-nav"/>
 
 <% end -%>
 
 <% if new_form -%>
-        <div param="new-form">
-          <h3 param="new-form-heading">
-            <ht key="<%= model_key %>.form.new.heading">New <%= model_name %></ht>
-          </h3>
-          <form with="&@invalid_record || new_for_current_user(<%= model %>)" param/>
-        </div>
+      <div param="new-form">
+        <h3 param="new-form-heading">
+          <ht key="<%= model_key %>.form.new.heading">New <%= model_name %></ht>
+        </h3>
+        <form with="&@invalid_record || new_for_current_user(<%= model %>)" param/>
+      </div>
 
 <% end -%>
-      </section>
-    </content:>
+    </content-body:>
   </page>
 </def>
 
@@ -88,21 +86,19 @@ model_key = model.to_s.underscore
   <page merge title="#{ht '<%= model_key %>.new.title', :default=>[' New <%= sq_escape(model_name) %>'] }">
     <body: class="new-page <%= model_class %>" param/>
 
-    <content: param>
-      <section param="content-header">
-        <h2 param="heading">
-          <ht key="<%= model_key %>.new.heading">
-            New <%= model_name %>
-          </ht>
-        </h2>
-      </section>
-
-      <section param="content-body">
-        <form param>
-          <submit: label="#{ht '<%= model_key %>.actions.create', :default=>['Create <%= sq_escape(model_name) %>']}"/>
-        </form>
-      </section>
-    </content:>
+    <content-header: param>
+      <h2 param="heading">
+        <ht key="<%= model_key %>.new.heading">
+          New <%= model_name %>
+        </ht>
+      </h2>
+    </content-header:>
+
+    <content-body: param>
+      <form param>
+        <submit: label="#{ht '<%= model_key %>.actions.create', :default=>['Create <%= sq_escape(model_name) %>']}"/>
+      </form>
+    </content-body:>
   </page>
 </def>
 
@@ -135,113 +131,105 @@ unless model.view_hints.secondary_children.empty?
 end
 -%>
 <def tag="show-page" for="<%= model.name %>">
-  <page merge title="#{ht '<%=model_key %>.show.title', :default=>['<%=sq_escape model_name %>'], :name => name(:no_wrapper => true) }">
+  <page merge title="#{ht '<%=model_key %>.show.title', :default=>['<%=sq_escape model_name %>'], :name => name(:no_wrapper => true) }"<%= ' without-aside' unless aside_collections %> >
 
     <body: class="show-page <%= model_class %>" param/>
 
-    <content: param>
-<% if aside_collections -%>
-      <section-group>
-        <section param="main-content">
-<% end -%>
-          <header param="content-header">
+    <content-header: param>
 <% if back_link -%>
-            <a:<%= back_link %> param="parent-link">&laquo; <ht key="<%= model_key %>.actions.back_to_parent" parent="<%= back_link_human_name %>" name="&this">Back to <name/></ht></a:<%= back_link %>>
+      <a:<%= back_link %> param="parent-link">&laquo; <ht key="<%= model_key %>.actions.back_to_parent" parent="<%= back_link_human_name %>" name="&this">Back to <name/></ht></a:<%= back_link %>>
 <% end -%>
-            <h2 param="heading">
-              <ht key="<%= model_key %>.show.heading" name="#{name(:no_wrapper => true)}">
-                <%= model_name %> <name/>
-              </ht>
-            </h2>
+      <h2 param="heading">
+        <ht key="<%= model_key %>.show.heading" name="#{name(:no_wrapper => true)}">
+          <%= model_name %> <name/>
+        </ht>
+      </h2>
 <% if boolean_fields -%>
 
-            <record-flags fields="<%= boolean_fields * ', ' %>" param/>
+      <record-flags fields="<%= boolean_fields * ', ' %>" param/>
 <% end -%>
 <% if creator_link -%>
 
-            <a:<%= model.creator_attribute %> param="creator-link"/>
+      <a:<%= model.creator_attribute %> param="creator-link"/>
 <% elsif creator -%>
 
-            <view:get-creator param="creator-name"/>
+      <view:get-creator param="creator-name"/>
 <% end -%>
 <% if edit_link -%>
 
-            <a action="edit" if="&can_edit?" param="edit-link">
-              <ht key="<%= model_key %>.actions.edit" name="#{name(:no_wrapper => true)}">
-                Edit <%= model_name %>
-              </ht>
-            </a>
+      <a action="edit" if="&can_edit?" param="edit-link">
+        <ht key="<%= model_key %>.actions.edit" name="#{name(:no_wrapper => true)}">
+          Edit <%= model_name %>
+        </ht>
+      </a>
 <% end -%>
-          </header>
+    </content-header:>
 
-          <section param="content-body">
+    <content-body: param>
 <% if main_content -%>
-            <view:<%= main_content %> param="description" />
+      <view:<%= main_content %> param="description" />
 <% end -%>
 <% if show_fields.any? -%>
-            <field-list fields="<%= show_fields * ', ' %>" param/>
+      <field-list fields="<%= show_fields * ', ' %>" param/>
 <% end -%>
 <% if collection -%>
-            <section param="collection-section">
-              <h3 param="collection-heading">
-                <ht key="<%= collection_class.to_s.underscore %>.collection.heading" count="&this.<%= collection.to_s %>.count" >
-                  <human-collection-name collection="<%= collection %>" your/>
-                </ht>
-              </h3>
+      <section param="collection-section">
+        <h3 param="collection-heading">
+          <ht key="<%= collection_class.to_s.underscore %>.collection.heading" count="&this.<%= collection.to_s %>.count" >
+            <human-collection-name collection="<%= collection %>" your/>
+          </ht>
+        </h3>
 
 <%   if sortable_collection?(collection) -%>
-              <sortable-collection:<%= collection %> param="collection"/>
+        <sortable-collection:<%= collection %> param="collection"/>
 <%   else -%>
-              <collection:<%= collection %> param/>
+        <collection:<%= collection %> param/>
 <%   end -%>
 <%   if add_link -%>
 
-              <a:<%= collection %> action="new" if="&can_create?(@<%= model.name.underscore %>.<%= collection %>)" param="new-link">
-                <ht key="<%= collection_class.to_s.underscore %>.actions.new" count="1">
-                  New <%= collection_class.to_s.titleize %>
-                </ht>
-              </a:<%= collection %>>
+        <a:<%= collection %> action="new" if="&can_create?(@<%= model.name.underscore %>.<%= collection %>)" param="new-link">
+          <ht key="<%= collection_class.to_s.underscore %>.actions.new" count="1">
+            New <%= collection_class.to_s.titleize %>
+          </ht>
+        </a:<%= collection %>>
 <%   elsif add_form -%>
 
-              <section param="add-to-collection" if="&can_create?(@<%= model.name.underscore %>.<%= collection %>)">
-                <h3 param="add-form-heading">
-                  <ht key="<%= collection_class.to_s.underscore %>.collection.add_form_heading" count="1">
-                    Add <%= a_or_an collection_class.to_s.titleize %>
-                  </ht>
-                </h3>
-                <form with="&@<%= collection_class.name.underscore %> || new_for_current_user(@<%= model.name.underscore %>.<%= collection %>)" owner="<%= owner %>" without-cancel param>
-                  <field-list: skip="<%= owner %>"/>
-                  <submit: label="#{ht '<%= sq_escape collection_class.to_s.underscore %>.actions.add', :default=>['Add'] }"/>
-                </form>
-              </section>
+        <section param="add-to-collection" if="&can_create?(@<%= model.name.underscore %>.<%= collection %>)">
+          <h3 param="add-form-heading">
+            <ht key="<%= collection_class.to_s.underscore %>.collection.add_form_heading" count="1">
+              Add <%= a_or_an collection_class.to_s.titleize %>
+            </ht>
+          </h3>
+          <form with="&@<%= collection_class.name.underscore %> || new_for_current_user(@<%= model.name.underscore %>.<%= collection %>)" owner="<%= owner %>" without-cancel param>
+            <field-list: skip="<%= owner %>"/>
+            <submit: label="#{ht '<%= sq_escape collection_class.to_s.underscore %>.actions.add', :default=>['Add'] }"/>
+          </form>
+        </section>
 <%   end -%>
-            </section>
+      </section>
 <% end -%>
-          </section>
+    </content-body:>
 <% if aside_collections -%>
-        </section>
 
-        <aside param>
+    <aside: param>
 <%   for refl, reverse_refl in aside_collections -%>
 <%     if reverse_refl && linkable?(refl.klass, :"index_for_#{reverse_refl.name}") -%>
-         <collection-preview:<%= refl.name %>.recent param="<%= refl.name %>-preview">
-           <heading-content:><human-collection-name with="&this.origin" collection="<%= refl.name %>" your/></heading-content:>
-         </collection-preview:<%= refl.name %>.recent>
+     <collection-preview:<%= refl.name %>.recent param="<%= refl.name %>-preview">
+       <heading-content:><human-collection-name with="&this.origin" collection="<%= refl.name %>" your/></heading-content:>
+     </collection-preview:<%= refl.name %>.recent>
 <%     else -%>
-          <section param="<%= refl.name %>-collection-section">
-            <h3 param="<%= refl.name %>-collection-heading">
-              <ht key="<%= refl.klass.to_s.underscore %>.collection.heading" count="&this.<%= refl.name.to_s %>.count" >
-                <human-collection-name collection="<%= refl.name %>" your/>
-              </ht>
-            </h3>
-            <collection:<%= refl.name %>  param="<%= refl.name %>-collection"/>
-          </section>
+      <section param="<%= refl.name %>-collection-section">
+        <h3 param="<%= refl.name %>-collection-heading">
+          <ht key="<%= refl.klass.to_s.underscore %>.collection.heading" count="&this.<%= refl.name.to_s %>.count" >
+            <human-collection-name collection="<%= refl.name %>" your/>
+          </ht>
+        </h3>
+        <collection:<%= refl.name %>  param="<%= refl.name %>-collection"/>
+      </section>
 <%     end -%>
 <%   end -%>
-        </aside>
-      </section-group>
+    </aside:>
 <% end -%>
-    </content:>
 
   </page>
 </def>
@@ -255,20 +243,18 @@ name_attribute = model.name_attribute
 
     <body: class="edit-page <%= model_class %>" param/>
 
-    <content:>
-      <section param="content-header">
-        <h2 param="heading">
-          <ht key="<%= model_key %>.edit.heading" name="#{name(:no_wrapper => true)}">
-            Edit <%= model_name %>
-          </ht>
-        </h2>
-        <delete-button label="#{ht '<%= model_key %>.actions.delete', :default=>['Remove This <%= sq_escape model_name %>']}" param/>
-      </section>
+    <content-header: param>
+      <h2 param="heading">
+        <ht key="<%= model_key %>.edit.heading" name="#{name(:no_wrapper => true)}">
+          Edit <%= model_name %>
+        </ht>
+      </h2>
+      <delete-button label="#{ht '<%= model_key %>.actions.delete', :default=>['Remove This <%= sq_escape model_name %>']}" param/>
+    </content-header:>
 
-      <section param="content-body">
-        <form param/>
-      </section>
-    </content:>
+    <content-body: param>
+      <form param/>
+    </content-body:>
 
   </page>
 </def>
@@ -292,48 +278,46 @@ new_link = :new.in?(actions)
 <def tag="index-for-<%= owner.dasherize %>-page" for="<%= model.name %>">
   <page merge title="#{ht '<%= model_key %>.index_for_owner.title', :count=>100, :default=>['<%= sq_escape(model_name(:plural)) %> for']} #{name :with => @<%= owner %>, :no_wrapper => true}">
     <body: class="index-for-owner-page <%= owner.dasherize %> <%= model_class %>" param/>
-    <content: param>
-      <header param="content-header">
+    <content-header: param>
 <% if linkable_owner -%>
-        <div param="back-to">
-          <t key="hobo.actions.back">Back to</t> <a with="&@<%= owner %>"/>
-        </div>
+      <div param="back-to">
+        <t key="hobo.actions.back">Back to</t> <a with="&@<%= owner %>"/>
+      </div>
 <% end -%>
-        <h2 param="heading" if="&@owner">
-          <ht key="<%= model_key %>.index_for_owner.heading" count="&@<%= owner %>.<%= collection_name %>.count">
-            <human-collection-name with="&@<%= owner %>" collection="<%= collection_name %>" your/>
-          </ht>
-        </h2>
+      <h2 param="heading" if="&@owner">
+        <ht key="<%= model_key %>.index_for_owner.heading" count="&@<%= owner %>.<%= collection_name %>.count">
+          <human-collection-name with="&@<%= owner %>" collection="<%= collection_name %>" your/>
+        </ht>
+      </h2>
 <% unless owner_is_user %>
-        <h3 param="subheading">
-          <ht key="<%= model_key %>.index_for_owner.subheading">
-            For:
-          </ht>
-          <<%= owner_tag %> with="&@<%= owner %>"/>
-        </h3>
+      <h3 param="subheading">
+        <ht key="<%= model_key %>.index_for_owner.subheading">
+          For:
+        </ht>
+        <<%= owner_tag %> with="&@<%= owner %>"/>
+      </h3>
 <% end -%>
-        <p param="count" if>
-          <ht key="<%= model_key %>.collection.count" count="&collection_count">
-            <count summary/>
-          </ht>
-        </p>
-      </header>
-
-      <section param="content-body">
+      <p param="count" if>
+        <ht key="<%= model_key %>.collection.count" count="&collection_count">
+          <count summary/>
+        </ht>
+      </p>
+    </content-header:>
+
+    <content-body: param>
 <% if new_link -%>
-        <a action="new" to="&@<%= owner %>.<%= collection_name %>" param="new-link">
-          <ht key="<%= model_key %>.actions.new" >New <%=model_name %></ht>
-        </a>
+      <a action="new" to="&@<%= owner %>.<%= collection_name %>" param="new-link">
+        <ht key="<%= model_key %>.actions.new" >New <%=model_name %></ht>
+      </a>
 
 <% end -%>
 
-        <page-nav param="top-page-nav"/>
+      <page-nav param="top-page-nav"/>
 
-        <collection param/>
+      <collection param/>
 
-        <page-nav param="bottom-page-nav"/>
-      </section>
-    </content:>
+      <page-nav param="bottom-page-nav"/>
+    </content-body:>
   </page>
 </def>
 <% end -%>
@@ -345,28 +329,26 @@ new_link = :new.in?(actions)
   <page merge title="#{ht '<%=model_key %>.new_for_owner.title', :default=>['New <%= sq_escape model_name %> for']} #{name :with => @<%= owner %>}">
     <body: class="new-for-owner-page <% owner.dasherize %> <%= model_class %>" param/>
 
-    <content: param>
-      <header param="content-header">
-        <h2 param="heading">
-          <ht key="<%= model_key %>.new_for_owner.heading">
-            New <%= collection_name.singularize.titleize %>
-          </ht>
-        </h2>
-        <h3 param="subheading">
-          <ht key="<%= model_key %>.new_for_owner.subheading">
-            For:
-          </ht>
-          <<%= owner_tag %> with="&@<%= owner %>"/>
-        </h3>
-      </header>
-
-      <section param="content-body">
-        <form owner="<%= owner %>" method="post" param>
-          <field-list: skip="<%= owner %>"/>
-          <submit: label="#{ht '<%=model_key %>.actions.create', :default=>['Create <%= sq_escape model_name %>']}"/>
-        </form>
-      </section>
-    </content:>
+    <content-header: param>
+      <h2 param="heading">
+        <ht key="<%= model_key %>.new_for_owner.heading">
+          New <%= collection_name.singularize.titleize %>
+        </ht>
+      </h2>
+      <h3 param="subheading">
+        <ht key="<%= model_key %>.new_for_owner.subheading">
+          For:
+        </ht>
+        <<%= owner_tag %> with="&@<%= owner %>"/>
+      </h3>
+    </content-header:>
+
+    <content-body: param>
+      <form owner="<%= owner %>" method="post" param>
+        <field-list: skip="<%= owner %>"/>
+        <submit: label="#{ht '<%=model_key %>.actions.create', :default=>['Create <%= sq_escape model_name %>']}"/>
+      </form>
+    </content-body:>
   </page>
 </def>
 <% end -%>
@@ -381,19 +363,17 @@ new_link = :new.in?(actions)
 
     <body: class="lifecycle-start-page <%= creator.dasherize %>-page" param/>
 
-    <content: param>
-      <header param="content-header">
-        <h2 param="heading">
-          <ht key="<%= model_key %>.<%= creator.underscore %>.heading">
-            <%= creator.titleize %>
-          </ht>
-        </h2>
-      </header>
+    <content-header: param>
+      <h2 param="heading">
+        <ht key="<%= model_key %>.<%= creator.underscore %>.heading">
+          <%= creator.titleize %>
+        </ht>
+      </h2>
+    </content-header:>
 
-      <section param="content-body">
-        <<%= creator.dasherize %>-form param="form"/>
-      </section>
-    </content:>
+    <content-body: param>
+      <<%= creator.dasherize %>-form param="form"/>
+    </content-body:>
 
   </page>
 </def>
@@ -406,19 +386,17 @@ new_link = :new.in?(actions)
 
     <body: class="lifecycle-transition-page <%= transition.dasherize -%>-page" param/>
 
-    <content:>
-      <header param="content-header">
-        <h2 param="heading">
-          <ht key="<%= model_key %>.<%= transition.underscore %>.heading">
-            <%= transition.titleize %>
-          </ht>
-        </h2>
-      </header>
-
-      <section param="content-body">
-        <<%= transition.dasherize %>-form param="form"/>
-      </section>
-    </content:>
+    <content-header: param>
+      <h2 param="heading">
+        <ht key="<%= model_key %>.<%= transition.underscore %>.heading">
+          <%= transition.titleize %>
+        </ht>
+      </h2>
+    </content-header:>
+
+    <content-body: param>
+      <<%= transition.dasherize %>-form param="form"/>
+    </content-body:>
 
   </page>
 </def>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hobo
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre5
+  version: 2.0.0.pre6
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-02 00:00:00.000000000 Z
+date: 2012-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hobo_support
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre5
+        version: 2.0.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre5
+        version: 2.0.0.pre6
 - !ruby/object:Gem::Dependency
   name: hobo_fields
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre5
+        version: 2.0.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre5
+        version: 2.0.0.pre6
 - !ruby/object:Gem::Dependency
   name: dryml
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre5
+        version: 2.0.0.pre6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre5
+        version: 2.0.0.pre6
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement