hobo 0.5.3 → 0.6

data/hobo_files/plugin/tags/rapid_navigation.dryml

@@ -2,94 +2,94 @@
      Main nav bar, account nav bar (login, signup...), page nav
   -->
 
-
-<def tag="navigation" attrs="current, item, link_current">
-  <nav_container xattrs="">
-    <repeat obj="#item">
-      <% c = this[:content]; klass = c == current ? "current" : "" %>
-      <if q="#!link_current && c == current">
-        <nav_item class="#klass" content_option="li"><%= c %></nav_item>
-      </if>
-      <else>
-        <nav_item content_option="item_el" class="#klass">
-          <a href="#this[:href]" content_option="link"><%= c %></a>
-        </nav_item>
-      </else>
-    </repeat>
-    <tagbody/>
-  </nav_container>
+<!--- General Navigation -->
+  
+<def tag="navigation" attrs="current">
+  <ul merge_attrs>
+    <set_scoped current_navigation="&current">
+      <tagbody/>
+    </set_scoped>
+  </ul>
 </def>
 
+<def tag="nav_item">
+  <set body="&tagbody.call"/>
+  <li class="#{'current' if (c = scope.current_navigation) && c.downcase == body.downcase.strip}"
+      merge_attrs="&attributes - attrs_for(:a)">
+    <a merge_attrs="&attributes & attrs_for(:a)"><%= body %></a>
+  </li>
+</def>
 
-<def tag="nav_container"><ul xattrs=""><tagbody/></ul></def>
-
-                                                            
-<def tag="nav_item"><li xattrs=""><tagbody/></li></def>
 
+<!--- Account Navigation (log in / out / signup) -->
 
-<def tag="application_account_nav">
-  <if q="#logged_in?">
-    <div class='nav_item'>Logged in as <%= h current_user.login %></div>
-    <div class='nav_item'><a href="<%= logout_url%>">Log out</a></div>
-  </if>
-  <else>
-    <div class='nav_item'><a href="<%= login_url%>">Log in</a></div>
-    <if q="#signup_url"> <div class='nav_item'><a href="<%= signup_url%>">Sign up</a></div> </if>
-  </else>
+<def tag="account_nav">
+  <ul class="account_nav">
+    <if test="&logged_in?">
+      <li class='nav_item'>Logged in as <view:login with="&current_user"/></li>
+      <li class='nav_item'><a href="&logout_url">Log out</a></li>
+    </if>
+    <else>
+      <li class='nav_item'><a href="&login_url">Log in</a></li>
+      <li if="&defined_route? :signup" class='nav_item'><a href="&signup_url">Sign up</a></li>
+    </else>
+  </ul>
 </def>
 
 
-<def tag="previous_page_link" attrs="query_params">
-  <% opts = { :page => @pages.current.previous }.merge(query_params || {}) %>
-  <%= link_to(tagbody ? tagbody.call : '&laquo; Previous page', opts) if @pages and @pages.current.previous %>
-</def>
-
+<!--- Pagination Navigation -->
 
-<def tag="next_page_link" attrs="query_params">
-  <% opts = { :page => @pages.current.next }.merge(query_params || {}) %>
-  <%= link_to(tagbody ? tagbody.call : 'Next page &raquo;', opts) if @pages and @pages.current.next %>
+<def tag="page_nav" attrs="params">
+  <page_n_of_count/> - 
+  <first_page_link params="&params">|&lt;</first_page_link>
+  <previous_page_link params="&params">Previous</previous_page_link>
+  <next_page_link params="&params">Next</next_page_link>
+  <last_page_link params="&params">&gt|</last_page_link>
 </def>
 
 
-<def tag="first_page_link" attrs="query_params">
-  <% opts = { :page => @pages.first }.merge(query_params || {}) %>
-  <%= link_to(tagbody ? tagbody.call : '&laquo; First page', opts) if @pages and @pages.current != @pages.first %>
+<def tag="page_n_of_count">
+  Page <%= @pages.current_page.number %> of <%= @pages.length %>
 </def>
 
 
-<def tag="last_page_link" attrs="query_params">
-  <% opts = { :page => @pages.last }.merge(query_params || {}) %>
-  <%= link_to(tagbody ? tagbody.call : '&laquo; Last page', opts) if @pages and @pages.current != @pages.last %>
+<def tag="previous_page_link" attrs="params">
+  <a if="&@pages && @pages.current.previous"
+     href="&url_for({ :page => @pages.current.previous }.merge(params || {}))">
+    <tagbody>&laquo; Previous page</tagbody>
+  </a>
 </def>
 
 
-<def tag="page_n_of_count">
-  Page <%= @pages.current_page.number %> of <%= @pages.length %>
+<def tag="next_page_link" attrs="params">
+  <a if="&@pages && @pages.current.next"
+     href="&url_for({ :page => @pages.current.previous }.merge(params || {}))">
+    <tagbody>Next page &raqou;</tagbody>
+  </a>
 </def>
 
 
-<def tag="page_nav" attrs="query_params">
-  <if q="#@pages.length > 1">
-    <p>
-      <page_n_of_count/> - 
-      <first_page_link query_params="#query_params">|&lt;</first_page_link>
-      <previous_page_link query_params="#query_params">Previous</previous_page_link>
-      <next_page_link query_params="#query_params">Next</next_page_link>
-      <last_page_link query_params="#query_params">&gt|</last_page_link>
-    </p>
-  </if>
+<def tag="first_page_link" attrs="params">
+  <a if="&@pages && @pages.first_page"
+     href="&url_for({ :page => @pages.current.previous }.merge(params || {}))">
+    <tagbody>&laquo; First page</tagbody>
+  </a>
 </def>
 
-<def tag="link_to_resource" attrs="type">
-  <%= link_to type, self.send("formatted_#{model.to_s.downcase}_url", this, type.downcase) %>
+
+<def tag="last_page_link" attrs="params">
+  <a if="&@pages && @pages.last_page"
+     href="&url_for({ :page => @pages.current.previous }.merge(params || {}))">
+    <tagbody>Last page &raquo;</tagbody>
+  </a>
 </def>
 
-<def tag="link_to_resources" attrs="types">
-  <ul class="resource_list">
-    <% comma_split(types).each do |t| %>
-    <li class="<%= t.downcase %>_resource">
-      <link_to_resource type="#t" />
-    </li>
-    <% end %>
-  </ul>
+<!-- magic nav, just to get you started -->
+<!-- write your own navigation using the <navigation> tag -->
+<def tag="magic_nav">
+  <navigation merge_attrs>
+    <nav_item href="#{base_url}/">Home</nav_item>
+    <nav_item repeat="&Hobo.models[0..2]"><name/></nav_item>
+    <nav_item href="&search_url" if="&defined_route? :search">Search</nav_item>
+  </navigation>
 </def>

data/hobo_files/plugin/tags/rapid_pages.dryml

@@ -1,175 +1,248 @@
-<def tag="page" attrs="title_prefix, title">
-  <%= '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' %>
+<def tag="BasePage" attrs="title, doctype">
+  <doctype version="&doctype || 'HTML 4.01 STRICT'"/>
   <html>
-    <head>
-      <title><%= title_prefix %><%= title || human_type + ": " + display_name %></title>
-      <%= stylesheet_link_tag 'application' %>
-      <%= javascript_include_tag :defaults %>
-      <hobo_rapid_javascripts replace_option="rapid_javascripts" tiny_mce="#true"/>
+    <head param>
+      <title param><%= title %></title>
+      <do param="stylesheets">
+        <stylesheet name="hobo_base"/>
+        <stylesheet name="application"/>
+      </do>
+      <do param="scripts">
+        <%= javascript_include_tag :defaults %>
+      </do>
     </head>
-    <body onload="Hobo.applyEvents();" content_option="body">
-      <div content_option="header"/>
-      <div content_option="intro"/>
-      <div content_option="main"/>
-      <div content_option="footer"/>
+    <body onload="Hobo.applyEvents();" param>
     </body>
   </html>
 </def>
 
+<def tag="Page">
+  <BasePage merge>
+    <stylesheets>
+      <stylesheet name="hobo_base"/>
+      <stylesheet name="hobo_rapid"/>
+      <stylesheet name="application"/>
+    </stylesheets>
+    <scripts>
+      <default_tagbody/>
+      <hobo_rapid_javascripts param/>
+    </scripts>
+
+    <body param>
+      <div class="page_wrapper" param="wrapper">
+        <ajax_progress/>
+        <header id="page_header" param>
+          <div class="logo" param="logo"><image src="logo.png"/></div>
+          <nav param>
+            <magic_nav class="main_nav" param="main_mav"/>
+            <account_nav if="&respond_to? :login_url" param/>
+          </nav>
+        </header>
+        <flash_message param/>
+        <div id="page_main" param="main"></div>
+        <footer id="page_footer" param/>
+      </div>
+    </body>
+  </BasePage>
+</def>
 
-<def tag="index_page">
-  <% model_name = @model.name.titleize %>
-  <page title="All #{model_name.pluralize}" xattrs="">
-
-    <:intro>
-      <h1><%= model_name.pluralize %></h1>
-    </:intro>
+<def tag="PageForIndex"><Page merge/></def>
+<def tag="PageForNew"><Page merge/></def>
+<def tag="PageForShow"><Page merge/></def>
+<def tag="PageForNewInCollection"><Page merge/></def>
+<def tag="PageForShowCollection"><Page merge/></def>
 
-    <:main>
-      <panel replace_option="main_panel">
-        <h2 replace_option="panel_heading"><count label="#model_name"/></h2>
-        <section>
-          <table_for replace_option="table">
-            <td><object_link/></td><td><delete_button class='text'/></td>
-          </table_for>
+<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">
+          <h2><count label="&model_name"/></h2>
+        </header>
+        <section param="main_section">
+          <Table param>
+            <tr><td><a/></td><td><delete_button update="item_count"/></td></tr>
+          </Table>
         </section>
         
-        <if q="#@pages.length > 1">
-          <section replace_option="page_nav">
-            <div class="page_links">
-              <page_nav/>
-            </div>
-          </section>
-        </if>
+        <nav param="bottom_page_nav"><page_nav/></nav>
 
-        <section_if replace_option="new_link">
-          <p><new_object_link for="#@model"/></p>
-        </section_if>
+        <section param="new_link"><a to="&@model" action="new"/></section>
       </panel>
-    </:main>
-  </page>
+    </main>
+  </PageForIndex>
 </def>
 
 
-<def tag="new_page">
-  <page title="New #{human_type}" xattrs="">
-    <:intro>
-      <h1>New <human_type/></h1>
-    </:intro>
+<def tag="NewPage">
+  <PageForNew title="New #{human_type}" merge>
+    <body class="rapid_generic_page"/>
+    <main>
+      <header>
+        <heading>New <human_type/></heading>
+      </header>
 
-    <:main>
-      <panel replace_option="main_panel">
-        <h2 replace_option="pannel_heading">Details</h2>
+      <panel param="main" class="main">
+        <header param="main_header"><h2>Details</h2></header>
         <section>
-          <div class="error_messages" replace_option="error_messages">
-            <%= error_messages_for 'this' %>
-          </div>
-
-          <object_form hidden_fields="*">
-            <object_table associations="belongs_to" replace_option="fields"/>
-            <submit label="Create" class="create_button" replace_option="submit_button"/>
-          </object_form>
+          <error_messages param="error_messages"/>
+
+          <form>
+            <FieldList skip_associations="has_many"/>
+            <submit label="Create" param/>
+          </form>
         </section>
       </panel>
-    </:main>
-
-  </page>
+    </main>
+  </PageForNew>
 </def>
 
 
-<def tag="show_page">
+<def tag="ShowPage">
   <% has_many_assocs = this.class.reflections.values.map do |refl|
        this.send(refl.name) if Hobo.simple_has_many_association?(refl)
      end.compact
   %>
-  <page xattrs="">
-
-    <:intro>
-      <h1><human_type/><if q="#this.respond_to? :name">: <edit attr="name"/></if></h1>
-      <p><delete_button ajax="#false"/></p>
-    </:intro>
-    
-    <:main>
-      <panel replace_option="main_panel">
-        <h2 replace_option="panel_heading">Details</h2>
+  <PageForShow merge>    
+    <body class="rapid_generic_page"/>
+    <main>
+      <header>
+        <heading><human_type/><if test="&this.respond_to? :name">: <editor:name/></if></heading>
+        <p><delete_button in_place="&false"/></p>
+      </header>
+
+      <panel param="main_panel">
+        <header param="main_header"><h2>Details</h2></header>
         <section>
-          <object_table associations="*" skip_fields="name" replace_option="fields"/>
+          <FieldList skip="name" tag="editor" param/>
         </section>
 
-        <section_if replace_option="new_links">
-          <repeat obj="#has_many_assocs">
-            <p><new_object_link/></p>
+        <section param="new_links">
+          <repeat with="&has_many_assocs">
+            <p><a action="new"/></p>
           </repeat>
-        </section_if>
+        </section>
       </panel>
-    </:main>
-
-  </page>
+    </main>
+  </PageForShow>
 </def>
 
 
-<def tag="new_in_collection_page">
-  <page title="New #{human_type}" xattrs="">
-
-    <:intro>
-      <h1>New <human_type/></h1>
-      <h2>For: <object_link obj="#@owner" /></h2>
-    </:intro>
+<def tag="NewInCollectionPage">
+  <PageForNewInCollection title="New #{human_type}" merge>
+    <body class="rapid_generic_page"/>
+    <main>
+      <header>
+        <h1>New <human_type/></h1>
+        <h2>For: <a with="&@owner" /></h2>
+      </header>
 
-    <:main>
-      <panel replace_option="main_panel">
-        <h2 replace_option="panel_heading">Details</h2>
+      <panel param="main">
+        <header param="main_header">
+          <h2>Details</h2>
+        </header>
         <section>
-          <div class="error_messages" replace_option="error_messages">
-            <%= error_messages_for 'this' %>
-          </div>
-
-          <object_form hidden_fields="*">
-            <object_table associations="belongs_to" replace_option="fields"/>
-            <submit label='#"Add to #{display_name(:obj => @owner, :no_span => true)}"'
-                    replace_option="submit_button"/>
-          </object_form>
-        </section>
+          <error_messages param="error_messages"/>
 
+          <form>
+            <FieldList associations="belongs_to"/>
+            <submit label='Add to #{name(:with => @owner, :no_wrapper => true)}'
+                    param="submit_button"/>
+          </form>
+        </section>
       </panel>
-    </:main>
-
-  </page>
+    </main>
+  </PageForNewInCollection>
 </def>
 
 
-<def tag="show_collection_page">
-  <% title = "#{@reflection.name.to_s.titleize} for #{display_name(:obj => @owner, :no_span => true)}" %>
-  <page title="#title" xattrs="">
+<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>
 
-    <:intro>
-      <h1><%= title %></h1>
-      <h2>Back to <object_link obj="#@owner"/></h2>
-    </:intro>
+      <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>
 
-    <:main>
-      <panel replace_option="main_panel">
-        <h2 replace_option="panel_heading"><count label="#@reflection.klass.name.titleize"/></h2>
         <section>
-          <table_for replace_option="table">
-            <if_can_view><td><object_link/></td><td><delete_button class='text'/></td></if_can_view>
-          </table_for>
+          <Table param="Table">
+            <tr>
+              <if test="can_view?">
+                <td><a/></td><td><delete_button/></td>
+              </if>
+            </tr>
+          </Table>
         </section>
 
-        <if q="#@pages.length > 1">
-          <section replace_option="page_nav">
-            <div class="page_links">
-              <page_nav/>
-            </div>
-          </section>
-        </if>
+        <nav param="bottom_page_nav"><page_nav param/></nav>
 
-        <if q="#Hobo.simple_has_many_association?(@association)">
-          <section replace_option="new_link">
-            <new_object_link for="#@association"/>
+        <if test="&Hobo.simple_has_many_association?(@association)">
+          <section param="new_link">
+            <a to="&@associaton.new"/>
           </section>
         </if>
       </panel>
-    </:main>
-  </page>
+    </main>
+  </PageForShowCollection>
+</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">
+  <link href="#{base_url}/stylesheets/#{name}.css" media="#{ media || 'all' }" rel="stylesheet" type="text/css" />
 </def>
+
+<def tag="flash_message" attr="type">
+  <% type = type ? type.to_sym : :notice %>
+  <div class="flash" if="&flash[type]"><%= flash[type] %></div>
+</def>
+
+<def tag="ajax_progress">
+  <div id='ajax_progress'>
+    <div>
+      <span id="ajax_progress_text"></span><theme_image src="spinner.gif"/>
+    </div>
+  </div>
+</def>
+
+<def tag="error_messages">
+  <div class="error_messages">
+    <%= error_messages_for 'this' %>
+  </div>
+</def>
+