zena 1.0.0.beta3 → 1.0.0.rc1

data/app/views/columns/_form.html.erb

@@ -23,7 +23,7 @@
       <td><span class='constant'><%= select('column', 'role_id', Column.roles_for_form  ) %></span></td>
       <td><span class='text'><%= select('column', 'ptype',   Column::TYPES_FOR_FORM ) %></span></td>
       <td><%= text_field('column', 'name',  :size=>15 ) %></td>
-      <td><span class='text'><%= select('column', 'index',   Column::INDICES_FOR_FORM, :include_blank => true ) %></span></td>
+      <td><span class='text'><%= select_tag "column[index]", grouped_options_for_select(Column.indices_for_form, @column.index, '') %></span></td>
     </tr>
     <tr><td colspan='4'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
   </table>

data/app/views/columns/_li.html.erb

@@ -7,6 +7,6 @@
     <span class='spacer'><%= (li.role.kind_of?(VirtualClass) ? '+ ' : '<span>* </span>') %></span>
     <span class='constant'><%= li.role.name %></span>
     <span class='text'>p.<%= li.ptype %></span>
-    <span class='string'>'<%= li.name %>'<span><%= li.import_result ? " (#{li.import_result})" : ''%><% if !li.index.blank? -%>, <span class='symbol'>:index</span> =&gt; <span class='symbol'>:<%= li.index %></span><% end -%>
+    <span class='string'>'<%= li.name %>'<span><%= li.import_result ? " (#{li.import_result})" : ''%><% if !li.index.blank? -%>, <span class='symbol'>:index</span> =&gt; <span class='symbol'>:<%= li.index_name %></span><% end -%>
   </td>
 </tr>

data/app/views/comments/_form.rhtml

@@ -11,7 +11,7 @@ end %>
   <% else -%>
     <p class="btn_x"><%= link_to_function _('btn_x'), "['add_comment#{node.zip}', 'add_comment_form#{node.zip}'].each(Element.toggle);" %></p>
   <% end  -%>
-  <label for="author_name"><%= _("author")  %></label> <%= visitor.is_anon? ? text_field('comment', 'author_name', :size=>25) : visitor.fullname %>
+  <label for="author_name"><%= _("author")  %></label> <%= visitor.is_anon? ? text_field('comment', 'author_name', :size=>25) : visitor.login %>
   <label for="title"><%= _("title")  %></label> <%= text_field('comment', 'title', :size=>25) %>
 </div>
 <div class='body'>

data/app/views/comments/_li.rhtml

@@ -4,7 +4,7 @@
     <%= link_to_remote(_('btn_publish'), :url=> publish_comment_path(:id=>li[:id], :bin=>@admin), :method => :put) if li[:status] < Zena::Status[:pub] %>
     </span>
     <span class='date'><%= long_date(li.created_at) + " " + short_time(li.created_at) %></span>
-    <span class='sign'><%= li.author_name || li.author.fullname %></span>
+    <span class='sign'><%= li.author_name || li.author.login %></span>
     <span class='title'><%= make_link(:node => li.discussion.node, :title => "#{li.discussion.node.title}#{li.title.blank? ? '' : " / #{li.title}"}") %></span>
   </div>
   <div class='body'>

data/app/views/comments/_li_simple.rhtml

@@ -1,3 +1,3 @@
 <li id='comment<%= li_simple[:id] %>' <%= "class='c40' " if li_simple[:status] < Zena::Status[:pub] %>>
-    <a href='<%= url_for(:controller=>'main', :action=>'show', :path=>li_simple.discussion.node.fullpath.split('/')) %>'><span class='title'><%= li_simple.title %></span> <span class='sign'><%= li_simple.author_name || li_simple.author.fullname %></span></a>
+    <a href='<%= url_for(:controller=>'main', :action=>'show', :path=>li_simple.discussion.node.fullpath.split('/')) %>'><span class='title'><%= li_simple.title %></span> <span class='sign'><%= li_simple.author_name || li_simple.author.login %></span></a>
 </li>

data/app/views/groups/_form.rhtml

@@ -18,7 +18,7 @@
       <tr><td class='label'><%= _('name')%>       </td><td><%= text_field('group', 'name',        :size=>15 ) %></td></tr>
       <tr><td class='label'><%= _('users')%>      </td><td>
         <%= @users.inject([]) do |list, u|
-          unless u.is_anon? || u.is_su?
+          unless u.is_anon?
             if (@group[:id] == visitor.site.public_group_id) || (@group[:id] == visitor.site.site_group_id)
               list << "<input type='checkbox' name='group[user_ids][]' value='#{u.id}' class='box' checked='1' disabled='1'/>#{u.login}"
             else

data/app/views/links/_li.rhtml

@@ -1,6 +1,6 @@
 <tr id='link<%= li.link_id %>'>
   <td class="box"><%= link_to_remote( relation.other_icon.blank? ? _('img_link') : relation.other_icon, :update=>"link#{li.link_id}", :url => edit_node_link_path(:node_id => @node[:zip], :id => li.link_id), :method=>:get) %></td>
-  <td class="path" ><%= link_to( li.rootpath, zen_path(li), :popup=>true ) %></td>
+  <td class="path" ><%= link_to( li.short_path, zen_path(li), :popup=>true ) %></td>
   <td class="status" ><%= li.l_status %></td>
   <td class="comment" ><%= li.l_comment %></td>
   <td class="actions"> <%= link_to_remote(_('btn_tiny_del'), :url => node_link_path(:node_id => @node[:zip],:id => li.link_id), :method => :delete) %> </td>

data/app/views/nodes/_groups.rhtml

@@ -15,7 +15,7 @@
     <li><label><%= _('publishers') %></label><%= select('node', 'dgroup_id', form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li>
     <li><label><%= _('writers') %></label><%= select('node', 'wgroup_id',    form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li>
     <li><label><%= _('readers') %></label><%= select('node', 'rgroup_id',    form_groups, { :include_blank => true }, {:disabled=>(@node[:inherit] != 0)}) %></li>
-    <li><label><%= _('skin') %></label><%= select('node',    'skin_id',      form_skins,  {},                         {:disabled=>(@node[:inherit] == 1)}) %></li>
+    <li><label><%= _('skin') %></label><%= select('node',    'skin_id',      form_skins, {:selected => @node.skin_zip}, {:disabled=>(@node[:inherit] == 1)}) %></li>
     <li class='submit'><%= submit_tag _('change') %></li>
   </form>
   <% else %>

data/app/views/nodes/_import_results.rhtml

@@ -6,7 +6,7 @@
     <% @nodes.each do |node| -%>
       <tr class='import_<%= node.errors.empty? ? (node[:create_or_update]) : 'error' %>'>
         <td><%= img_tag(node, :mode=>'tiny') %></td>
-        <td><%= node.rootpath %></td>
+        <td><%= node.short_path %></td>
         <% if node[:create_or_update] == 'same' && node.errors.empty? -%>
         <td colspan='3'><%= _('same') %></td>
         <% else -%>

data/app/views/nodes/_parent.rhtml

@@ -5,7 +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', 'node_name', :size=>15) %></li>
+    <li><label><%= _('name') %></label><%= text_field('node', 'title', :size=>15) %></li>
     <% if @node.kind_of?(Page) -%>
     <li><label><%= _('custom base url') %></label><%= check_box('node', 'custom_base') %></li>
     <% end -%>

data/app/views/nodes/_results.rhtml

@@ -20,7 +20,7 @@
     <%= img_tag(node, :mode=>'mini') %>
     <p class='result_name'><%= link_to(node.title, zen_path(node), :popup=>true) %> <em><%= check_lang(node) %></em></p>
     <p class='result_id'><%= node[:zip] %></p>
-    <p class='result_path'><%= node.rootpath.split('/').join(' / ') %></p>
+    <p class='result_path'><%= node.short_path %></p>
     <div class='clear'></div>
   </li>
   <% end %>

data/app/views/nodes/create.rjs

@@ -1,10 +1,12 @@
-if @node.new_record?
+if params[:u_url]
+  update_page_content(page, @node)
+elsif @node.new_record?
   page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
 else
   pos = params[:position] || :before
   ref = params[:reference] || "#{params[:dom_id]}_add"
   page.insert_html pos.to_sym, ref, :file => template_path_from_template_url + ".erb"
-  @node = @node.parent.new_child(:class => @node.class)
+  @node = @node.parent.new_child(:class => @node.klass)
   page.replace "#{params[:dom_id]}_form", :file => template_path_from_template_url + "_form.erb"
   if params[:done]
     page << params[:done]

data/app/views/relations/_li.erb

@@ -4,7 +4,7 @@
           :url    => edit_relation_path(li),
           :method => :get) %></td>
   <td class="ruby relation" colspan='7'>
-    <span class='constant min_width'><%= Node.get_class_from_kpath(li.source_kpath) %></span> <span class='arity'><%= li.target_unique? ? _('has_one') : _('has_many') %></span> <span class='string'>'<%= li.target_role %>'</span>, <span class='symbol'>:class</span> => <span class='constant'><%= Node.get_class_from_kpath(li.target_kpath).to_s %></span><br/>
-    <span class='constant min_width'><%= Node.get_class_from_kpath(li.target_kpath) %></span> <span class='arity'><%= li.source_unique? ? _('has_one') : _('has_many') %></span> <span class='string'>'<%= li.source_role %>'</span>, <span class='symbol'>:class</span> => <span class='constant'><%= Node.get_class_from_kpath(li.source_kpath).to_s %></span><br/>
+    <span class='constant min_width'><%= VirtualClass.find_by_kpath(li.source_kpath) %></span> <span class='arity'><%= li.target_unique? ? _('has_one') : _('has_many') %></span> <span class='string'>'<%= li.target_role %>'</span>, <span class='symbol'>:class</span> => <span class='constant'><%= VirtualClass.find_by_kpath(li.target_kpath).to_s %></span><br/>
+    <span class='constant min_width'><%= VirtualClass.find_by_kpath(li.target_kpath) %></span> <span class='arity'><%= li.source_unique? ? _('has_one') : _('has_many') %></span> <span class='string'>'<%= li.source_role %>'</span>, <span class='symbol'>:class</span> => <span class='constant'><%= VirtualClass.find_by_kpath(li.source_kpath).to_s %></span><br/>
   </td>
 </tr>

data/app/views/templates/document_create_tabs/_file.rhtml

@@ -4,7 +4,7 @@
 
 <%= upload_field %>
 
-<label for='node_name'><%= _('title') %></label>
+<label for='title'><%= _('title') %></label>
 <input id='node_title' type='text' name='node[title]' onchange="Zena.get_filename(this,'existing_doc');"/> <%= check_exists(:node => @parent, :watch => 'node_title', :kpath => 'ND', :show => 'short_path') %><br/>
 
 <label for='node_summary'><%= _('summary') %></label>

data/app/views/templates/document_create_tabs/_template.rhtml

@@ -4,8 +4,8 @@
 
 <input type='hidden' name='node[klass]' value='Template'/>
 
-<label for='node_name'><%= _('name') %></label>
-<input  id='node_name' type='text' name='node[node_name]'/><br/>
+<label for='title'><%= _('name') %></label>
+<input  id='title' type='text' name='node[title]'/><br/>
 
 <label for='node_target_klass'><%= _('class scope') %></label>
 <%= select('node', 'target_klass', Node.classes_for_form, {:include_blank => true} ) %><br/>

data/app/views/templates/document_create_tabs/_text_document.rhtml

@@ -5,8 +5,8 @@
 <label for='node_content_type'><%= _('content type') %></label>
 <input  id='node_content_type' type='text' name='node[content_type]'/><br/>
 
-<label for='node_name'><%= _('name') %></label>
-<input  id='node_name' type='text' name='node[node_name]'/><br/>
+<label for='title'><%= _('name') %></label>
+<input  id='title' type='text' name='node[title]'/><br/>
 
 <label   for='node_summary'><%= _('summary') %></label>
 <textarea id='node_summary' rows='3' name='node[summary]'></textarea><br/>

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

@@ -1,6 +1,6 @@
 <%=
 begin
-  node = secure!(Node) { Node.find_by_node_name('help') }
+  node = secure!(Node) { Node.find_by_title('help') }
   zazen(node.summary)
 rescue
   _('help not found')

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

@@ -17,6 +17,3 @@
 <%= date_box(@node, 'v_publish_from') %>
 <label for="summary"><%= _("summary")  %></label>
 <%= text_area 'node', 'summary', :cols => nil, :rows => 6, :value => @node.summary, :class => 'full_width' %>
-
-<label for="comment"><%= _("comment") %></label>
-<%= text_area 'node', 'comment', :cols => nil, :rows => 2, :class => 'full_width' %>

data/app/views/users/_form.rhtml

@@ -22,15 +22,10 @@
       <tr id='user_set_pass'><td class='label'><%= _("password")%></td><td><%= password_field('user', 'password', :size=>15, :value=>"" ) %></td></tr>
     <% end -%>
     <% end -%>
-      <tr><td class='label'><%= _("status")%>  </td><td><% if @user.is_su? -%><%= _(@user.status_name) %><% else -%><%= select('user', 'status', User::Status.reject {|k,v| v > User::Status[:admin]}.map{|k,v| [_(k.to_s),v]}.sort{|a,b| b[1] <=> a[1]}) %><%- end %></td></tr>
-      <tr><td class='label'><%= _("first name")%> </td><td><%= text_field('user', 'first_name',   :size=>35 ) %></td></tr>
-      <tr><td class='label'><%= _("name")%>       </td><td><%= text_field('user', 'name',         :size=>35 ) %></td></tr>
+      <tr><td class='label'><%= _("status")%>  </td><td><%= select('user', 'status', User::Status.reject {|k,v| v > User::Status[:admin]}.map{|k,v| [_(k.to_s),v]}.sort{|a,b| b[1] <=> a[1]}) %></td></tr>
       <tr><td class='label'><%= _('language')%>   </td><td><%= select('user', 'lang', visitor.site.lang_list.map {|l| [_(l),l]}) %></td></tr>
       <tr><td class='label'><%= _("time zone")%>  </td><td><select name='user[time_zone]'><%= options_for_select([''] + TZInfo::Timezone.all_identifiers, @user[:time_zone] || '') %></select></td></tr>
     <% unless @user.is_anon? -%>
-      <tr><td class='label'><%= _("email")%>      </td><td><%= text_field('user', 'email',        :size=>35 ) %></td></tr>
-    <% end -%>
-    <% unless @user.is_anon? || @user.is_su? -%>
       <tr><td class='label'><%= _("groups")%>     </td><td>
       <%= @groups.inject([]) do |list, g|
         if g[:id] == visitor.site.public_group_id || g[:id] == visitor.site.site_group_id
@@ -43,6 +38,7 @@
       <input type='hidden' name='user[group_ids][]' value=''/>
       </td></tr>
     <% end -%>
+    <tr><td colspan='2'><%= node_form %></td></tr>
     <tr><td colspan='2'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
   </table>
   </form>

data/app/views/users/_li.rhtml

@@ -1,8 +1,6 @@
 <% icon = 'user'
 if li.is_anon?
   icon += '_pub'
-elsif li.is_su?
-  icon += '_su'
 elsif li.is_admin?
   icon += '_admin'
 end %>
@@ -12,7 +10,7 @@ end %>
           :url    => edit_user_path(li),
           :method => :get) %></td>
   <td class="login"><%= if li.is_anon? then '<i>public</i>' else li.login end %></td>
-  <td class="fullname" ><a href='<%= zen_path(li.contact) %>'><%= li.fullname %></a></td>
+  <td class="fullname" ><a href='<%= zen_path(li.node) %>'><%= li.node ? li.node.title : '' %></a></td>
   <td class="login"><%= _(User::Num_to_status[li.status].to_s) %></td>
   <td class="groups"><%= li.groups.map {|g| g.name }.join(', ') %></td>
 </tr>

data/app/views/users/create.rjs

@@ -1,8 +1,8 @@
 if @user.errors.empty?
-  page.insert_html :before, 'add_user', :partial=>'users/li', :collection=>[@user]
-  @user = secure!(User) { User.new }
-  page.replace_html 'add_user_form', :partial=>'users/form'
+  page.insert_html :before, 'add_user', :partial => 'users/li', :collection => [@user]
+  @user = secure(User) { User.new }
+  page.replace_html 'add_user_form', :partial => 'users/form'
   page << "$('user_login').focus();"
 else
-  page.replace 'add_user_form', :partial=>'users/form'
+  page.replace 'add_user_form', :partial => 'users/form'
 end

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

@@ -1,4 +1,4 @@
-<h3><%= @user.fullname %> : <%= _('preferences') %> </h3>
+<h3><%= @user.login %> : <%= _('preferences') %> </h3>
 
 <ul class='actions' id='preferences'>
 
@@ -14,11 +14,8 @@
       <ul>
         <li id='user_info_errors'></li>
         <li class='align'><%= _('login')%>      <span><%= text_field('user', 'login',        :size=>25 ) %></span></li>
-        <li class='align'><%= _('first name')%> <span><%= text_field('user', 'first_name',   :size=>25 ) %></span></li>
-        <li class='align'><%= _('name')%>       <span><%= text_field('user', 'name',         :size=>25 ) %></span></li>
         <li class='align'><%= _('language')%>   <span><%= select('user', 'lang', current_site.lang_list.map{|l| [_(l),l]} ) %></span></li>
         <li class='align'><%= _('time zone')%>  <span><select name='user[time_zone]'><%= options_for_select([''] + TZInfo::Timezone.all_identifiers, @user[:time_zone] || '') %></select></span></li>
-        <li class='align'><%= _('email')%>      <span><%= text_field('user', 'email',        :size=>25 ) %></span></li>
         <li><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></li>
       </ul>
       </form>

data/app/views/versions/custom_tab.rhtml

@@ -0,0 +1,5 @@
+<% @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' %>
+<% end -%>

data/app/views/virtual_classes/_form.erb

@@ -5,7 +5,7 @@
     link_to_function _('btn_x'), "['add_virtual_class', 'add_virtual_class_form'].each(Element.toggle)"
   end %>
 </td>
-<td class='add' colspan='3'>
+<td class='add' colspan='2'>
   <div id='virtual_class_errors'><%= error_messages_for(:virtual_class, :object => @virtual_class) %></div>
   <% if @virtual_class.new_record? %>
   <%= form_remote_tag(:url => virtual_classes_path ) %>
@@ -15,24 +15,34 @@
   <table cellspacing='0' class='edit_virtual_class'>
     <tr><td class='label'><%= _('name')%>      </td><td><%= text_field('virtual_class', 'name',        :size=>15 ) %></td></tr>
     <tr>
-      <td class='label'><%= _('type')%>      </td>
-      <% if @virtual_class.new_record? %><td>
-        <%= select('virtual_class', 'type',  ['Class', 'Role'], :selected => 'Class' ) %></td>
-      <% else -%>
-      <td><%= @virtual_class.kind_of?(VirtualClass) ? 'Class' : 'Role' %></td>
-      <% end -%>
+      <td class='label'><%= _('type') %></td>
+      <td>
+        <% if @virtual_class.new_record? %>
+          <%= select('virtual_class', 'type',  ['Class', 'Role'], :selected => 'Class' ) %>
+        <% else -%>
+          <%= @virtual_class.kind_of?(VirtualClass) ? 'Class' : 'Role' %>
+        <% end -%>
+      </td>
+    </tr>
+    <tr>
+      <td class='label'><%= _('kpath') %></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'><%= _('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>
     <tr><td class='label'><%= _('auto create discussion')%></td><td><%= check_box('virtual_class', 'auto_create_discussion') %></td></tr>
+<% end -%>
     <tr><td class='label'><%= _('icon')%>      </td><td><%= text_field('virtual_class', 'icon',        :size=>15 ) %></td></tr>
-    <tr><td colspan='3'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
+    <tr><td colspan='2'><p class='btn_validate'><input type='submit' value='<%= _('validate') %>'/></p></td></tr>
   </table>
   </form>
   <%# Class destruction not enabled because we first need to know what to do with instances... %>

data/app/views/virtual_classes/_li.erb

@@ -2,20 +2,33 @@
 <tr class='real_class'>
   <td class="adm_icon"><%= _('virtual_class_img') %></td>
   <td class='ruby'><span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') + '+ ' %></span><span class='constant'><%= li.name %></span></td>
-  <td>&nbsp;</td>
-  <td class="auto_create_discussion" >&nbsp;</td>
+  <td class='info'>&nbsp;</td>
 </tr>
 <% else -%>
 <tr id='virtual_class<%= li[:id] %>'>
   <td class="adm_icon"><%= (li.new_record? || !li.errors.empty?) ? _('virtual_class_error_img') : link_to_remote( !li.icon.blank? ? "<img src='#{li.icon}'/>" : _('virtual_class_img'),
-          :update =>"virtual_class#{li[:id]}",
+        { :update => "virtual_class#{li[:id]}",
           :url    => edit_virtual_class_path(li),
-          :method => :get) %></td>
+          :method => :get},
+        { :title  => li.kpath}) %></td>
+<% if li.kind_of?(VirtualClass) -%>
   <td class='ruby'>
-    <span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') %><%= li.kind_of?(VirtualClass) ? '+ ' : '| <span>* </span>' %></span>
-    <span class='constant'><%= li.name %><%= (li.kind_of?(VirtualClass) && li.import_result) ? " (#{li.import_result})" : ''%></span>
+    <span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') %>+ </span>
+    <span class='constant'><%= li.name %><%= li.import_result ? " (#{li.import_result})" : ''%></span>
   </td>
-  <td class='idx'><%= Zena::Use::Fulltext::FULLTEXT_FIELDS.map {|fld| li[fld].blank? ? nil : fld.gsub('idx_text_','')}.compact.join(', ') %>
-  <td class="auto_create_discussion" ><%= li.auto_create_discussion ? _('auto discussion') : '' %></td>
+  <td class='info'>
+  <%= (
+    Zena::Use::Fulltext::FULLTEXT_FIELDS.map {|fld| li.prop[fld].blank? ? nil : fld.gsub('idx_text_','')} +
+    (li.prop_eval ? [_('prop')] : []) +
+    (li.auto_create_discussion? ? [_('discussion')] : []) +
+    (li.idx_class ? [li.idx_class] : [])
+    ).compact.join(', ') %>
+  </td>
+<% else -%>
+  <td class='ruby' colspan='2'>
+    <span class='spacer'><%= li.kpath[1..-1].gsub(/./, '| ') %>| <span>* </span></span>
+    <span class='constant'><%= li.name %></span>
+  </td>
+<% end  -%>
 </tr>
 <% end -%>

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

@@ -11,7 +11,7 @@
           <r:else do='link' do='img' alt_src='icon' mode='pv'/>
         </p>
         <p class='result_name'><r:link/></p>
-        <p class='result_path'><r:show attr='rootpath'/></p>
+        <p class='result_path'><r:show attr='short_path'/></p>
         <r:summary/>
         <div class='clear'></div>
       </li>

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

@@ -69,17 +69,17 @@
             </li>
           </ol>
         </r:pages>
-        <r:references name='references'><h3 do='trans'>references</h3>
+        <r:nodes where='kpath not like "ND%" and kpath not like "NP%"'><h3 do='trans'>references</h3>
           <ol>
             <li do='each' class='li_s#{v.status}' do='link'/>
             <li do='add' before='self'/>
             <li class='inline_form' do='form'>
-              <p class='node_klass'>  <r:select name='klass' root_class='Reference'/></p>
+              <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>
             </li>
           </ol>
-        </r:references>
+        </r:nodes>
 
       </div> <!-- related -->
       <div id='main'>

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

@@ -42,7 +42,7 @@ module Bricks
         return parser_error("recaptcha keys not set") unless current_site.prop['recaptcha_pub'] && current_site.prop['recaptcha_priv']
         res = "<%= get_captcha(:rcc_pub => #{visitor.site.prop['recaptcha_pub'].inspect}, :rcc_priv => #{visitor.site.prop['recaptcha_priv'].inspect}#{get_recaptcha_params}) %>"
         res += expand_with
-        "<% if visitor.is_anon? -%>#{@markup.wrap(res)}<% end -%>"
+        "<% if visitor.is_anon? %>#{@markup.wrap(res)}<% end %>"
       end
 
       def r_mail_hide

data/bricks/mongrel/zena/deploy.rb

@@ -12,6 +12,20 @@ Capistrano::Configuration.instance(:must_exist).load do
 
       desc "configure mongrel"
       task :configure, :roles => :app do
+        if !defined?(RAILS_ENV)
+          RAILS_ENV = 'production'
+        end
+        require 'bricks'
+        asset_port = Bricks.raw_config['asset_port']
+        if asset_port == self[:mongrel_port].to_i - 1
+          mongrel_port  = asset_port
+          mongrel_count = self[:mongrel_count] + 1
+        elsif asset_port.nil?
+          # no asset port: OK.
+        else
+          raise "Invalid asset_port setting in bricks.yml: the port should be equal to mongrel_port minus one. (expected #{self[:mongrel_port].to_i - 1}, found #{asset_port})"
+        end
+
         run "#{in_current} mongrel_rails cluster::configure -e production -p #{mongrel_port} -N #{mongrel_count} -c #{deploy_to}/current -P log/mongrel.pid -l log/mongrel.log -a 127.0.0.1 --user www-data --group www-data"
         run "#{in_current} echo 'config_script: config/mongrel_upload_progress.conf' >> config/mongrel_cluster.yml"
       end

data/bricks/pdf/README

@@ -0,0 +1,33 @@
+= pdf -- pdf rendering brick for Zena
+
+This brick is used to render pdf from html pages. It exploit existing engine such as "princexml" or "pisa".
+
+The required engine must be installed on the server and the bricks configuration file must specify which engine to use. Example:
+
+    pdf:
+      switch: ON
+      engine: prince
+
+You must also provide an asset host dedicated to serving the files needed by pdf generation (css documents, embedded images, etc). Set the asset host port in the bricks.yml file:
+
+    asset_host: 7999
+
+It is possible to add more engines. See implementations in "engine" folder in for details.
+
+There is one method "render" that takes a hash as argument.
+
+== Examples
+
+    Bricks::PDF.engine = 'prince'
+
+    Bricks::PDF.render :input => "myfile.html"
+    => STDOUT
+
+    Bricks::PDF.render :input => "myfile.html", :output => "out.pdf"
+    => out.pdf      (file)
+
+    Bricks::PDF.render :data  => "This is text to render."
+    => STDOUT       (strings)
+
+    Bricks::PDF.render :data  => "This is text to render.", :output => "out.pdf"
+    => out.pdf      (file)