zena 1.0.0.rc2 → 1.0.0.rc3

data/app/views/nodes/_parent.rhtml

@@ -5,8 +5,7 @@
     <div class='hidden'><input type='hidden' name='drive' value='parent'/></div>
     <% if @node[:parent_id] %><li><label><%= _('parent') %></label><%= select_id('node', 'parent_id') %></li><% end -%>
     <li><label><%= _('class') %></label><%= select('node', 'klass', @node.class.change_to_classes_for_form) %></li>
-    <li><label><%= _('name') %></label><%= text_field('node', 'title', :size=>15) %></li>
-    <% if @node.kind_of?(Page) -%>
+    <% if @node.vkind_of?('Page') -%>
     <li><label><%= _('custom base url') %></label><%= check_box('node', 'custom_base') %></li>
     <% end -%>
     <li class='submit'><%= submit_tag _('change') %></li>

data/app/views/nodes/update.rjs

@@ -16,14 +16,13 @@ elsif upd = params[:drive]
       page.replace_html "#{upd}_errors", :inline => @errors ? render_errors : error_messages_for(:node, :object => @node)
     else
       page.replace upd, :partial => upd
-      page.replace 'messages', :inline => flash_messages
+      page.replace 'flash_messages', :inline => flash_messages(:page => page)
       page.visual_effect :highlight, upd
-      page.visual_effect :fade, 'notice', :duration => 3
     end
   else
     flash['error'] = "unknown 'drive' parameter #{upd.inspect}"
-    page.replace 'messages', :inline => flash_messages
+    page.replace 'flash_messages', :inline => flash_messages(:page => page)
   end
 else
   update_page_content(page, @node)
-end
+end

data/app/views/relations/index.erb

@@ -1,4 +1,4 @@
-<h2 class='title'><%= _('manage relations') %></h2>
+<h2 class='title'><%= _('relations') %></h2>
 <table id='relation_list' class='admin' cellspacing="0">
   <tr><th class='nav' colspan='9'><%= will_paginate @relations %></th></tr>
   <%= render :partial=>'relations/li',  :collection=>@relations %>

data/app/views/sites/index.erb

@@ -1,4 +1,4 @@
-<h2 class='title'><%= _('manage sites') %></h2>
+<h2 class='title'><%= _('sites') %></h2>
 
 <table id='site_list' class='admin' cellspacing="0">
   <tr><th class='nav' colspan='10'><%= will_paginate @sites %>

data/app/views/templates/drive_tabs/_drive.rhtml

@@ -6,6 +6,4 @@
 
 <% end -%>
 
-<%= render :partial=>'nodes/dates'    %>
-
 <%= render :partial=>'nodes/position' %>

data/app/views/templates/edit_tabs/_image.rhtml

@@ -6,7 +6,7 @@
 <label for="crop_x"><%= _("image")  %></label>
 <div id="crop" class='toggle_div'>
   <div class='img_left'><%= link_to_remote(img_tag(@node,:mode=>'pv'), :url => crop_form_document_path(@node[:zip]), :method => :get) %></div>
-  <ul class='infos'>
+  <ul class='crop_options'>
     <li><%= link_to_remote(_("crop/resize"), :url => crop_form_document_path(@node[:zip]), :method => :get) %></li>
     <li><%= _('original') %> <%= @node.width %>px / <%= @node.height %>px</li>
     <li><%= _('size') %> <%= fsize(@node.size) %></li>

data/app/views/templates/edit_tabs/_title.rhtml

@@ -7,12 +7,6 @@
 <label for='v_lang'><%= _("language") %></label>
 <%= select 'node', 'v_lang', current_site.lang_list.map {|l| [_(l), l]} %>
 
-<% if @node.kind_of?(Note) -%>
-<label for='log_at'><%= _("log date") %></label>
-<%= date_box(@node, 'log_at')%>
-<label for='event_at'><%= _("event date") %></label>
-<%= date_box(@node, 'event_at')%>
-<% end -%>
 <label><%= _('publication date') %></label>
 <%= date_box(@node, 'v_publish_from') %>
 <label for="summary"><%= _("summary")  %></label>

data/app/views/users/index.rhtml

@@ -1,4 +1,4 @@
-<h2 class='title'><%= _('manage users') %></h2>
+<h2 class='title'><%= _('users') %></h2>
 
 <table id='user_list' class='admin' cellspacing="0">
   <tr><th class='nav' colspan='5'><%= will_paginate @users %></th></tr>

data/app/views/users/preferences.html.erb

@@ -1,6 +1,6 @@
-<h3><%= @user.login %> : <%= _('preferences') %> </h3>
+<h2 class='title'><%= @user.login %> : <%= _('preferences') %> </h2>
 
-<ul class='actions' id='preferences'>
+<ul class='actions admin_group' id='preferences'>
 
   <li>
     <div id='user_info'>

data/app/views/versions/backup.rjs

@@ -4,7 +4,7 @@ else
   page << "try {"
   page.replace_html 'original_caution', :inline=>""
   page << "} catch(err) {}"
-  page.replace 'messages', :inline => flash_messages
+  page.replace 'messages', :inline => flash_messages(:page => page)
   page['node_v_id'].value = @node.v_id
   if flash[:notice]
     flash[:notice] = nil

data/app/views/versions/custom_tab.rhtml

@@ -1,5 +1,10 @@
-<% @node.schema.columns.each do |name, col| -%>
-<% next if %w{title text summary}.include?(name) || !@node.safe_method_type([name]) -%>
-  <label for='<%= col.name %>'><%= _(col.name) %></label>
-  <%= text_area 'node', col.name, :cols => nil, :rows => 1, :value => @node.prop[col.name], :class => 'full_width' %>
+<% @node.schema.columns.each do |col_name, col| -%>
+  <% next if %w{title text summary}.include?(col_name) || !@node.safe_method_type([col_name]) -%>
+  <label for='<%= col_name %>'><%= _(col_name) %></label>
+  <% case col.ptype
+     when :datetime %>
+    <%= date_box(@node, col_name, :size=>15) %>
+  <% else %>
+    <%= text_area 'node', col_name, :cols => nil, :rows => 1, :value => @node.prop[col_name], :class => 'full_width' %>
+  <% end %>
 <% end -%>

data/app/views/versions/destroy.rjs

@@ -1,6 +1,6 @@
 # only called when the last version is destroyed in 'drive' popup
-page.replace "messages", :inline => flash_messages
-page.replace "versions", :partial => 'list'
+page.replace 'flash_messages', :inline => flash_messages(:page => page)
+page.replace 'versions', :partial => 'list'
 page.delay(0.3) do
   page << " if (parent != window) {
    parent.Zena.version_preview('#{zen_path(@node.parent)}');

data/app/views/versions/update.rjs

@@ -1,9 +1,2 @@
-page.replace "messages", :inline => flash_messages
-if flash[:notice]
-  flash[:notice] = nil
-  page.visual_effect :fade, 'notice', :duration => 5.0
-elsif flash[:error]
-  flash[:error] = nil
-  page.visual_effect :fade, 'error', :duration => 5.0
-end
-page.replace "versions", :partial => 'list'
+page.replace "versions", :partial => 'list'
+page.replace 'flash_messages', :inline => flash_messages(:page => page)

data/app/views/virtual_classes/_form.erb

@@ -26,16 +26,17 @@
     </tr>
     <tr>
       <td class='label'><%= _('kpath') %></td>
-      <td><b><%= @virtual_class.kpath %></b><td>
+      <td><b><%= @virtual_class.kpath %></b></td>
     </tr>
     <tr><td class='label'><%= _('superclass')%></td><td><%= select('virtual_class', 'superclass',  Node.classes_for_form(:without => ((@virtual_class.new_record? || @virtual_class.kind_of?(Role)) ? nil : @virtual_class.to_s)), :selected => @virtual_class.superclass.to_s ) %></td></tr>
 
 <% if @virtual_class.kind_of?(VirtualClass) -%>
 <% Zena::Use::Fulltext::FULLTEXT_FIELDS.reverse_each do |fld| -%>
     <tr><td class='label'><%= _(fld)%></td><td><%= text_area('virtual_class', fld, :rows => 2, :cols => 30) %></td></tr>
-<% end -%>    
+<% end -%>
     <tr><td class='label'><%= _('idx_class')%></td><td><%= select('virtual_class', 'idx_class', Zena::Use::ScopeIndex.models_for_form) %></td></tr>
     <tr><td class='label'><%= _('idx_scope')%></td><td><%= text_area('virtual_class', 'idx_scope', :rows => 2, :cols => 30) %></td></tr>
+    <tr><td class='label'><%= _('idx_reverse_scope')%></td><td><%= text_area('virtual_class', 'idx_reverse_scope', :rows => 2, :cols => 30) %></td></tr>
     <tr><td class='label'><%= _('prop eval')%></td><td><%= text_area('virtual_class', 'prop_eval', :rows => 2, :cols => 30) %></td></tr>
 
     <tr><td class='label'><%= _('create group')%></td><td><%= select('virtual_class', 'create_group_id',  visitor.all_groups.map{|g| [g.name, g.id]} ) %></td></tr>

data/app/views/virtual_classes/import_prepare.html.erb

@@ -0,0 +1,13 @@
+<h2 class='title'><%= _('classes import') %></h2>
+
+<div class='zazen role_diff'><%= @diff %></div>
+
+<div class='admin_group'><h3><%= _('import definitions') %></h3>
+
+<%= form_tag({ :controller => 'virtual_classes', :action => 'import'}) %>
+<p><%= hidden_field_tag(:roles, @yaml) %></p>
+<p class="btn_validate">
+  <%= link_to(_('cancel'), :action => 'index')%> &nbsp;
+  <input type="submit" value='<%= _('apply') %>'/></p>
+</form>
+</div>

data/app/views/virtual_classes/index.erb

@@ -1,4 +1,6 @@
-<h2 class='title'><%= _('manage classes') %></h2>
+<h2 class='title'><%= _('classes') %></h2>
+
+<%= flash_messages %>
 
 <table id='virtual_class_list' class='admin' cellspacing="0">
   <tr><th class='nav' colspan='4'><%= will_paginate @virtual_classes %></th></tr>
@@ -6,10 +8,28 @@
   <%= render :partial=>'virtual_classes/add' %>
 </table>
 
-<div class='admin_group'><h3><%= _('import definitions') %></h3>
-
-<%= form_tag({ :controller => 'virtual_classes', :action => 'import'}, {:multipart => true} ) %>
-<input style='line-height:1.5em;' name="attachment" class='file' type="file" />
-<p class="btn_validate"><input type="submit" value='<%= _('import') %>'/></p>
-</form>
-</div>
+<div class='admin_group'>
+  <% if @roles_backup -%>
+    <h3><%= _('import') %></h3>
+    <%= form_tag({ :controller => 'virtual_classes', :action => 'import'}) %>
+      <p>
+        <%= hidden_field_tag(:roles, @roles_backup) %>
+        <%#= hidden_field_tag(:delete_roles, '1') %>
+      </p>
+      <p class="btn_validate">
+        <%= link_to(_('back'), :action => 'index')%> &nbsp;
+        <input type="submit" value='<%= _('revert') %>'/>
+      </p>
+    </form>
+  <% else -%>
+    <h3><%= link_to(_('export'), :action => 'export') %></h3>
+    <h3><%= _('import') %></h3>
+    <%= form_tag({ :controller => 'virtual_classes', :action => 'import_prepare'}, {:multipart => true} ) %>
+    <p><input style='line-height:1.5em;' name="attachment" class='file' type="file" /></p>
+    <p class="btn_validate">
+      <%= link_to(_('cancel'), :action => 'index')%> &nbsp;
+      <input type="submit" value='<%= _('diff') %>'/>
+    </p>
+    </form>
+  <% end -%>
+</div>

data/app/views/zafu/default/Node-+adminLayout.zafu

@@ -1,16 +1,4 @@
-<r:include template='$default/Node'>
-  <r:with part='stylesheets'>
-    <r:stylesheets/>
-    <r:stylesheets list='default,admin'/>
-    <link href="style.css" rel="Stylesheet" type="text/css"/>
-  </r:with>
-
-  <r:with part='context'>
-    <ol class='admin_links' do='admin_links'>
-      <li do='each' do='show'><a href='#'>do this</a></li>
-    </ol>
-  </r:with>
-  <r:with part='title'/>
+<r:include template='$default/Node-admin'>
   <r:with part='content' do='content_for_layout'>
     <r:include template='Node' part='title'/>
     <div id='related' do='visitor'>

data/app/views/zafu/default/Node-+login.zafu

@@ -20,6 +20,7 @@ td { padding:5px; }
 <body do='void' name='body'>
     <div id='login_form'>
       <p class='welcome' do='link'><r:t>Login for</r:t> <b do='title'/></p>
+      <r:flash_messages/>
       <form action="/session" method="post">    <table>
           <tr>
             <td><label for='user_login' do='trans'>User name:</label></td>

data/app/views/zafu/default/Node-+notFound.zafu

@@ -1,4 +1,4 @@
-<r:include template='Node'>
+<r:include template='$default/Node'>
   <r:with part='menu'/>
   <r:with part='visitor'/>
   <r:with part='search'/>

data/app/views/zafu/default/Node-+popupLayout.zafu

@@ -15,8 +15,7 @@
 <body>
   <div id='loader'><img src='/images/ajax-loader.gif'/> <r:trans text='uploading'/></div>
 
-  <div id='messages'>
-  </div>
+  <r:flash_messages/>
 
 <r:content_for_layout/>
 

data/app/views/zafu/default/Node-+search.zafu

@@ -1,4 +1,4 @@
-<r:include template='Node'>
+<r:include template='$default/Node'>
   <r:with part='title'/>
   <r:with part='container'>
 

data/app/views/zafu/default/Node-admin.zafu

@@ -0,0 +1,205 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<r:if test='visitor.is_anon?' do='not_found'/>
+<html xmlns='http://www.w3.org/1999/xhtml' lang='#{v.lang}' xml:lang='en' do='load' dictionary='translations' missing='ignore'>
+<head do='void' name='head'>
+  <title do='title_for_layout' do='show' attr='title' name='page_title'>page title</title>
+  <!-- link href='favicon.png' rel='shortcut icon' type='image/png' / -->
+  <meta http-equiv='Content-type' content='text/html; charset=utf-8' />
+  <r:void name='stylesheets'>
+    <r:stylesheets/>
+    <r:stylesheets list='backend,admin,comment'/>
+  </r:void>
+
+  <r:javascripts/>
+  <r:uses_datebox/>
+</head>
+<body>
+  <h1 id='logo' do='link' href='root' mode='admin' do='t'>admin_interface</h1>
+  <div id='container'>
+    <div id='navigation'>
+      <ul id='menu' do='admin_links'>
+        <li do='each' do='show'>x</li>
+      </ul>
+    </div>
+
+    <div id='content'>
+      <h1 id='title'><r:title/> <span class='klass'>(<r:klass/>)</span></h1>
+      <div id='preview'>
+        <h2 class='preview' do='link' do='t'>view_live</h2>
+        <r:Image?>
+          <table class='med_prev'><tr><td  do='link' update='crop' crop='true'>
+            <r:img mode='med'/>
+            <span class='crop'>
+              <img src='/images/cut_red.png' title='#{t("crop")}'/>
+            </span>
+          </td></tr></table>
+          <r:else do='zazen' attr='text' live='true' code='#{content_lang}'/>
+        </r:Image?>
+      </div>
+
+      <div id='actions'>
+        <r:if test='can_edit?'>
+          <label do='t("edit #{klass}")'/>
+          <r:Image?>
+            <div id='crop' do='block' do='if' test='params[:crop]'>
+              <p do='else'>
+                <r:void actions='edit'/>
+                <r:link update='crop' crop='true'>
+                  <img src='/images/cut_red.png'/> <r:t>crop</r:t>
+                </r:link>
+              </p>
+              <p do='link' id='crop_x' update='crop'><r:t>btn_x</r:t> <r:t>cancel</r:t></p>
+              <!-- JS trigger must run effect before crop editor -->
+              <r:js>$$('#crop>div').each(function(o) { new Effect.Appear(o, {duration:0.5}) });</r:js>
+              <div class='mask' style='display:none;'>&nbsp;</div>
+              <!--div class='wrap' style='display:none;' onclick='$("crop_x").onclick();'>
+                <div class='win' onclick='Event.stop(event);return false;' -->
+
+              <div class='wrap' style='display:none;'>
+                <div class='win'>
+                  <p class='btn'>
+                    <p class='backup'><input name='node[v_backup]' type='checkbox' value='true' checked='checked'/><r:t>backup</r:t></p>
+                    <input type='submit' value='#{t("crop")}'/>
+                    <p do='link' update='crop' do='t'>btn_x</p>
+                  </p>
+                  <div class='crop_ed' do='crop'/>
+                </div>
+              </div>
+            </div>
+            <r:else>
+              <p do='void' actions='edit'/>
+            </r:else>
+          </r:Image?>
+        </r:if>
+        <r:if test='can_publish?'>
+          <label do='t("publish #{klass}")'/>
+          <p do='void' actions='publish'/>
+        </r:if>
+        <r:if test='can_drive?'>
+          <label do='t("move/manage versions")'/>
+          <p do='void' actions='drive'/>
+        </r:if>
+      </div> <!-- actions -->
+
+      <div id='form' do='form'>
+        <r:if test='can_edit?' do='default' label='t'>
+          <r:input type='submit'/>
+          <input type='hidden' name='redir' value='#{path(this, :mode =&gt; "admin")}'/>
+          <div do='vclass' do='roles'>
+            <fieldset do='each'>
+              <legend do='name'/>
+              <ul class='columns' do='columns'>
+                <li do='each' do='textarea'/>
+              </ul>
+            </fieldset>
+          </div>
+          <r:input type='submit'/>
+        </r:if>
+      </div> <!-- form -->
+
+      <div id='browser'>
+        <div class='wrap'>
+          <div id='query'>
+            <div class='search' do='filter' live='true'>
+              <r:input param='qb'/>
+            </div>
+            <div id='qb_list' do='block' do='query' default='nodes in site limit 30 paginate p' select='#{params[:qb] || "nodes in site"} limit 30 paginate p' set_ref='this' set_epar='"qb"'>
+              <div class='pages'><r:t>page</r:t>: <r:link page='list' page_count='6' update='qb_list' encode_params='#{epar}'/> (<r:count/> <r:t>rec.</r:t>)</div>
+              <ul>
+                <r:include template='$default/Node-admin' part='elem'/>
+              </ul>
+              <r:elsif test='query_errors'>
+                <div class='pages error' do='query_errors'/>
+              </r:elsif>
+              <r:else>
+                <div class='pages' do='t'>not_found</div>
+                <ul></ul>
+              </r:else>
+            </div>
+          </div> <!-- #query -->
+          <div id='parents'>
+            <div class='search' do='filter' live='true'>
+              <r:input param='f1'/>
+              <r:select param='k1' root_class='Node' attr='kpath'/>
+            </div>
+            <div id='par_list' do='block' do='children where kpath like "#{params[:k1]}%" and title like "%#{params[:f1]}%" from parent from parent limit 30 paginate p' set_ref='parent' set_epar='"k1,f1,qb"'>
+              <div class='pages'><r:t>page</r:t>: <r:link page='list' page_count='6' update='par_list' encode_params='#{epar}'/> (<r:count/> <r:t>rec.</r:t>)</div>
+              <ul>
+                <li do='each' alt_class='stripe' on_if='id == ref.id' name='elem'>
+                  <r:Image?>
+                    <r:img mode='tipop'/>
+                    <r:else>
+                      <img src='#{vclass.icon || "/images/brick.png"}'/>
+                    </r:else>
+                  </r:Image?>
+                  <r:link mode='admin' encode_params='#{epar}'>
+                    <span class='id' do='id'/>
+                    <r:Document?>
+                      <r:show text='#{title.limit(14)}.#{ext}'/>
+                      <r:else do='title.limit(23)'/>
+                    </r:Document?>
+                  </r:link>
+                </li>
+              </ul>
+              <r:else do='parent'>
+                <!-- no grand-parent -->
+                <div class='pages'><r:if test='!parent_id'><r:t>root_node</r:t><r:else do='t'>not_found</r:else></r:if></div>
+                <ul>
+                  <r:include template='$default/Node-admin' part='elem' method='void'/>
+                </ul>
+                <r:else><!-- no parent -->
+                  <div class='pages' do='t'>no_parent</div>
+                  <ul>
+                  </ul>
+                </r:else>
+              </r:else>
+            </div>
+          </div> <!-- #parents -->
+          <div id='siblings'>
+            <div class='search' do='filter' live='true'>
+              <r:input param='f2'/>
+              <r:select param='k2' root_class='Node' attr='kpath'/>
+            </div>
+            <div id='sib_list' do='block' do='children where kpath like "#{params[:k2]}%" and title like "%#{params[:f2]}%" from parent limit 30 paginate p' set_ref='this' set_epar='"k2,f2,qb"'>
+              <div class='pages'><r:t>page</r:t>: <r:link page='list' page_count='6' update='sib_list' encode_params='#{epar}'/> (<r:count/> <r:t>rec.</r:t>)</div>
+              <ul>
+                <r:include template='$default/Node-admin' part='elem'/>
+              </ul>
+              <r:else>
+                <!-- no parent, just show self -->
+                <div class='pages'><r:if test='!parent_id'><r:t>root_node</r:t><r:else do='t'>not_found</r:else></r:if></div>
+                <ul>
+                  <r:include template='$default/Node-admin' part='elem' method='void'/>
+                </ul>
+              </r:else>
+            </div>
+          </div> <!-- #siblings -->
+          <div id='children'>
+            <div class='search' do='filter' live='true'>
+              <r:input param='f3'/>
+              <r:select param='k3' root_class='Node' attr='kpath'/>
+            </div>
+            <div id='ch_list' do='block' do='children where kpath like "#{params[:k3]}%" and title like "%#{params[:f3]}%" limit 30 paginate p' set_epar='"k3,f3,qb"'>
+              <div class='pages'><r:t>page</r:t>: <r:link page='list' page_count='6' update='ch_list' encode_params='#{epar}'/> (<r:count/> <r:t>rec.</r:t>)</div>
+              <ul>
+                <r:each set_ref='main' do='include' template='$default/Node-admin' part='elem' method='void'/>
+                <li class='add' do='add' do='t'>add_object</li>
+                <li class='add_doc' do='add_document' do='t'>upload_document</li>
+                <li do='form'><r:select name='klass' root_class='Node'/> <r:input name='title'/> <r:input type='submit'/></li>
+              </ul>
+            </div>
+          </div> <!-- #children -->
+
+          <r:js>
+          // TODO: scroll only in browser DIV
+          // $$('#browser .on').each(function(o) {
+          //   o.scrollIntoView(true);
+          // });
+          </r:js>
+        </div> <!-- .wrap -->
+      </div> <!-- #browser -->
+    </div> <!-- content -->
+  </div>
+</body>
+</html>

data/app/views/zafu/default/Node.zafu

@@ -1,13 +1,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" do='void' lang="#{v_lang}" xml:lang='en'>
+<html xmlns="http://www.w3.org/1999/xhtml" do='void' lang="#{v.lang}" xml:lang='en'>
 <head do='void' name='head'>
   <title do='title_for_layout' do='show' attr='title' name='page_title'>page title</title>
   <link href='favicon_tiny.png' rel='shortcut icon' type='image/png' />
   <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
   <r:void name='stylesheets'>
     <r:stylesheets media='all'/>
-    <r:stylesheets media='all' list='default'/>
+    <r:stylesheets list='default'/>
   </r:void>
 
   <r:javascripts/>
@@ -18,10 +18,10 @@
   <div id='top' do='root' do='link'/>
   <div id='header'>
     <div id='login' do='login_link'/>
-    <div id='visitor' do='visitor_link'/>
+    <div id='visitor'><r:visitor_link/> <r:if test='can_edit?' do='link' mode='admin' do='t'>btn_edit</r:if></div>
     <div id='search' do='search_box' type='search'/>
     <ol id='menu' do='root' do='pages'>
-      <li do='each' on_if_node='ancestor' do='link'/>
+      <li do='each' on_if='is_ancestor?(main)' do='link'/>
     </ol>
   </div>
   <div id='container'>
@@ -34,8 +34,8 @@
           <li class='inline_form' do='form'>
             <ol>
               <li><r:select name='klass' root_class='Page'/></li>
-              <li><input type='text' name='title' value=''/></li>
-              <li class='validate'><input type="submit" value='#{trans("validate")'/></li>
+              <li><r:input type='text' name='title' value=''/></li>
+              <li class='validate'><r:input type="submit" value='#{trans("validate")'/></li>
             </ol>
           </li>
         </ol>
@@ -49,7 +49,7 @@
       <div id='related'>
         <r:documents name='documents'><h3 do='trans'>documents</h3>
           <ol>
-            <li do='each' do='if' test='can_write?'>
+            <li do='each' do='if' eval='can_write?'>
               <r:link><r:img mode='tiny'/> <r:show attr='title'/>.<r:show attr='ext'/></r:link>
               <r:else>
                 <r:link format='data'><r:img mode='tiny'/> <r:show attr='title'/>.<r:show attr='ext'/></r:link>
@@ -64,8 +64,8 @@
             <li do='add' before='self'/>
             <li class='inline_form' do='form'>
               <p class='node_klass'>  <r:select name='klass' root_class='Page'/></p>
-              <p class='node_title'><input type='text' name='title' value=''/></p>
-              <p class='btn_validate'><input type="submit" value='#{trans("validate")}'/></p>
+              <p class='node_title'><r:input type='text' name='title' value=''/></p>
+              <p class='btn_validate'><r:input type="submit" value='#{trans("validate")}'/></p>
             </li>
           </ol>
         </r:pages>
@@ -75,8 +75,8 @@
             <li do='add' before='self'/>
             <li class='inline_form' do='form'>
               <p class='node_klass'>  <r:select name='klass' root_class='Node'/></p>
-              <p class='node_title'><input type='text' name='title' value=''/></p>
-              <p class='btn_validate'><input type="submit" value='#{trans("validate")}'/></p>
+              <p class='node_title'><r:input type='text' name='title' value=''/></p>
+              <p class='btn_validate'><r:input type="submit" value='#{trans("validate")}'/></p>
             </li>
           </ol>
         </r:nodes>

data/bricks/captcha/lib/bricks/captcha.rb

@@ -8,8 +8,9 @@ module Bricks
       include ReCaptcha::AppHelper
 
       private
-        def save_if_not_spam(obj, params)
-          (!visitor.is_anon? || validate_recap(params, obj.errors, :rcc_pub => current_site.prop['recaptcha_pub'], :rcc_priv => current_site.prop['recaptcha_priv'])) && obj.save
+        def should_save(obj, params)
+          !visitor.is_anon? ||
+          validate_recap(params, obj.errors, :rcc_pub => current_site.prop['recaptcha_pub'], :rcc_priv => current_site.prop['recaptcha_priv'])
         end
     end
 

data/bricks/mongrel/zena/init.rb

@@ -1,7 +1,8 @@
 # This fixes a bug between Rails 2.3.8 and Mongrel
 # Error calling Dispatcher.dispatch #<NoMethodError: undefined method `[]' for nil:NilClass>
 #
-if Rails.version == '2.3.8' && Gem.available?('mongrel', Gem::Requirement.new('~>1.1.5')) && self.class.const_defined?(:Mongrel)
+
+if Rails.version =~ /2\.3\.\d+/ && Gem.available?('mongrel', Gem::Requirement.new('~>1.1.5')) && self.class.const_defined?(:Mongrel)
 
   # Pulled right from latest rack. Old looked like this in 1.1.0 version.
   #

data/bricks/pdf/README

@@ -18,16 +18,16 @@ There is one method "render" that takes a hash as argument.
 
 == Examples
 
-    Bricks::PDF.engine = 'prince'
+    Bricks::Pdf.engine = 'prince'
 
-    Bricks::PDF.render :input => "myfile.html"
+    Bricks::Pdf.render :input => "myfile.html"
     => STDOUT
 
-    Bricks::PDF.render :input => "myfile.html", :output => "out.pdf"
+    Bricks::Pdf.render :input => "myfile.html", :output => "out.pdf"
     => out.pdf      (file)
 
-    Bricks::PDF.render :data  => "This is text to render."
+    Bricks::Pdf.render :data  => "This is text to render."
     => STDOUT       (strings)
 
-    Bricks::PDF.render :data  => "This is text to render.", :output => "out.pdf"
+    Bricks::Pdf.render :data  => "This is text to render.", :output => "out.pdf"
     => out.pdf      (file)

data/bricks/pdf/lib/bricks/pdf/engine/prince.rb

@@ -1,5 +1,5 @@
 module Bricks
-  module PDF
+  module Pdf
     module Engine
       module Prince
         def command(opts)
@@ -31,7 +31,7 @@ module Bricks
         end
       end # Prince
     end # Engine
-  end # PDF
+  end # Pdf
 end # Bricks