hobo 0.7.0 → 0.7.1

data/hobo_files/plugin/{tags → taglibs}/rapid_support.dryml

@@ -1,17 +1,20 @@
-<def tag="with-fields" attrs="fields, skip, skip-associations, include-timestamps, force-all"><%
-  field_names = if fields.nil? || fields == "*" || fields.is_a?(Class)
+<def tag="with-fields" attrs="fields, associations, skip, skip-associations, include-timestamps, force-all"><%
+  field_names = if associations == "has_many"
+                  this.class.reflections.values.select { |refl| refl.macro == :has_many }.map { |refl| refl.name.to_s }
+                                                                                                                
+                elsif fields.nil? || fields == "*" || fields.is_a?(Class)
                   klass = fields.is_a?(Class) ? fields : this.class
                   columns = klass.content_columns.every(:name)
                   columns -= %w{created_at updated_at created_on updated_on} unless
                     include_timestamps
 
                   if skip_associations == "has_many"
-                    assocs = this.class.reflections.values.reject {|r| r.macro == :has_many }.every(:name)
+                    assocs = this.class.reflections.values.reject {|r| r.macro == :has_many }.map &its.name.to_s
                     columns + assocs
                   elsif skip_associations
                     columns
                   else
-                    assocs = klass.reflections.values.every(:name)
+                    assocs = klass.reflections.values.map &its.name.to_s
                     columns + assocs
                   end
                 else
@@ -29,12 +32,12 @@
                   columns -= %w{created_at updated_at created_on updated_on} unless include_timestamps
 
                   if skip_associations == "has_many"
-                    assocs = this.reflections.values.reject {|r| r.macro == :has_many }.every(:name)
+                    assocs = this.reflections.values.reject {|r| r.macro == :has_many }.map &its.name.to_s
                     columns + assocs
                   elsif skip_associations
                     columns
                   else
-                    assocs = klass.reflections.values.every(:name)
+                    assocs = klass.reflections.values.map &its.name.to_s
                     columns + assocs
                   end
                 else

data/hobo_files/plugin/tasks/fix_dryml.rake

@@ -1,4 +1,3 @@
-require 'ruby-debug'
 require 'fileutils'
 
 def restore_erb_scriptlets(scriptlets, src)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: hobo
 version: !ruby/object:Gem::Version 
-  version: 0.7.0
-date: 2007-12-03 00:00:00 +00:00
+  version: 0.7.1
+date: 2007-12-23 00:00:00 +00:00
 summary: The web app builder for Rails
 require_paths: 
 - lib
@@ -76,11 +76,13 @@ files:
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/clean
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/images
+- hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/images/fieldbg.gif
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/images/pencil.png
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/images/small_close.png
+- hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/images/spinner.gif
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/stylesheets
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/stylesheets/application.css
-- hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/stylesheets/rapid_ui.css
+- hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/stylesheets/rapid-ui.css
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/views
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/views/application.dryml
 - hobo_files/plugin/generators/hobo_rapid/templates/themes/default
@@ -148,6 +150,7 @@ files:
 - hobo_files/plugin/lib/extensions.rb
 - hobo_files/plugin/lib/hobo
 - hobo_files/plugin/lib/hobo/authentication_support.rb
+- hobo_files/plugin/lib/hobo/bundle.rb
 - hobo_files/plugin/lib/hobo/composite_model.rb
 - hobo_files/plugin/lib/hobo/controller.rb
 - hobo_files/plugin/lib/hobo/dryml
@@ -178,7 +181,6 @@ files:
 - hobo_files/plugin/lib/hobo/model_support.rb
 - hobo_files/plugin/lib/hobo/password_string.rb
 - hobo_files/plugin/lib/hobo/percentage.rb
-- hobo_files/plugin/lib/hobo/plugins.rb
 - hobo_files/plugin/lib/hobo/predicate_dispatch.rb
 - hobo_files/plugin/lib/hobo/proc_binding.rb
 - hobo_files/plugin/lib/hobo/rapid_helper.rb
@@ -195,16 +197,16 @@ files:
 - hobo_files/plugin/LICENSE.txt
 - hobo_files/plugin/Rakefile
 - hobo_files/plugin/README
-- hobo_files/plugin/tags
-- hobo_files/plugin/tags/core.dryml
-- hobo_files/plugin/tags/rapid.dryml
-- hobo_files/plugin/tags/rapid_document_tags.dryml
-- hobo_files/plugin/tags/rapid_editing.dryml
-- hobo_files/plugin/tags/rapid_forms.dryml
-- hobo_files/plugin/tags/rapid_navigation.dryml
-- hobo_files/plugin/tags/rapid_pages.dryml
-- hobo_files/plugin/tags/rapid_plus.dryml
-- hobo_files/plugin/tags/rapid_support.dryml
+- hobo_files/plugin/taglibs
+- hobo_files/plugin/taglibs/core.dryml
+- hobo_files/plugin/taglibs/rapid.dryml
+- hobo_files/plugin/taglibs/rapid_document_tags.dryml
+- hobo_files/plugin/taglibs/rapid_editing.dryml
+- hobo_files/plugin/taglibs/rapid_forms.dryml
+- hobo_files/plugin/taglibs/rapid_navigation.dryml
+- hobo_files/plugin/taglibs/rapid_pages.dryml
+- hobo_files/plugin/taglibs/rapid_plus.dryml
+- hobo_files/plugin/taglibs/rapid_support.dryml
 - hobo_files/plugin/tasks
 - hobo_files/plugin/tasks/dump_fixtures.rake
 - hobo_files/plugin/tasks/environments.rake

data/hobo_files/plugin/generators/hobo_rapid/templates/themes/clean/public/stylesheets/rapid_ui.css

@@ -1,167 +0,0 @@
-.flash {
-	background: #92ab6e;
-	padding: 10px;
-	margin-top: 5px;
-	border-top: 2px solid #829862;
-	border-bottom: 2px solid #829862;
-}
-
-input.text, input.string, input.email_address, input.password, textarea {
-	border: 2px solid #444; padding: 1px;
-}
-input.file_upload {
-	background: #070707; border: 1px dotted #666;
-	color: white;
-}
-
-.button {
-	padding: 4px 8px;
-	color: white; /* background: #292929; border: 2px solid #444;*/ background: black; border: 1px solid #666;
-	font: 12px "Lucida Grande", Arial, sans-serif;
-}
-.button:hover {cursor: pointer;}
-/*.delete_button {
-  border: none; background: url(../images/small_close.png) center bottom no-repeat;
-  width: 14px; height: 15px;
-  margin: 0; padding: 0; margin-left: 5px;
-  overflow: hidden; text-indent: -300px;
-}*/
-
-.in_place_textfield_bhv, .in_place_textarea_bhv, .in_place_html_textarea_bhv {
-/*	background: #070707; border: 1px dotted #666;*/
-	padding: 0 3px;
-	background-image: url(../images/pencil.png);
-	background-position: top right;
-	background-repeat: no-repeat;
-}
-.in_place_textfield_bhv {
-	padding-right: 20px;
-}
-
-.inplaceeditor-form input, .inplaceeditor-form textarea, 
-table.new_record textarea, table.new_record input {
-	background: #070707; border: 1px dotted #666;
-	padding: 3px;	color: white; width: 100%;
-}
-.inplaceeditor-form, .inplaceeditor-form input {
-	display: inline;	
-}
-
-.login-table, .login-table td {border: none;}
-.login_table td.field_label { vertical-align: middle; }
-.login-table tr td {
-	padding-bottom: 15px;
-	padding-right: 10px;
-}
-#login-form {
-	padding-top: 20px;
-}
-#login-form .submit_button {margin-left: 68px;}
-
-/**** Admin ****/
-
-.admin-banner {
-	background: #9d0018; border-top: 2px solid #7a0013;	border-bottom: 2px solid #7a0013;
-	padding: 2px 0;
-	margin: 10px 0;
-}
-.admin-banner p, .admin-banner span {
-	font: 12px "Lucida Grande", Arial, sans-serif;
-}
-.admin-banner p, .admin-banner div {margin-bottom: 0;}
-.admin-banner a {color: white; text-decoration: none; padding: 1px 5px; font-weight: bold;}
-.admin-banner a:hover {color: #9d0018; background: white;}
-.admin-banner .logged-in {
-	float: right;
-}
-
-/* rails error message */
-.error_messages {
-	font-family: "Lucida Grande", arial, sans-serif;
-	background: #9d0018;
-	border: 1px solid #7a0013;
-	padding: 15px 30px;
-	color: white;
-	margin-bottom: 20px;
-}
-.error_messages h2 {
-	text-transform: none;
-	letter-spacing: normal;
-	color: white;
-	margin-bottom: 10px;
-}
-.error_messages li {
-	margin-left: 20px;
-}
-
-/********* everything below here came from hobo_rapid.css, needs looking at ********/
-
-/**** Default styling for Rapid ****/
-
-#ajax_progress {
-    color: grey;
-    float: right;
-    margin: 20px;
-    position: fixed;
-    background: white;
-    font-family: Tahoma "sans serif";
-    display: none;
-	z-index: 10;
-}
-
-#ajax_progress div {
-    border: 1px dashed grey;
-    margin: 10px;
-    padding: 3px;
-/*    padding-top: -15px;*/
-}
-
-#ajax_progress img {
-    padding-left: 6px;
-    vertical-align: middle;
-}
-
-
-/* Scriptaculous Autocompleter ---*/
-
-div.completions_popup {
-    position:absolute;
-    width:250px;
-    background-color:white;
-    border:1px solid #888;
-    margin:0px;
-    padding:0px;
-}
-div.completions_popup ul {
-    list-style-type:none;
-    margin:0px;
-    padding:0px;
-}
-div.completions_popup ul li.selected { background-color: #ffb;}
-div.completions_popup ul li {
-    list-style-type:none;
-    display:block;
-    margin:0;
-    padding:2px;
-    cursor:pointer;
-}
-
-
-.field_list   { width:95%; }
-.field_list td { padding: 5px; vertical-align: middle; }
-.field_list td.field_label {
-    text-align: left; width: 1px; white-space: nowrap; vertical-align: top;
-    padding-top: 10px; padding-bottom: 10px;
-}
-/*.field_list input[type=text] { width: 100%; }*/
-/*.field_list input, .field_list textarea { margin: -2px 0 0 0; }*/
-.field_list textarea { width: 100%; margin: 0; }
-/*table.login-table input {font-size: 16px; color: black;}*/
-
-/*input[type=text].wide { width: 100%; }*/
-textarea { height: 200px; }
-textarea.wide { width: 100%; }
-textarea.tall { height: 350px; }
-
-.field_list input.percentage {width: 25px; display: inline; margin-right: 5px; padding: 1px 3px;}
-

data/hobo_files/plugin/lib/hobo/plugins.rb

@@ -1,75 +0,0 @@
-module ::Hobo::Plugins
-  class HoboPlugin
-
-    def initialize(opt={})
-      @opt = opt
-      set_up_options(self.class::PLUGIN_DEFAULTS)
-
-      send @opt[:setup_using] || :default
-    end
-
-    def set_up_options(*defaults)
-      @opt = @opt.reverse_merge(*defaults)
-      make_variations(self.class::PLUGIN_SYMBOLS)
-    end
-
-    def make_variations(h)
-      h.each do |name|
-        if @opt[name] && @opt[name] != false
-          # start with :product_category
-        
-          # add :product_categories
-          @opt[name.to_s.pluralize.to_sym] = @opt[name].to_s.pluralize.to_sym 
-
-          # :ProductCategory
-          @opt[name.to_s.camelize.to_sym] = @opt[name].to_s.camelize.to_sym 
-
-          # :ProductCategories
-          @opt[name.to_s.camelize.pluralize.to_sym] = @opt[name].to_s.camelize.pluralize.to_sym 
-        
-          # :ProductCategoriesController
-          @opt[(name.to_s.camelize.pluralize+'Controller').to_sym] =
-            (@opt[name].to_s.camelize.pluralize+'Controller').to_sym
-        else
-          @opt[name.to_s.pluralize.to_sym] = false
-        end
-      end
-    end
-
-    def hobo_model(name, &b)
-      make_class(@opt ? @opt[name] : name, ActiveRecord::Base) do
-        hobo_model
-        class_eval &b if b
-      end
-    end
-
-    def resource_controller(name, &b)
-      make_class @opt[name], ApplicationController do
-        hobo_model_controller
-        
-        class_eval &b if b
-      end
-    end
-  
-    def make_class(class_name, base_class, &b)
-      opt = @opt
-      c = Class.new(base_class)
-      silence_warnings { Object.const_set(class_name, c) }
-      c.class_eval do
-        @plugin_opt = opt
-        def self.sym
-          @plugin_opt
-        end
-        def self.has_feature(name)
-          @plugin_opt[name]
-        end
-        def sym
-          self.class.sym
-        end
-      end
-      c.class_eval &b if b
-      c
-    end
-    
-  end    
-end

data/hobo_files/plugin/tags/rapid_pages.dryml

@@ -1,341 +0,0 @@
-<def tag="base-page" attrs="title, doctype">
-  <% title ||= request.request_uri %>
-  <doctype version="&doctype || 'HTML 4.01 STRICT'"/>
-  <html>
-    <head param>
-      <title param><%= title %></title>
-      <do param="stylesheets">
-        <stylesheet name="reset"/>
-        <stylesheet name="application"/>
-      </do>
-      <do param="scripts">
-        <javascript name="prototype,effects,dragdrop,controls,application"/>
-      </do>
-    </head>
-    <body onload="Hobo.applyEvents();" param>
-    </body>
-  </html>
-</def>
-
-
-<def tag="page">
-  <base-page merge>
-    <stylesheets: param>
-      <stylesheet name="reset"/>
-      <stylesheet name="hobo-rapid"/>
-      <stylesheet name="application"/>
-    </stylesheets>
-
-    <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 class="page-header" param>
-          <nav param>
-            <magic-nav class="main-nav" param="main-nav"/>
-            <account-nav if="&Hobo::UserController.user_models.first" param/>
-          </nav>
-        </header>
-        <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>
-  </base-page>
-</def>
-
-<def tag="page-without-aside" alias-of="page"/>
-<def tag="page-with-aside">
-  <page-without-aside merge>
-    <content:>
-      <section class="main-content" param="main-content">
-        <default-tagbody for="content"/>
-      </section>
-      <aside class="aside-content" param/>
-    </content>
-  </page-without-aside>
-</def>
-      
-
-<def tag="page-for-index"><page merge/></def>
-<def tag="page-for-new"><page merge/></def>
-<def tag="page-for-show"><page merge/></def>
-<def tag="page-for-edit"><page merge/></def>
-<def tag="page-for-new-in-collection"><page merge/></def>
-<def tag="page-for-show-collection"><page merge/></def>
-
-
-<def tag="index-page">
-  <% model_name = @model.name.titleize %>
-  <page-for-index title="All #{model_name.pluralize}" merge>
-    <body: class="index-page #{@model.name.underscore.pluralize}" param/>
-    <content-header: param>
-      <heading param><%= model_name.pluralize %></heading>
-      <p class="note" param>There <do with="&@model"><count part="item-count" prefix="are"/></do></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>
-  </page-for-index>
-</def>
-
-
-<def tag="new-page">
-  <page-for-new title="New #{type_name}" merge>
-    <body: class="new-page #{type_name.underscore}" param/>
-    <content-header: param>
-      <heading param>New <type-name title/></heading>
-    </content-header>
-
-    <content-body: param>
-      <error-messages param/>
-
-      <form param>
-        <field-list skip-associations="has_many" param/>
-        <submit label="Create" param/>
-      </form>
-    </content-body>
-  </page-for-new>
-</def>
-
-
-<def tag="show-page">
-  <% has_many_assocs = this.class.reflections.values.map do |refl|
-       this.send(refl.name) if Hobo.simple_has_many_association?(refl)
-     end.compact
-  %>
-  <page-for-show merge title="#{name :no_wrapper => true}">
-    <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>
-      <field-list skip="name" tag="editor" param/>
-
-      <nav param="new-links">
-        <ul with="&has_many_assocs">
-          <li:><a action="new"/></li>
-        </ul>
-      </nav>
-    </content-body>
-  </page-for-show>
-</def>
-
-
-<def tag="edit-page">
-  <page-for-edit merge>    
-    <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>
-      <error-messages param/>
-      <form param>
-        <field-list skip-associations="has_many" param/>
-        <submit label="Save"/>
-      </form>
-          
-    </content-body>
-  </page-for-edit>
-</def>
-
-
-<def tag="new-in-collection-page">
-  <page-for-new-in-collection title="New #{type_name}" merge>
-    <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>
-      <error-messages/>
-
-      <form param>
-        <field-list skip-associations="has_many" param/>
-        <submit label='Add to #{name(:with => @owner, :no_wrapper => true)}' param/>
-      </form>
-    </content-body>
-  </page-for-new-in-collection>
-</def>
-
-
-<def tag="show-collection-page">
-  <% title = "#{@reflection.name.to_s.titleize} for #{name(:with => @owner)}" %>
-  <page-for-show-collection title="&title" merge>
-    <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>
-  </page-for-show-collection>
-</def>
-
-
-<def tag="login-page" attrs="remember-me">
-  <page title="Log In" merge>
-    <body: class="login-page" param/>
-    <nav: replace/>
-    <content-header: param>
-      <heading param>Log In</heading>
-    </content-header>
-
-    <content-body: param>
-      <form action="&request.request_uri" param>
-        <labelled-item-list>
-          <labelled-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>
-          </labelled-item>
-
-          <labelled-item>
-            <item-label param="password-label">Password</item-label>
-            <item-value><input type="password" name="password" id="password" param="password-input"/></item-value>
-          </labelled-item>
-
-          <labelled-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>
-          </labelled-item>
-        </labelled-item-list>
-        <submit label='Log in' param/>
-      </form>
-    </content-body>
-  </page>
-</def>
-
-
-<def tag="signup-page">
-  <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>
-      <error-messages/>
-      <form action="&request.request_uri" param>
-        <field-list fields="login, password, password_confirmation" param>
-          <password-confirmation-label:>Confirm Password</password-confirmation-label>
-        </field-list>
-
-        <submit label='Sign Up'/>
-      </form>
-    </content-body>
-
-  </page>
-</def>
-
-
-<def tag="permission-denied-page">
-  <page merge>
-    <content-header: param>
-      <heading param>That operation is not allowed</heading>
-    </content-header>
-  </page>
-</def>
-
-<def tag="not-found-page">
-  <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
-    when "HTML 4.01 STRICT"
-      '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" ' + 
-        '"http://www.w3.org/TR/html4/strict.dtd">'
-    when "HTML 4.01 TRANSITIONAL"
-      '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ' + 
-        '"http://www.w3.org/TR/html4/loose.dtd">'
-    when "XHTML 1.0 STRICT"
-      '!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" ' + 
-        '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'
-    when "XHTML 1.0 TRANSITIONAL"
-      '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ' + 
-        '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
-    when "XHTML 1.1"
-      '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" ' + 
-        '"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">'
-  end
-%></def>
-
-<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" attrs="type">
-  <% type = type ? type.to_sym : :notice %>
-  <div class="flash #{type}" if="&flash[type]" merge-attrs><%= flash[type] %></div>
-</def>
-
-<def tag="ajax-progress">
-  <div id="ajax-progress">
-    <div>
-      <span id="ajax-progress-text"></span>
-    </div>
-  </div>
-</def>
-
-